Skip to content

Commit

Permalink
Dont use form layout use grid layout (for #2121)
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12210 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 20, 2009
1 parent 5f190ae commit 994a5ba
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 163 deletions.
238 changes: 115 additions & 123 deletions src/ui/qgscontinuouscolordialogbase.ui
View file
Expand Up @@ -13,133 +13,47 @@
<property name="windowTitle">
<string>Continuous color</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="classvarlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Classification field</string>
</property>
<property name="buddy">
<cstring>classificationComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="classificationComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mincolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Minimum value</string>
</property>
<property name="buddy">
<cstring>btnMinValue</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="maxcolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Maximum value</string>
</property>
<property name="buddy">
<cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnMinValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QgsColorButton" name="btnMaxValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="outlinewidthlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Outline width</string>
</property>
<property name="buddy">
<cstring>outlinewidthspinbox</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="cb_polygonOutline">
<property name="text">
<string>Draw polygon outline</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QLabel" name="classvarlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Classification field</string>
</property>
<property name="buddy">
<cstring>classificationComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="classificationComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
Expand All @@ -152,15 +66,93 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<spacer name="horizontalSpacer_2">
<item row="1" column="1">
<widget class="QLabel" name="mincolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Minimum value</string>
</property>
<property name="buddy">
<cstring>btnMinValue</cstring>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsColorButton" name="btnMinValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="maxcolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Maximum value</string>
</property>
<property name="buddy">
<cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsColorButton" name="btnMaxValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="outlinewidthlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Outline width</string>
</property>
<property name="buddy">
<cstring>outlinewidthspinbox</cstring>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="cb_polygonOutline">
<property name="text">
<string>Draw polygon outline</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
Expand Down
76 changes: 36 additions & 40 deletions src/ui/qgsludialogbase.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>227</width>
<height>117</height>
<height>122</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -16,57 +16,53 @@
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="mLowerLabel">
<property name="text">
<string>Lower value</string>
</property>
<property name="buddy">
<cstring>mLowerEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mLowerEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mUpperLabel">
<property name="text">
<string>Upper value</string>
</property>
<property name="buddy">
<cstring>mUpperEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mUpperEdit"/>
</item>
</layout>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mLowerLabel">
<property name="text">
<string>Lower value</string>
</property>
<property name="buddy">
<cstring>mLowerEdit</cstring>
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QLineEdit" name="mLowerEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mUpperLabel">
<property name="text">
<string>Upper value</string>
</property>
<property name="buddy">
<cstring>mUpperEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mUpperEdit"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
Expand Down

0 comments on commit 994a5ba

Please sign in to comment.