[QGIS Commit] r12213 - trunk/qgis/src/plugins/scale_bar
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Nov 20 15:37:24 EST 2009
Author: timlinux
Date: 2009-11-20 15:37:15 -0500 (Fri, 20 Nov 2009)
New Revision: 12213
Modified:
trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
Log:
Dont use form layout use grid layout (for #2121)
Modified: trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/scale_bar/pluginguibase.ui 2009-11-20 20:35:26 UTC (rev 12212)
+++ trunk/qgis/src/plugins/scale_bar/pluginguibase.ui 2009-11-20 20:37:15 UTC (rev 12213)
@@ -20,169 +20,162 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Placement</string>
- </property>
- <property name="buddy">
- <cstring>cboPlacement</cstring>
- </property>
- </widget>
+ <property name="text">
+ <string>Placement</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboPlacement</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboPlacement">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>Top Left</string>
+ </property>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboPlacement">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string>Top Left</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Top Right</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Bottom Left</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Bottom Right</string>
- </property>
- </item>
- </widget>
+ <item>
+ <property name="text">
+ <string>Top Right</string>
+ </property>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel1">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Scale bar style</string>
- </property>
- <property name="buddy">
- <cstring>cboStyle</cstring>
- </property>
- </widget>
+ <item>
+ <property name="text">
+ <string>Bottom Left</string>
+ </property>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboStyle">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Select the style of the scale bar</string>
- </property>
- <item>
- <property name="text">
- <string>Tick Down</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Tick Up</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Box</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Bar</string>
- </property>
- </item>
- </widget>
+ <item>
+ <property name="text">
+ <string>Bottom Right</string>
+ </property>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1_3_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Colour of bar</string>
- </property>
- <property name="buddy">
- <cstring>pbnChangeColour</cstring>
- </property>
- </widget>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Scale bar style</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboStyle</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboStyle">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Select the style of the scale bar</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Tick Down</string>
+ </property>
</item>
- <item row="2" column="1">
- <widget class="QgsColorButton" name="pbnChangeColour">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Click to select the colour</string>
- </property>
- <property name="whatsThis">
- <string>Click to select the colour</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <item>
+ <property name="text">
+ <string>Tick Up</string>
+ </property>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel1_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Size of bar</string>
- </property>
- <property name="buddy">
- <cstring>spnSize</cstring>
- </property>
- </widget>
+ <item>
+ <property name="text">
+ <string>Box</string>
+ </property>
</item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="spnSize">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
+ <item>
+ <property name="text">
+ <string>Bar</string>
+ </property>
</item>
- </layout>
+ </widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1_3_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Colour of bar</string>
+ </property>
+ <property name="buddy">
+ <cstring>pbnChangeColour</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QgsColorButton" name="pbnChangeColour">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Click to select the colour</string>
+ </property>
+ <property name="whatsThis">
+ <string>Click to select the colour</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Size of bar</string>
+ </property>
+ <property name="buddy">
+ <cstring>spnSize</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="spnSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="chkEnable">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -198,7 +191,7 @@
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="chkSnapping">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -214,7 +207,7 @@
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="6" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
More information about the QGIS-commit
mailing list