Skip to content

Commit

Permalink
increase maximum value for outline width in symbols widgets (fix #14094)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed Jan 14, 2016
1 parent 32423a3 commit 2aa523d
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 51 deletions.
18 changes: 9 additions & 9 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -222,7 +222,7 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -260,12 +260,12 @@
<number>6</number>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -437,7 +437,7 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -553,6 +553,11 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -569,11 +574,6 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>btnChangeColorFill</tabstop>
Expand Down
14 changes: 7 additions & 7 deletions src/ui/symbollayer/widget_simplefill.ui
View file
Expand Up @@ -223,12 +223,12 @@
<number>6</number>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -343,6 +343,11 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -359,11 +364,6 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends>
Expand Down
17 changes: 10 additions & 7 deletions src/ui/symbollayer/widget_simplemarker.ui
View file
Expand Up @@ -43,7 +43,7 @@
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -83,10 +83,13 @@
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -472,6 +475,11 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -488,11 +496,6 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>btnChangeColorFill</tabstop>
Expand Down
29 changes: 10 additions & 19 deletions src/ui/symbollayer/widget_svgfill.ui
View file
Expand Up @@ -14,16 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<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="1" column="0">
Expand Down Expand Up @@ -168,12 +159,12 @@
<number>6</number>
</property>
<property name="maximum">
<double>99999999.989999994635582</double>
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -204,12 +195,12 @@
<number>6</number>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -332,6 +323,11 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -343,11 +339,6 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mTextureWidthSpinBox</tabstop>
Expand Down
18 changes: 9 additions & 9 deletions src/ui/symbollayer/widget_svgmarker.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>519</width>
<height>364</height>
<height>389</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -30,15 +30,15 @@
<number>6</number>
</property>
<property name="maximum">
<double>99999999.989999994635582</double>
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="value">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -334,7 +334,7 @@
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<property name="showClearButton">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -501,6 +501,11 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -512,11 +517,6 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>spinSize</tabstop>
Expand Down

0 comments on commit 2aa523d

Please sign in to comment.