[QGIS Commit] r11747 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Oct 3 17:47:14 EDT 2009
Author: timlinux
Date: 2009-10-03 17:47:14 -0400 (Sat, 03 Oct 2009)
New Revision: 11747
Modified:
trunk/qgis/src/ui/qgscomposerbase.ui
trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui
trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
trunk/qgis/src/ui/qgscomposerlegenditemdialogbase.ui
trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui
trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
Log:
HIG compliance for composer and it's dialogs
Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -19,23 +19,8 @@
<property name="mouseTracking" >
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <item>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
<widget class="QSplitter" name="mSplitter" >
<property name="mouseTracking" >
<bool>true</bool>
@@ -171,51 +156,12 @@
</widget>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="1" column="0" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::NoButton</set>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="helpPButton" >
- <property name="text" >
- <string>Help</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="closePButton" >
- <property name="text" >
- <string>Close</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
</layout>
</widget>
@@ -502,5 +448,22 @@
<tabstop>mSplitter</tabstop>
</tabstops>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>QgsComposerBase</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>612</x>
+ <y>583</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>735</x>
+ <y>567</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
Modified: trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -22,8 +22,11 @@
<item row="0" column="0" >
<widget class="QLabel" name="mColorLabel" >
<property name="text" >
- <string>Color:</string>
+ <string>Color</string>
</property>
+ <property name="buddy" >
+ <cstring>mFrameColorButton</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1" colspan="2" >
@@ -43,8 +46,11 @@
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="mOpacityLabel" >
<property name="text" >
- <string>Opacity:</string>
+ <string>Opacity</string>
</property>
+ <property name="buddy" >
+ <cstring>mOpacitySlider</cstring>
+ </property>
</widget>
</item>
<item row="1" column="2" colspan="2" >
@@ -60,8 +66,11 @@
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="mOutlineWidthLabel" >
<property name="text" >
- <string>Outline width: </string>
+ <string>Outline width</string>
</property>
+ <property name="buddy" >
+ <cstring>mOutlineWidthSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="2" column="2" colspan="2" >
Modified: trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -42,8 +42,11 @@
<item row="2" column="0" >
<widget class="QLabel" name="mMarginTextLabel" >
<property name="text" >
- <string>Margin (mm):</string>
+ <string>Margin (mm)</string>
</property>
+ <property name="buddy" >
+ <cstring>mMarginDoubleSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="2" column="1" >
@@ -53,7 +56,9 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
+ <tabstop>mTextEdit</tabstop>
<tabstop>mFontButton</tabstop>
+ <tabstop>mMarginDoubleSpinBox</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposerlegenditemdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlegenditemdialogbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerlegenditemdialogbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -16,8 +16,11 @@
<item row="0" column="0" >
<widget class="QLabel" name="mItemTextLabel" >
<property name="text" >
- <string>Item text:</string>
+ <string>Item text</string>
</property>
+ <property name="buddy" >
+ <cstring>mItemTextLineEdit</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1" >
@@ -44,8 +47,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
- <x>248</x>
- <y>254</y>
+ <x>257</x>
+ <y>76</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
@@ -60,8 +63,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
- <x>316</x>
- <y>260</y>
+ <x>325</x>
+ <y>76</y>
</hint>
<hint type="destinationlabel" >
<x>286</x>
Modified: trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>560</width>
- <height>537</height>
+ <width>520</width>
+ <height>498</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -26,125 +26,130 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="mTitleLabel" >
- <property name="text" >
- <string>Title:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="mTitleLineEdit" />
- </item>
- </layout>
+ <widget class="QLabel" name="mTitleLabel" >
+ <property name="text" >
+ <string>Title</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mTitleLineEdit</cstring>
+ </property>
+ </widget>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="mFontLabel" >
- <property name="text" >
- <string>Font:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="mTitleFontButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Title...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="mLayerFontButton" >
- <property name="text" >
- <string>Layer...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="mItemFontButton" >
- <property name="text" >
- <string>Item...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="1" colspan="8" >
+ <widget class="QLineEdit" name="mTitleLineEdit" />
</item>
- <item row="2" column="0" >
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="mSymbolWidthLabel" >
- <property name="text" >
- <string>Symbol width: </string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox" />
- </item>
- <item row="0" column="3" colspan="2" >
- <widget class="QLabel" name="mSymbolHeightLabel" >
- <property name="text" >
- <string>Symbol height:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="5" >
- <widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mLayerSpaceLabel" >
- <property name="text" >
- <string>Layer space: </string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox" />
- </item>
- <item row="1" column="3" >
- <widget class="QLabel" name="mSymbolSpaceLabel" >
- <property name="text" >
- <string>Symbol space:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="4" colspan="2" >
- <widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox" />
- </item>
- </layout>
+ <item row="1" column="0" colspan="3" >
+ <widget class="QLabel" name="mFontLabel" >
+ <property name="text" >
+ <string>Font</string>
+ </property>
+ </widget>
</item>
- <item row="3" column="0" >
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="mIconLabelSpaceLabel" >
- <property name="text" >
- <string>Icon label space:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox" />
- </item>
- <item>
- <widget class="QLabel" name="mBoxSpaceLabel" >
- <property name="text" >
- <string>Box space:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox" />
- </item>
- </layout>
+ <item row="1" column="3" colspan="2" >
+ <widget class="QPushButton" name="mTitleFontButton" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Title...</string>
+ </property>
+ </widget>
</item>
+ <item row="1" column="5" colspan="2" >
+ <widget class="QPushButton" name="mLayerFontButton" >
+ <property name="text" >
+ <string>Layer...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="7" colspan="2" >
+ <widget class="QPushButton" name="mItemFontButton" >
+ <property name="text" >
+ <string>Item...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="4" >
+ <widget class="QLabel" name="mSymbolWidthLabel" >
+ <property name="text" >
+ <string>Symbol width</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mSymbolWidthSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4" >
+ <widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox" />
+ </item>
+ <item row="2" column="5" colspan="3" >
+ <widget class="QLabel" name="mSymbolHeightLabel" >
+ <property name="text" >
+ <string>Symbol height</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mSymbolHeightSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="8" >
+ <widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox" />
+ </item>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QLabel" name="mLayerSpaceLabel" >
+ <property name="text" >
+ <string>Layer space</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mLayerSpaceSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" colspan="3" >
+ <widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox" />
+ </item>
+ <item row="3" column="5" >
+ <widget class="QLabel" name="mSymbolSpaceLabel" >
+ <property name="text" >
+ <string>Symbol space</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mSymbolSpaceSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="6" colspan="3" >
+ <widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox" />
+ </item>
+ <item row="4" column="0" colspan="3" >
+ <widget class="QLabel" name="mIconLabelSpaceLabel" >
+ <property name="text" >
+ <string>Icon label space</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mIconLabelSpaceSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="3" colspan="2" >
+ <widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox" />
+ </item>
+ <item row="4" column="5" colspan="2" >
+ <widget class="QLabel" name="mBoxSpaceLabel" >
+ <property name="text" >
+ <string>Box space</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mBoxSpaceSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="7" colspan="2" >
+ <widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox" />
+ </item>
</layout>
</widget>
</item>
@@ -154,55 +159,55 @@
<string>Legend items</string>
</property>
<layout class="QGridLayout" >
- <item row="0" column="0" >
+ <item row="0" column="0" colspan="6" >
+ <widget class="QTreeView" name="mItemTreeView" >
+ <property name="headerHidden" stdset="0" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
<widget class="QPushButton" name="mMoveDownPushButton" >
<property name="text" >
- <string>down</string>
+ <string>Down</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
+ <item row="1" column="1" >
<widget class="QPushButton" name="mMoveUpPushButton" >
<property name="text" >
- <string>up</string>
+ <string>Up</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="1" column="2" >
<widget class="QPushButton" name="mRemovePushButton" >
<property name="text" >
- <string>remove</string>
+ <string>Remove</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
+ <item row="1" column="3" >
<widget class="QPushButton" name="mEditPushButton" >
<property name="text" >
- <string>edit...</string>
+ <string>Edit...</string>
</property>
</widget>
</item>
- <item row="0" column="4" >
+ <item row="1" column="4" >
<widget class="QPushButton" name="mUpdatePushButton" >
<property name="text" >
- <string>update</string>
+ <string>Update</string>
</property>
</widget>
</item>
- <item row="0" column="5" >
+ <item row="1" column="5" >
<widget class="QPushButton" name="mUpdateAllPushButton" >
<property name="text" >
- <string>update all</string>
+ <string>Update all</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="6" >
- <widget class="QTreeView" name="mItemTreeView" >
- <property name="headerHidden" stdset="0" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -210,7 +215,23 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
+ <tabstop>mTitleLineEdit</tabstop>
<tabstop>mTitleFontButton</tabstop>
+ <tabstop>mLayerFontButton</tabstop>
+ <tabstop>mItemFontButton</tabstop>
+ <tabstop>mSymbolWidthSpinBox</tabstop>
+ <tabstop>mSymbolHeightSpinBox</tabstop>
+ <tabstop>mLayerSpaceSpinBox</tabstop>
+ <tabstop>mSymbolSpaceSpinBox</tabstop>
+ <tabstop>mIconLabelSpaceSpinBox</tabstop>
+ <tabstop>mBoxSpaceSpinBox</tabstop>
+ <tabstop>mItemTreeView</tabstop>
+ <tabstop>mMoveDownPushButton</tabstop>
+ <tabstop>mMoveUpPushButton</tabstop>
+ <tabstop>mRemovePushButton</tabstop>
+ <tabstop>mEditPushButton</tabstop>
+ <tabstop>mUpdatePushButton</tabstop>
+ <tabstop>mUpdateAllPushButton</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposermapwidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposermapwidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>QgsComposerMapWidgetBase</class>
- <widget class="QWidget" name="QgsComposerMapWidgetBase">
- <property name="geometry">
+ <widget class="QWidget" name="QgsComposerMapWidgetBase" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,175 +9,157 @@
<height>374</height>
</rect>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle">
+ <property name="windowTitle" >
<string>Map options</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="mNameLabel">
- <property name="text">
- <string><b>Map</b></string>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" colspan="3" >
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Map</string>
</property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="text" >
+ <string>Width</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mWidthLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QLineEdit" name="mWidthLineEdit" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel2" >
+ <property name="text" >
+ <string>Height</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mHeightLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QLineEdit" name="mHeightLineEdit" />
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Scale</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>1:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <widget class="QLineEdit" name="mScaleLineEdit" >
+ <property name="inputMask" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="1" column="0" colspan="5">
- <widget class="Line" name="line1">
- <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1">
- <property name="text">
- <string>Width</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="buddy">
- <cstring>mWidthLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLineEdit" name="mWidthLineEdit"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel2">
- <property name="text">
- <string>Height</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="buddy">
- <cstring>mHeightLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QLineEdit" name="mHeightLineEdit"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Scale:</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="1" colspan="2">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>1:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="4" column="3">
- <widget class="QLineEdit" name="mScaleLineEdit"/>
- </item>
- <item row="5" column="0" colspan="5">
- <widget class="QGroupBox" name="mMapExtentGroupBox">
- <property name="title">
+ <item row="1" column="0" colspan="3" >
+ <widget class="QGroupBox" name="mMapExtentGroupBox" >
+ <property name="title" >
<string>Map extent</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QLabel" name="mXMinLabel">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>X min:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="mYMinLabel">
- <property name="text">
- <string>Y min:</string>
- </property>
- </widget>
- </item>
- </layout>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="mXMinLabel" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="text" >
+ <string>X min</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mXMinLineEdit</cstring>
+ </property>
+ </widget>
</item>
- <item row="0" column="1" colspan="2">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QLineEdit" name="mXMinLineEdit"/>
- </item>
- <item>
- <widget class="QLineEdit" name="mYMinLineEdit"/>
- </item>
- </layout>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="mXMinLineEdit" />
</item>
- <item row="0" column="3">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QLabel" name="mXMaxLabel">
- <property name="text">
- <string>X max:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="mYMaxLabel">
- <property name="text">
- <string>Y max:</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="2" >
+ <widget class="QLabel" name="mXMaxLabel" >
+ <property name="text" >
+ <string>X max</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mXMaxLineEdit</cstring>
+ </property>
+ </widget>
</item>
- <item row="0" column="4">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QLineEdit" name="mXMaxLineEdit"/>
- </item>
- <item>
- <widget class="QLineEdit" name="mYMaxLineEdit"/>
- </item>
- </layout>
+ <item row="0" column="3" colspan="2" >
+ <widget class="QLineEdit" name="mXMaxLineEdit" />
</item>
- <item row="1" column="0" colspan="2">
- <widget class="QPushButton" name="mSetToMapCanvasExtentButton">
- <property name="text">
- <string>set to map canvas extent</string>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="mYMinLabel" >
+ <property name="text" >
+ <string>Y min</string>
</property>
+ <property name="buddy" >
+ <cstring>mYMinLineEdit</cstring>
+ </property>
</widget>
</item>
- <item row="1" column="2" colspan="3">
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="mYMinLineEdit" />
+ </item>
+ <item row="1" column="2" >
+ <widget class="QLabel" name="mYMaxLabel" >
+ <property name="text" >
+ <string>Y max</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mYMaxLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" colspan="2" >
+ <widget class="QLineEdit" name="mYMaxLineEdit" />
+ </item>
+ <item row="2" column="0" colspan="4" >
<spacer>
- <property name="orientation">
+ <property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" >
<size>
<width>311</width>
<height>20</height>
@@ -186,52 +167,59 @@
</property>
</spacer>
</item>
+ <item row="2" column="4" >
+ <widget class="QPushButton" name="mSetToMapCanvasExtentButton" >
+ <property name="text" >
+ <string>Set to map canvas extent</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
- <item row="6" column="0" colspan="2">
- <widget class="QLabel" name="mPreviewModeLabel">
- <property name="text">
+ <item row="2" column="0" >
+ <widget class="QLabel" name="mPreviewModeLabel" >
+ <property name="text" >
<string>Preview</string>
</property>
- <property name="wordWrap">
+ <property name="wordWrap" >
<bool>true</bool>
</property>
- <property name="buddy">
+ <property name="buddy" >
<cstring>mPreviewModeComboBox</cstring>
</property>
</widget>
</item>
- <item row="6" column="3">
- <widget class="QComboBox" name="mPreviewModeComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <item row="2" column="1" >
+ <widget class="QComboBox" name="mPreviewModeComboBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="6" column="4">
- <widget class="QPushButton" name="mUpdatePreviewButton">
- <property name="text">
+ <item row="2" column="2" >
+ <widget class="QPushButton" name="mUpdatePreviewButton" >
+ <property name="text" >
<string>Update preview</string>
</property>
</widget>
</item>
- <item row="7" column="0" colspan="4">
- <widget class="QCheckBox" name="mKeepLayerListCheckBox">
- <property name="text">
+ <item row="3" column="0" colspan="2" >
+ <widget class="QCheckBox" name="mKeepLayerListCheckBox" >
+ <property name="text" >
<string>Keep layer list</string>
</property>
</widget>
</item>
- <item row="8" column="2" colspan="3">
+ <item row="4" column="1" colspan="2" >
<spacer>
- <property name="orientation">
+ <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" >
<size>
<width>458</width>
<height>31</height>
@@ -241,11 +229,19 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
+ <layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>mWidthLineEdit</tabstop>
<tabstop>mHeightLineEdit</tabstop>
+ <tabstop>mScaleLineEdit</tabstop>
+ <tabstop>mXMinLineEdit</tabstop>
+ <tabstop>mXMaxLineEdit</tabstop>
+ <tabstop>mYMinLineEdit</tabstop>
+ <tabstop>mYMaxLineEdit</tabstop>
+ <tabstop>mSetToMapCanvasExtentButton</tabstop>
<tabstop>mPreviewModeComboBox</tabstop>
+ <tabstop>mUpdatePreviewButton</tabstop>
+ <tabstop>mKeepLayerListCheckBox</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -19,7 +19,7 @@
<string>Picture Options</string>
</property>
<layout class="QGridLayout" >
- <item row="0" column="0" >
+ <item row="0" column="0" colspan="4" >
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -31,12 +31,22 @@
<string>Search directories</string>
</property>
<layout class="QGridLayout" >
- <item row="0" column="0" >
+ <item row="0" column="0" colspan="3" >
+ <widget class="QComboBox" name="mSearchDirectoriesComboBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" >
<size>
<width>101</width>
<height>20</height>
@@ -44,34 +54,24 @@
</property>
</spacer>
</item>
- <item row="0" column="1" >
+ <item row="1" column="1" >
<widget class="QPushButton" name="mAddDirectoryButton" >
<property name="text" >
<string>Add...</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="1" column="2" >
<widget class="QPushButton" name="mRemoveDirectoryButton" >
<property name="text" >
<string>Remove</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3" >
- <widget class="QComboBox" name="mSearchDirectoriesComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
- <item row="1" column="0" >
+ <item row="1" column="0" colspan="4" >
<widget class="QGroupBox" name="mPreviewGroupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -89,7 +89,7 @@
<bool>false</bool>
</property>
<property name="dragDropMode" >
- <enum>QAbstractItemView::NoDragDrop</enum>
+ <enum>QAbstractItemView::DragDrop</enum>
</property>
<property name="movement" >
<enum>QListView::Free</enum>
@@ -118,104 +118,116 @@
</widget>
</item>
<item row="2" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Load</string>
</property>
- <property name="margin" >
- <number>0</number>
+ <property name="buddy" >
+ <cstring>mPictureLineEdit</cstring>
</property>
- <item>
- <widget class="QLineEdit" name="mPictureLineEdit" />
- </item>
- <item>
- <widget class="QPushButton" name="mPictureBrowseButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>150</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text" >
- <string>Browse...</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QLineEdit" name="mPictureLineEdit" />
+ </item>
+ <item row="2" column="3" >
+ <widget class="QPushButton" name="mPictureBrowseButton" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>150</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
<item row="3" column="0" >
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Width:</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="mWidthLineEdit" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel4" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Height:</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="QLineEdit" name="mHeightLineEdit" />
- </item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="mRotationLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Rotation:</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <widget class="QDoubleSpinBox" name="mRotationSpinBox" />
- </item>
- </layout>
+ <widget class="QLabel" name="textLabel3" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Width</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mWidthLineEdit</cstring>
+ </property>
+ </widget>
</item>
+ <item row="3" column="1" colspan="3" >
+ <widget class="QLineEdit" name="mWidthLineEdit" />
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="textLabel4" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Height</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mHeightLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="3" >
+ <widget class="QLineEdit" name="mHeightLineEdit" />
+ </item>
+ <item row="5" column="0" colspan="2" >
+ <widget class="QLabel" name="mRotationLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Rotation</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mRotationSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2" colspan="2" >
+ <widget class="QDoubleSpinBox" name="mRotationSpinBox" />
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
+ <tabstop>mSearchDirectoriesComboBox</tabstop>
+ <tabstop>mAddDirectoryButton</tabstop>
+ <tabstop>mRemoveDirectoryButton</tabstop>
+ <tabstop>mPreviewListWidget</tabstop>
+ <tabstop>mPictureLineEdit</tabstop>
<tabstop>mPictureBrowseButton</tabstop>
- <tabstop>mPictureLineEdit</tabstop>
+ <tabstop>mWidthLineEdit</tabstop>
+ <tabstop>mHeightLineEdit</tabstop>
+ <tabstop>mRotationSpinBox</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2009-10-03 20:44:45 UTC (rev 11746)
+++ trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2009-10-03 21:47:14 UTC (rev 11747)
@@ -22,11 +22,14 @@
<item row="0" column="0" >
<widget class="QLabel" name="mSegmentSizeLabel" >
<property name="text" >
- <string>Segment size (map units):</string>
+ <string>Segment size (map units)</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
+ <property name="buddy" >
+ <cstring>mSegmentSizeSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1" >
@@ -42,11 +45,14 @@
<item row="0" column="2" colspan="2" >
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
<property name="text" >
- <string>Map units per bar unit:</string>
+ <string>Map units per bar unit</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
+ <property name="buddy" >
+ <cstring>mMapUnitsPerBarUnitSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="4" >
@@ -59,11 +65,14 @@
<item row="1" column="0" >
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
<property name="text" >
- <string>Number of segments:</string>
+ <string>Number of segments</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
+ <property name="buddy" >
+ <cstring>mNumberOfSegmentsSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="1" column="1" >
@@ -72,8 +81,11 @@
<item row="1" column="2" colspan="2" >
<widget class="QLabel" name="mSegmentsLeftLabel" >
<property name="text" >
- <string>Segments left:</string>
+ <string>Segments left</string>
</property>
+ <property name="buddy" >
+ <cstring>mSegmentsLeftSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="1" column="4" >
@@ -82,8 +94,11 @@
<item row="2" column="0" >
<widget class="QLabel" name="mStyleLabel" >
<property name="text" >
- <string>Style:</string>
+ <string>Style</string>
</property>
+ <property name="buddy" >
+ <cstring>mStyleComboBox</cstring>
+ </property>
</widget>
</item>
<item row="2" column="1" >
@@ -98,7 +113,7 @@
</sizepolicy>
</property>
<property name="text" >
- <string>Map:</string>
+ <string>Map</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -124,8 +139,11 @@
<item row="3" column="0" >
<widget class="QLabel" name="mHeightLabel" >
<property name="text" >
- <string>Height (mm):</string>
+ <string>Height (mm)</string>
</property>
+ <property name="buddy" >
+ <cstring>mHeightSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="3" column="1" >
@@ -134,7 +152,7 @@
<item row="3" column="2" colspan="2" >
<widget class="QLabel" name="mLineWidthLabel" >
<property name="text" >
- <string>Line width:</string>
+ <string>Line width</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -166,8 +184,11 @@
<item row="4" column="0" >
<widget class="QLabel" name="mLabelBarSpaceLabel" >
<property name="text" >
- <string>Label space:</string>
+ <string>Label space</string>
</property>
+ <property name="buddy" >
+ <cstring>mLabelBarSpaceSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="4" column="1" >
@@ -176,8 +197,11 @@
<item row="4" column="2" colspan="2" >
<widget class="QLabel" name="mBoxSpaceLabel" >
<property name="text" >
- <string>Box space:</string>
+ <string>Box space</string>
</property>
+ <property name="buddy" >
+ <cstring>mBoxSizeSpinBox</cstring>
+ </property>
</widget>
</item>
<item row="4" column="4" >
@@ -186,7 +210,7 @@
<item row="5" column="0" >
<widget class="QLabel" name="mUnitLabelLabel" >
<property name="text" >
- <string>Unit label:</string>
+ <string>Unit label</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -223,9 +247,19 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
+ <tabstop>mSegmentSizeSpinBox</tabstop>
+ <tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
+ <tabstop>mNumberOfSegmentsSpinBox</tabstop>
+ <tabstop>mSegmentsLeftSpinBox</tabstop>
+ <tabstop>mStyleComboBox</tabstop>
+ <tabstop>mMapComboBox</tabstop>
+ <tabstop>mHeightSpinBox</tabstop>
+ <tabstop>mLineWidthSpinBox</tabstop>
+ <tabstop>mLabelBarSpaceSpinBox</tabstop>
+ <tabstop>mBoxSizeSpinBox</tabstop>
<tabstop>mUnitLabelLineEdit</tabstop>
- <tabstop>mMapComboBox</tabstop>
<tabstop>mFontButton</tabstop>
+ <tabstop>mColorPushButton</tabstop>
</tabstops>
<resources/>
<connections/>
More information about the QGIS-commit
mailing list