Skip to content

Commit

Permalink
[symbology] Add explanatory text for 0 line widths (fix #9937)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 10, 2016
1 parent 8eb79db commit 25ad0af
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 26 deletions.
11 changes: 7 additions & 4 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -232,7 +232,7 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -266,6 +266,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Hairline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -275,8 +278,8 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
<property name="showClearButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down Expand Up @@ -437,7 +440,7 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down
11 changes: 7 additions & 4 deletions src/ui/symbollayer/widget_simplefill.ui
View file
Expand Up @@ -219,6 +219,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Hairline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -228,8 +231,8 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
<property name="showClearButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down Expand Up @@ -360,12 +363,12 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPenStyleComboBox</class>
<class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsPenJoinStyleComboBox</class>
<class>QgsPenStyleComboBox</class>
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
Expand Down
19 changes: 11 additions & 8 deletions src/ui/symbollayer/widget_simpleline.ui
View file
Expand Up @@ -114,6 +114,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Hairline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -127,7 +130,7 @@
<double>1.000000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
</item>
Expand Down Expand Up @@ -309,6 +312,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 @@ -321,17 +329,12 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPenStyleComboBox</class>
<class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsPenJoinStyleComboBox</class>
<class>QgsPenStyleComboBox</class>
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
Expand Down
11 changes: 7 additions & 4 deletions src/ui/symbollayer/widget_simplemarker.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>513</width>
<width>517</width>
<height>398</height>
</rect>
</property>
Expand Down Expand Up @@ -43,7 +43,7 @@
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -80,6 +80,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Hairline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -89,8 +92,8 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
<property name="showClearButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down
20 changes: 16 additions & 4 deletions src/ui/symbollayer/widget_svgfill.ui
View file
Expand Up @@ -14,7 +14,16 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item row="1" column="0">
Expand Down Expand Up @@ -155,6 +164,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>No outline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -164,8 +176,8 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<bool>false</bool>
<property name="showClearButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down Expand Up @@ -200,7 +212,7 @@
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down
7 changes: 5 additions & 2 deletions src/ui/symbollayer/widget_svgmarker.ui
View file
Expand Up @@ -26,6 +26,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>No outline</string>
</property>
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -38,7 +41,7 @@
<property name="value">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -334,7 +337,7 @@
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down

0 comments on commit 25ad0af

Please sign in to comment.