Skip to content

Commit

Permalink
Flip remaining symbology spinboxes to QgsDoubleSpinBox
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 5, 2014
1 parent 697ef51 commit 26e06e6
Show file tree
Hide file tree
Showing 13 changed files with 161 additions and 83 deletions.
16 changes: 13 additions & 3 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -149,7 +149,7 @@
<item row="5" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QDoubleSpinBox" name="mHeightSpinBox">
<widget class="QgsDoubleSpinBox" name="mHeightSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -165,6 +165,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -175,7 +178,7 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="mWidthSpinBox">
<widget class="QgsDoubleSpinBox" name="mWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -191,6 +194,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -266,7 +272,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<widget class="QgsDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -282,6 +288,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -432,6 +441,7 @@
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
Expand Down
6 changes: 5 additions & 1 deletion src/ui/symbollayer/widget_fontmarker.ui
View file
Expand Up @@ -62,7 +62,7 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QDoubleSpinBox" name="spinSize">
<widget class="QgsDoubleSpinBox" name="spinSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -81,6 +81,9 @@
<property name="value">
<double>12.000000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -241,6 +244,7 @@
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
Expand Down
20 changes: 17 additions & 3 deletions src/ui/symbollayer/widget_linepatternfill.ui
View file
Expand Up @@ -34,7 +34,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="mAngleSpinBox">
<widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
<property name="suffix">
<string> °</string>
</property>
Expand All @@ -44,6 +44,9 @@
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
Expand All @@ -56,7 +59,7 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="mDistanceSpinBox">
<widget class="QgsDoubleSpinBox" name="mDistanceSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -72,6 +75,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -89,7 +95,7 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QDoubleSpinBox" name="mOffsetSpinBox">
<widget class="QgsDoubleSpinBox" name="mOffsetSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -108,6 +114,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -131,6 +140,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
Expand Down
15 changes: 9 additions & 6 deletions src/ui/symbollayer/widget_markerline.ui
View file
Expand Up @@ -48,7 +48,7 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="spinInterval">
<widget class="QgsDoubleSpinBox" name="spinInterval">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -67,6 +67,9 @@
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -213,17 +216,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>radInterval</tabstop>
Expand Down
36 changes: 22 additions & 14 deletions src/ui/symbollayer/widget_pointpatternfill.ui
View file
Expand Up @@ -23,16 +23,7 @@
<property name="horizontalSpacing">
<number>28</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>1</number>
</property>
<item row="0" column="0">
Expand All @@ -45,7 +36,7 @@
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="mHorizontalDistanceSpinBox">
<widget class="QgsDoubleSpinBox" name="mHorizontalDistanceSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -61,6 +52,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -78,7 +72,7 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QDoubleSpinBox" name="mVerticalDistanceSpinBox">
<widget class="QgsDoubleSpinBox" name="mVerticalDistanceSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -94,6 +88,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -111,7 +108,7 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QDoubleSpinBox" name="mHorizontalDisplacementSpinBox">
<widget class="QgsDoubleSpinBox" name="mHorizontalDisplacementSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -127,6 +124,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -144,7 +144,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QDoubleSpinBox" name="mVerticalDisplacementSpinBox">
<widget class="QgsDoubleSpinBox" name="mVerticalDisplacementSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -160,6 +160,9 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand All @@ -183,6 +186,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
Expand Down
16 changes: 10 additions & 6 deletions src/ui/symbollayer/widget_shapeburstfill.ui
View file
Expand Up @@ -145,7 +145,7 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="mSpinMaxDistance">
<widget class="QgsDoubleSpinBox" name="mSpinMaxDistance">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -158,6 +158,9 @@
<property name="value">
<double>5.000000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -302,6 +305,12 @@
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
Expand All @@ -314,11 +323,6 @@
<extends>QComboBox</extends>
<header>qgscolorrampcombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>radioTwoColor</tabstop>
Expand Down

0 comments on commit 26e06e6

Please sign in to comment.