[QGIS Commit] r12123 - in trunk/qgis/src: plugins/diagram_overlay ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Nov 15 10:19:44 EST 2009
Author: timlinux
Date: 2009-11-15 10:19:43 -0500 (Sun, 15 Nov 2009)
New Revision: 12123
Modified:
trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
UI tidy ups
Modified: trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui 2009-11-15 14:47:17 UTC (rev 12122)
+++ trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui 2009-11-15 15:19:43 UTC (rev 12123)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>398</width>
- <height>441</height>
+ <width>338</width>
+ <height>324</height>
</rect>
</property>
<property name="windowTitle">
Modified: trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-15 14:47:17 UTC (rev 12122)
+++ trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-15 15:19:43 UTC (rev 12123)
@@ -20,7 +20,7 @@
<item row="0" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
- <string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
+ <string>Scale linearly between 0 and the following attribute value / diagram size:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Modified: trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-15 14:47:17 UTC (rev 12122)
+++ trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-15 15:19:43 UTC (rev 12123)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>703</width>
- <height>518</height>
+ <width>360</width>
+ <height>470</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,210 +19,146 @@
<property name="windowTitle">
<string>Single Symbol</string>
</property>
- <layout class="QGridLayout" name="gridLayout_5">
+ <layout class="QGridLayout" name="gridLayout_6">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
- <widget class="QLabel" name="mLabel">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>22</height>
- </size>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
+ <bool>true</bool>
</property>
- <property name="text">
- <string>Label</string>
- </property>
- <property name="buddy">
- <cstring>mLabelEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="mLabelEdit">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>22</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QGroupBox" name="mGroupPoint">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Point Symbol</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0" colspan="3">
- <widget class="QListWidget" name="lstSymbols">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <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="1" column="0">
- <widget class="QLabel" name="textLabel1_2">
- <property name="text">
- <string>Size</string>
- </property>
- <property name="buddy">
- <cstring>mPointSizeSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <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="1" column="2">
- <widget class="QCheckBox" name="mPointSizeUnitsCheckBox">
- <property name="text">
- <string>In map units</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <layout class="QHBoxLayout" name="horizontalLayout"/>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QGroupBox" name="mGroupDrawingByField">
- <property name="title">
- <string>Drawing by field</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="mLblRotationField">
- <property name="text">
- <string>Rotation</string>
- </property>
- <property name="buddy">
- <cstring>mRotationClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="mRotationClassificationComboBox">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel9">
- <property name="text">
- <string>Area scale</string>
- </property>
- <property name="buddy">
- <cstring>mScaleClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="mScaleClassificationComboBox">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Symbol</string>
- </property>
- <property name="buddy">
- <cstring>mSymbolComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="mSymbolComboBox"/>
- </item>
- <item row="3" column="0">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>337</width>
+ <height>616</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="mGroupPoint">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Point Symbol</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0" colspan="3">
+ <widget class="QListWidget" name="lstSymbols">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <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="1" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="text">
+ <string>Size</string>
+ </property>
+ <property name="buddy">
+ <cstring>mPointSizeSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <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="1" column="2">
+ <widget class="QCheckBox" name="mPointSizeUnitsCheckBox">
+ <property name="text">
+ <string>In map units</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <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 row="2" column="0">
+ <widget class="QLineEdit" name="mLabelEdit">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Fill options</string>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
<widget class="QComboBox" name="cboFillStyle">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -239,16 +175,22 @@
<height>16777215</height>
</size>
</property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
</widget>
</item>
- <item row="0" column="1">
+ <item>
<widget class="QToolButton" name="toolSelectTexture">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
- <item row="0" column="2">
+ <item>
<widget class="QgsColorButton" name="btnFillColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -259,7 +201,7 @@
<property name="minimumSize">
<size>
<width>32</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
<property name="maximumSize">
@@ -273,7 +215,7 @@
</property>
</widget>
</item>
- <item row="0" column="3">
+ <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -289,7 +231,7 @@
</layout>
</widget>
</item>
- <item>
+ <item row="4" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -300,11 +242,14 @@
<property name="title">
<string>Outline options</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QHBoxLayout"/>
+ </item>
+ <item>
<widget class="QComboBox" name="cboOutlineStyle">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -315,15 +260,15 @@
<height>20</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="iconSize">
<size>
- <width>172</width>
- <height>16777215</height>
+ <width>32</width>
+ <height>32</height>
</size>
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item>
<widget class="QgsColorButton" name="btnOutlineColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -334,7 +279,7 @@
<property name="minimumSize">
<size>
<width>32</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
<property name="maximumSize">
@@ -348,7 +293,7 @@
</property>
</widget>
</item>
- <item row="0" column="2">
+ <item>
<widget class="QLabel" name="outlinewidthlabel">
<property name="text">
<string>Width</string>
@@ -358,8 +303,14 @@
</property>
</widget>
</item>
- <item row="0" column="3">
+ <item>
<widget class="QDoubleSpinBox" name="outlinewidthspinbox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
<width>0</width>
@@ -377,10 +328,7 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <layout class="QHBoxLayout"/>
- </item>
- <item row="0" column="4">
+ <item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -396,22 +344,57 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="5" column="0">
+ <widget class="QGroupBox" name="mGroupDrawingByField">
+ <property name="title">
+ <string>Drawing by field</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mLblRotationField">
+ <property name="text">
+ <string>Rotation</string>
+ </property>
+ <property name="buddy">
+ <cstring>mRotationClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mRotationClassificationComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel9">
+ <property name="text">
+ <string>Area scale</string>
+ </property>
+ <property name="buddy">
+ <cstring>mScaleClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="mScaleClassificationComboBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Symbol</string>
+ </property>
+ <property name="buddy">
+ <cstring>mSymbolComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="mSymbolComboBox"/>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
- </item>
- </layout>
+ </widget>
+ </widget>
</item>
</layout>
</widget>
@@ -424,14 +407,20 @@
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>mLabelEdit</tabstop>
<tabstop>lstSymbols</tabstop>
- <tabstop>mRotationClassificationComboBox</tabstop>
- <tabstop>mSymbolComboBox</tabstop>
- <tabstop>mScaleClassificationComboBox</tabstop>
+ <tabstop>mPointSizeSpinBox</tabstop>
+ <tabstop>mPointSizeUnitsCheckBox</tabstop>
+ <tabstop>mLabelEdit</tabstop>
+ <tabstop>cboFillStyle</tabstop>
+ <tabstop>toolSelectTexture</tabstop>
+ <tabstop>btnFillColor</tabstop>
<tabstop>cboOutlineStyle</tabstop>
<tabstop>btnOutlineColor</tabstop>
<tabstop>outlinewidthspinbox</tabstop>
+ <tabstop>mRotationClassificationComboBox</tabstop>
+ <tabstop>mScaleClassificationComboBox</tabstop>
+ <tabstop>mSymbolComboBox</tabstop>
+ <tabstop>scrollArea</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-15 14:47:17 UTC (rev 12122)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-15 15:19:43 UTC (rev 12123)
@@ -74,7 +74,7 @@
<item row="0" column="2" colspan="3">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page_3">
<layout class="QGridLayout" name="gridLayout_4">
More information about the QGIS-commit
mailing list