Skip to content

Commit a9e9f86

Browse files
nyalldawsonnyalldawson
committedJul 9, 2015
Tweaks to some spin box steps + add some missing clear buttons
·
ltr-3_40archive/master_2
1 parent e7410ed commit a9e9f86

File tree

4 files changed

+34
-21
lines changed

4 files changed

+34
-21
lines changed
 

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,6 +2255,7 @@ QgsLinePatternFillSymbolLayerWidget::QgsLinePatternFillSymbolLayerWidget( const
22552255
setupUi( this );
22562256
mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
22572257
mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
2258+
mOffsetSpinBox->setClearValue( 0 );
22582259
}
22592260

22602261
void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Global Options</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout_2">
17-
<property name="margin">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
1827
<number>0</number>
1928
</property>
2029
<item>
@@ -102,7 +111,7 @@
102111
<property name="minimum">
103112
<number>1</number>
104113
</property>
105-
<property name="showClearButton">
114+
<property name="showClearButton" stdset="0">
106115
<bool>false</bool>
107116
</property>
108117
</widget>
@@ -118,7 +127,7 @@
118127
<property name="maximum">
119128
<double>9999999.000000000000000</double>
120129
</property>
121-
<property name="showClearButton">
130+
<property name="showClearButton" stdset="0">
122131
<bool>false</bool>
123132
</property>
124133
</widget>
@@ -134,7 +143,7 @@
134143
<property name="maximum">
135144
<double>9999999.000000000000000</double>
136145
</property>
137-
<property name="showClearButton">
146+
<property name="showClearButton" stdset="0">
138147
<bool>false</bool>
139148
</property>
140149
</widget>
@@ -153,7 +162,7 @@
153162
<property name="maximum">
154163
<double>9999999.000000000000000</double>
155164
</property>
156-
<property name="showClearButton">
165+
<property name="showClearButton" stdset="0">
157166
<bool>false</bool>
158167
</property>
159168
</widget>
@@ -172,7 +181,7 @@
172181
<property name="maximum">
173182
<double>9999999.000000000000000</double>
174183
</property>
175-
<property name="showClearButton">
184+
<property name="showClearButton" stdset="0">
176185
<bool>false</bool>
177186
</property>
178187
</widget>
@@ -470,7 +479,10 @@
470479
<property name="suffix">
471480
<string> mm</string>
472481
</property>
473-
<property name="showClearButton">
482+
<property name="singleStep">
483+
<double>0.100000000000000</double>
484+
</property>
485+
<property name="showClearButton" stdset="0">
474486
<bool>false</bool>
475487
</property>
476488
</widget>

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<double>0.500000000000000</double>
5757
</property>
5858
<property name="showClearButton" stdset="0">
59-
<bool>false</bool>
59+
<bool>true</bool>
6060
</property>
6161
</widget>
6262
</item>
@@ -149,7 +149,7 @@
149149
<double>0.200000000000000</double>
150150
</property>
151151
<property name="showClearButton" stdset="0">
152-
<bool>false</bool>
152+
<bool>true</bool>
153153
</property>
154154
</widget>
155155
</item>
@@ -161,6 +161,11 @@
161161
</layout>
162162
</widget>
163163
<customwidgets>
164+
<customwidget>
165+
<class>QgsDataDefinedButton</class>
166+
<extends>QToolButton</extends>
167+
<header>qgsdatadefinedbutton.h</header>
168+
</customwidget>
164169
<customwidget>
165170
<class>QgsDoubleSpinBox</class>
166171
<extends>QDoubleSpinBox</extends>
@@ -172,11 +177,6 @@
172177
<header>qgsunitselectionwidget.h</header>
173178
<container>1</container>
174179
</customwidget>
175-
<customwidget>
176-
<class>QgsDataDefinedButton</class>
177-
<extends>QToolButton</extends>
178-
<header>qgsdatadefinedbutton.h</header>
179-
</customwidget>
180180
</customwidgets>
181181
<resources/>
182182
<connections/>

‎src/ui/symbollayer/widget_pointpatternfill.ui

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<double>0.200000000000000</double>
156156
</property>
157157
<property name="showClearButton" stdset="0">
158-
<bool>false</bool>
158+
<bool>true</bool>
159159
</property>
160160
</widget>
161161
</item>
@@ -205,7 +205,7 @@
205205
<double>0.200000000000000</double>
206206
</property>
207207
<property name="showClearButton" stdset="0">
208-
<bool>false</bool>
208+
<bool>true</bool>
209209
</property>
210210
</widget>
211211
</item>
@@ -231,6 +231,11 @@
231231
</layout>
232232
</widget>
233233
<customwidgets>
234+
<customwidget>
235+
<class>QgsDataDefinedButton</class>
236+
<extends>QToolButton</extends>
237+
<header>qgsdatadefinedbutton.h</header>
238+
</customwidget>
234239
<customwidget>
235240
<class>QgsDoubleSpinBox</class>
236241
<extends>QDoubleSpinBox</extends>
@@ -242,11 +247,6 @@
242247
<header>qgsunitselectionwidget.h</header>
243248
<container>1</container>
244249
</customwidget>
245-
<customwidget>
246-
<class>QgsDataDefinedButton</class>
247-
<extends>QToolButton</extends>
248-
<header>qgsdatadefinedbutton.h</header>
249-
</customwidget>
250250
</customwidgets>
251251
<resources/>
252252
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.