[QGIS Commit] r11843 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Oct 25 12:39:55 EDT 2009
Author: timlinux
Date: 2009-10-25 12:39:53 -0400 (Sun, 25 Oct 2009)
New Revision: 11843
Modified:
trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
Log:
Layout widgets horizontally to waste less space. Fixed tab order, buddies
Modified: trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-10-25 16:13:49 UTC (rev 11842)
+++ trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-10-25 16:39:53 UTC (rev 11843)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>717</width>
- <height>529</height>
+ <width>710</width>
+ <height>443</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -19,52 +19,162 @@
<string>Single Symbol</string>
</property>
<layout class="QGridLayout" >
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
<item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <widget class="QLabel" name="mLabel" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>22</height>
+ </size>
</property>
- <property name="topMargin" >
- <number>0</number>
+ <property name="text" >
+ <string>Label</string>
</property>
- <property name="rightMargin" >
- <number>11</number>
+ <property name="buddy" >
+ <cstring>mLabelEdit</cstring>
</property>
- <property name="bottomMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="mLabelEdit" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>22</height>
+ </size>
</property>
- <item>
- <widget class="QLabel" name="mLabel" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>22</height>
- </size>
- </property>
- <property name="text" >
- <string>Label</string>
- </property>
- <property name="buddy" >
- <cstring>mLabelEdit</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="mLabelEdit" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>22</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
- <item row="2" column="0" >
+ <item row="1" column="0" colspan="2" >
+ <widget class="QGroupBox" name="mGroupPoint" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Point Symbol</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" colspan="5" >
+ <widget class="QListWidget" name="lstSymbols" >
+ <property name="dragDropMode" >
+ <enum>QAbstractItemView::DragDrop</enum>
+ </property>
+ <property name="alternatingRowColors" >
+ <bool>false</bool>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>0</width>
+ <height>-1</height>
+ </size>
+ </property>
+ <property name="resizeMode" >
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="viewMode" >
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes" >
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel1_3" >
+ <property name="text" >
+ <string>Rotation field</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mRotationClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QComboBox" name="mRotationClassificationComboBox" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QComboBox" name="mScaleClassificationComboBox" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel9" >
+ <property name="text" >
+ <string>Area scale field</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mScaleClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3" >
+ <widget class="QComboBox" name="mSymbolComboBox" />
+ </item>
+ <item row="2" column="2" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Symbol field</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mSymbolComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="text" >
+ <string>Size</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mPointSizeSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" >
+ <widget class="QDoubleSpinBox" name="mPointSizeSpinBox" >
+ <property name="decimals" >
+ <number>5</number>
+ </property>
+ <property name="maximum" >
+ <double>1000000.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value" >
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="4" >
+ <widget class="QCheckBox" name="mPointSizeUnitsCheckBox" >
+ <property name="text" >
+ <string>Size in map units</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -108,7 +218,7 @@
</property>
</widget>
</item>
- <item row="1" column="0" >
+ <item row="0" column="2" >
<widget class="QLabel" name="outlinecolorlabel" >
<property name="text" >
<string>Outline color</string>
@@ -118,23 +228,23 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
+ <item row="0" column="3" >
<widget class="QgsColorButton" name="btnOutlineColor" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
- <width>172</width>
+ <width>32</width>
<height>20</height>
</size>
</property>
<property name="maximumSize" >
<size>
- <width>136</width>
+ <width>32</width>
<height>16777215</height>
</size>
</property>
@@ -143,14 +253,17 @@
</property>
</widget>
</item>
- <item row="2" column="0" >
+ <item row="0" column="4" >
<widget class="QLabel" name="outlinewidthlabel" >
<property name="text" >
<string>Outline width</string>
</property>
+ <property name="buddy" >
+ <cstring>outlinewidthspinbox</cstring>
+ </property>
</widget>
</item>
- <item row="2" column="1" >
+ <item row="0" column="5" >
<widget class="QDoubleSpinBox" name="outlinewidthspinbox" >
<property name="minimumSize" >
<size>
@@ -169,42 +282,7 @@
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="fillcolorlabel" >
- <property name="text" >
- <string>Fill color</string>
- </property>
- <property name="buddy" >
- <cstring>btnFillColor</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QgsColorButton" name="btnFillColor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>100</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>172</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
+ <item row="1" column="0" >
<widget class="QLabel" name="fillcolorlabel_2" >
<property name="text" >
<string>Fill style</string>
@@ -214,7 +292,7 @@
</property>
</widget>
</item>
- <item row="4" column="1" >
+ <item row="1" column="1" >
<layout class="QHBoxLayout" >
<item>
<widget class="QComboBox" name="cboFillStyle" >
@@ -241,138 +319,54 @@
</item>
</layout>
</item>
- </layout>
- <zorder>outlinecolorlabel_2</zorder>
- <zorder>cboOutlineStyle</zorder>
- <zorder>outlinecolorlabel</zorder>
- <zorder>btnOutlineColor</zorder>
- <zorder>outlinewidthlabel</zorder>
- <zorder>outlinewidthspinbox</zorder>
- <zorder>fillcolorlabel</zorder>
- <zorder>btnFillColor</zorder>
- <zorder>fillcolorlabel_2</zorder>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="mGroupPoint" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Point Symbol</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="5" >
- <widget class="QListWidget" name="lstSymbols" >
- <property name="dragDropMode" >
- <enum>QAbstractItemView::DragDrop</enum>
- </property>
- <property name="alternatingRowColors" >
- <bool>false</bool>
- </property>
- <property name="iconSize" >
- <size>
- <width>0</width>
- <height>-1</height>
- </size>
- </property>
- <property name="resizeMode" >
- <enum>QListView::Adjust</enum>
- </property>
- <property name="viewMode" >
- <enum>QListView::IconMode</enum>
- </property>
- <property name="uniformItemSizes" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel1_3" >
+ <item row="1" column="2" >
+ <widget class="QLabel" name="fillcolorlabel" >
<property name="text" >
- <string>Rotation field</string>
+ <string>Fill color</string>
</property>
<property name="buddy" >
- <cstring>mRotationClassificationComboBox</cstring>
+ <cstring>btnFillColor</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="mRotationClassificationComboBox" >
+ <item row="1" column="3" >
+ <widget class="QgsColorButton" name="btnFillColor" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize" >
<size>
- <width>0</width>
+ <width>32</width>
<height>20</height>
</size>
</property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QComboBox" name="mScaleClassificationComboBox" >
- <property name="minimumSize" >
+ <property name="maximumSize" >
<size>
- <width>0</width>
- <height>20</height>
+ <width>32</width>
+ <height>16777215</height>
</size>
</property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel9" >
<property name="text" >
- <string>Area scale field</string>
+ <string/>
</property>
- <property name="buddy" >
- <cstring>mScaleClassificationComboBox</cstring>
- </property>
</widget>
</item>
- <item row="2" column="3" >
- <widget class="QComboBox" name="mSymbolComboBox" />
- </item>
- <item row="2" column="2" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Symbol field</string>
+ <item row="1" column="4" colspan="2" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
- </item>
- <item row="3" column="2" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
- <string>Size</string>
+ <property name="sizeHint" >
+ <size>
+ <width>271</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="3" column="3" >
- <widget class="QDoubleSpinBox" name="mPointSizeSpinBox" >
- <property name="singleStep" >
- <double>0.100000000000000</double>
- </property>
- <property name="value" >
- <double>1.000000000000000</double>
- </property>
- <property name="decimals">
- <number>5</number>
- </property>
- <property name="maximum">
- <double>1000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="4" >
- <widget class="QCheckBox" name="mPointSizeUnitsCheckBox" >
- <property name="text" >
- <string>Size in map units</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -389,12 +383,17 @@
<tabstops>
<tabstop>mLabelEdit</tabstop>
<tabstop>lstSymbols</tabstop>
+ <tabstop>mRotationClassificationComboBox</tabstop>
+ <tabstop>mSymbolComboBox</tabstop>
+ <tabstop>mScaleClassificationComboBox</tabstop>
+ <tabstop>mPointSizeSpinBox</tabstop>
+ <tabstop>mPointSizeUnitsCheckBox</tabstop>
<tabstop>cboOutlineStyle</tabstop>
<tabstop>btnOutlineColor</tabstop>
<tabstop>outlinewidthspinbox</tabstop>
- <tabstop>btnFillColor</tabstop>
<tabstop>cboFillStyle</tabstop>
<tabstop>toolSelectTexture</tabstop>
+ <tabstop>btnFillColor</tabstop>
</tabstops>
<resources/>
<connections/>
More information about the QGIS-commit
mailing list