Skip to content

Commit 6fb347d

Browse files
vmoranyalldawson
vmora
authored and
nyalldawson
committedJan 21, 2015
improve GUI consistency & UX for data-defined style
data defined buttons added to the gui fixes #9881
·
ltr-3_40archive/master_2
1 parent ecb93b1 commit 6fb347d

22 files changed

+2268
-1863
lines changed
 

‎python/core/qgsdatadefined.sip

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ class QgsDataDefined
2222
const QString& expr = QString(),
2323
const QString& field = QString() );
2424

25+
/**
26+
* Construct a new data defined object, analyse the expression to determine
27+
* if it's a simple field
28+
*
29+
* @param expression can be null
30+
*/
31+
QgsDataDefined( const QgsExpression * expression );
32+
2533
~QgsDataDefined();
2634

2735
/**Returns whether the data defined container is set to all the default

‎python/gui/symbology-ng/qgssymbollayerv2widget.sip

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
4242
void on_mPenWidthUnitWidget_changed();
4343
void on_mOffsetUnitWidget_changed();
4444
void on_mDashPatternUnitWidget_changed();
45-
void on_mDataDefinedPropertiesButton_clicked();
4645
void on_mDrawInsideCheckBox_stateChanged( int state );
4746

4847
protected:
@@ -77,7 +76,6 @@ class QgsSimpleMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
7776
void on_mSizeUnitWidget_changed();
7877
void on_mOffsetUnitWidget_changed();
7978
void on_mOutlineWidthUnitWidget_changed();
80-
void on_mDataDefinedPropertiesButton_clicked();
8179
void on_mOutlineStyleComboBox_currentIndexChanged( int index );
8280
void on_mOutlineWidthSpinBox_valueChanged( double d );
8381
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
@@ -110,7 +108,6 @@ class QgsSimpleFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
110108
void offsetChanged();
111109
void on_mBorderWidthUnitWidget_changed();
112110
void on_mOffsetUnitWidget_changed();
113-
void on_mDataDefinedPropertiesButton_clicked();
114111
};
115112

116113

@@ -141,7 +138,6 @@ class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
141138
void offsetChanged();
142139
void referencePointChanged();
143140
void on_mOffsetUnitWidget_changed();
144-
void on_mDataDefinedPropertiesButton_clicked();
145141
void colorModeChanged();
146142
void on_mSpinAngle_valueChanged( double value );
147143
};
@@ -174,7 +170,6 @@ class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
174170
void on_mButtonEditRamp_clicked();
175171
void offsetChanged();
176172
void on_mOffsetUnitWidget_changed();
177-
void on_mDataDefinedPropertiesButton_clicked();
178173
void on_mIgnoreRingsCheckBox_stateChanged( int state );
179174
};
180175

@@ -204,8 +199,6 @@ class QgsMarkerLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
204199
void on_mIntervalUnitWidget_changed();
205200
void on_mOffsetUnitWidget_changed();
206201
void on_mOffsetAlongLineUnitWidget_changed();
207-
void on_mDataDefinedPropertiesButton_clicked();
208-
209202
};
210203

211204

@@ -241,11 +234,9 @@ class QgsSvgMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
241234
void on_mSizeUnitWidget_changed();
242235
void on_mBorderWidthUnitWidget_changed();
243236
void on_mOffsetUnitWidget_changed();
244-
void on_mDataDefinedPropertiesButton_clicked();
245237
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
246238
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
247239

248-
249240
protected:
250241

251242
void populateList();

‎src/core/qgsdatadefined.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ QgsDataDefined::QgsDataDefined( bool active,
3333
mExpressionPrepared = false;
3434
}
3535

36+
QgsDataDefined::QgsDataDefined( const QgsExpression * expression )
37+
: mActive( bool( expression ) )
38+
, mUseExpression( expression && expression->rootNode() && !dynamic_cast<const QgsExpression::NodeColumnRef*>( expression->rootNode() ) )
39+
, mExpressionString( mUseExpression ? expression->dump() : "" )
40+
, mField( !mUseExpression ? ( expression ? expression->dump() : "" ) : "" )
41+
{
42+
mExpression = 0;
43+
mExpressionPrepared = false;
44+
}
45+
3646
QgsDataDefined::~QgsDataDefined()
3747
{
3848
mExpressionParams.clear();

‎src/core/qgsdatadefined.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ class CORE_EXPORT QgsDataDefined
4444
const QString& expr = QString(),
4545
const QString& field = QString() );
4646

47+
/**
48+
* Construct a new data defined object, analyse the expression to determine
49+
* if it's a simple field
50+
*
51+
* @param expression can be null
52+
*/
53+
explicit QgsDataDefined( const QgsExpression * expression );
54+
4755
~QgsDataDefined();
4856

4957
/**Returns whether the data defined container is set to all the default

‎src/gui/qgsdatadefinedbutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,
169169
fieldType = tr( "string" );
170170
break;
171171
case QVariant::Int:
172-
fieldMatch = mDataTypes.testFlag( Int );
172+
fieldMatch = mDataTypes.testFlag( Int ) || mDataTypes.testFlag( Double );
173173
fieldType = tr( "integer" );
174174
break;
175175
case QVariant::Double:

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

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,19 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
109109
mHorizontalAnchorComboBox->setCurrentIndex( mLayer->horizontalAnchorPoint() );
110110
mVerticalAnchorComboBox->setCurrentIndex( mLayer->verticalAnchorPoint() );
111111
blockComboSignals( false );
112+
113+
registerDataDefinedButton( mSymbolWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
114+
registerDataDefinedButton( mSymbolHeightDDBtn, "height", QgsDataDefinedButton::Double, "" );
115+
registerDataDefinedButton( mRotationDDBtn, "rotation", QgsDataDefinedButton::Double, "" );
116+
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, "" );
117+
registerDataDefinedButton( mFillColorDDBtn, "fill_color", QgsDataDefinedButton::String, "'red,green,blue,alpha' e.g. '255,0,0,255'" );
118+
registerDataDefinedButton( mBorderColorDDBtn, "outline_color", QgsDataDefinedButton::String, "'red,green,blue,alpha' e.g. '255,0,0,255'" );
119+
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, "'no'|'solid'|'dash'|'dot'|'dash dot'|'dash dot dot'" );
120+
registerDataDefinedButton( mShapeDDBtn, "symbol_name", QgsDataDefinedButton::String, "'circle', 'rectangle', 'cross', 'triangle'" );
121+
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, "'x,y' e.g. '2,3.5'" );
122+
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, "'left', 'center' or 'right'" );
123+
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, "'top', 'center' or 'bottom'" );
124+
112125
}
113126

114127
QgsSymbolLayerV2* QgsEllipseSymbolLayerV2Widget::symbolLayer()
@@ -273,53 +286,6 @@ void QgsEllipseSymbolLayerV2Widget::on_mVerticalAnchorComboBox_currentIndexChang
273286
}
274287
}
275288

276-
void QgsEllipseSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
277-
{
278-
if ( !mLayer )
279-
{
280-
return;
281-
}
282-
283-
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
284-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "width", tr( "Symbol width" ), mLayer->dataDefinedPropertyString( "width" ),
285-
QgsDataDefinedSymbolDialog::doubleHelpText() );
286-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "height", tr( "Symbol height" ), mLayer->dataDefinedPropertyString( "height" ),
287-
QgsDataDefinedSymbolDialog::doubleHelpText() );
288-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "rotation", tr( "Rotation" ), mLayer->dataDefinedPropertyString( "rotation" ),
289-
QgsDataDefinedSymbolDialog::doubleHelpText() );
290-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline_width", tr( "Outline width" ), mLayer->dataDefinedPropertyString( "outline_width" ),
291-
QgsDataDefinedSymbolDialog::doubleHelpText() );
292-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "fill_color", tr( "Fill color" ), mLayer->dataDefinedPropertyString( "fill_color" ),
293-
QgsDataDefinedSymbolDialog::colorHelpText() );
294-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline_color", tr( "Border color" ), mLayer->dataDefinedPropertyString( "outline_color" ),
295-
QgsDataDefinedSymbolDialog::colorHelpText() );
296-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "symbol_name", tr( "Symbol name" ), mLayer->dataDefinedPropertyString( "symbol_name" ),
297-
"'circle'|'rectangle'|'cross'|'triangle'" );
298-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ),
299-
QgsDataDefinedSymbolDialog::offsetHelpText() );
300-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "horizontal_anchor_point", tr( "Horizontal anchor point" ), mLayer->dataDefinedPropertyString( "horizontal_anchor_point" ),
301-
QgsDataDefinedSymbolDialog::horizontalAnchorHelpText() );
302-
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "vertical_anchor_point", tr( "Vertical anchor point" ), mLayer->dataDefinedPropertyString( "vertical_anchor_point" ),
303-
QgsDataDefinedSymbolDialog::verticalAnchorHelpText() );
304-
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
305-
if ( d.exec() == QDialog::Accepted )
306-
{
307-
//empty all existing properties first
308-
mLayer->removeDataDefinedProperties();
309-
310-
QMap<QString, QString> properties = d.dataDefinedProperties();
311-
QMap<QString, QString>::const_iterator it = properties.constBegin();
312-
for ( ; it != properties.constEnd(); ++it )
313-
{
314-
if ( !it.value().isEmpty() )
315-
{
316-
mLayer->setDataDefinedProperty( it.key(), it.value() );
317-
}
318-
}
319-
emit changed();
320-
}
321-
}
322-
323289
void QgsEllipseSymbolLayerV2Widget::setOffset()
324290
{
325291
mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) );

‎src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class GUI_EXPORT QgsEllipseSymbolLayerV2Widget: public QgsSymbolLayerV2Widget, p
5555
void on_mOffsetUnitWidget_changed();
5656
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
5757
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
58-
void on_mDataDefinedPropertiesButton_clicked();
5958

6059
void setOffset();
6160
};

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

Lines changed: 97 additions & 419 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
#ifndef QGSSYMBOLLAYERV2WIDGET_H
1818
#define QGSSYMBOLLAYERV2WIDGET_H
1919

20+
#include <qgsdatadefinedbutton.h>
21+
2022
#include <QWidget>
2123

2224
class QgsSymbolLayerV2;
2325
class QgsVectorLayer;
2426

25-
2627
class GUI_EXPORT QgsSymbolLayerV2Widget : public QWidget
2728
{
2829
Q_OBJECT
@@ -36,6 +37,9 @@ class GUI_EXPORT QgsSymbolLayerV2Widget : public QWidget
3637

3738
protected:
3839
const QgsVectorLayer* mVectorLayer;
40+
41+
void registerDataDefinedButton( QgsDataDefinedButton * button, const QString & propertyName, QgsDataDefinedButton::DataType type, const QString & description );
42+
3943
/** Get label for data defined entry.
4044
* Implemented only for 'size' of marker symbols
4145
* @note added in 2.1
@@ -44,6 +48,9 @@ class GUI_EXPORT QgsSymbolLayerV2Widget : public QWidget
4448

4549
signals:
4650
void changed();
51+
52+
protected slots:
53+
void updateDataDefinedProperty();
4754
};
4855

4956
///////////
@@ -75,7 +82,6 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerV2Widget : public QgsSymbolLayerV2Widge
7582
void on_mPenWidthUnitWidget_changed();
7683
void on_mOffsetUnitWidget_changed();
7784
void on_mDashPatternUnitWidget_changed();
78-
void on_mDataDefinedPropertiesButton_clicked();
7985
void on_mDrawInsideCheckBox_stateChanged( int state );
8086

8187
protected:
@@ -114,7 +120,6 @@ class GUI_EXPORT QgsSimpleMarkerSymbolLayerV2Widget : public QgsSymbolLayerV2Wid
114120
void on_mSizeUnitWidget_changed();
115121
void on_mOffsetUnitWidget_changed();
116122
void on_mOutlineWidthUnitWidget_changed();
117-
void on_mDataDefinedPropertiesButton_clicked();
118123
void on_mOutlineStyleComboBox_currentIndexChanged( int index );
119124
void on_mOutlineWidthSpinBox_valueChanged( double d );
120125
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
@@ -152,7 +157,6 @@ class GUI_EXPORT QgsSimpleFillSymbolLayerV2Widget : public QgsSymbolLayerV2Widge
152157
void offsetChanged();
153158
void on_mBorderWidthUnitWidget_changed();
154159
void on_mOffsetUnitWidget_changed();
155-
void on_mDataDefinedPropertiesButton_clicked();
156160

157161
protected:
158162
QgsSimpleFillSymbolLayerV2* mLayer;
@@ -189,7 +193,6 @@ class GUI_EXPORT QgsGradientFillSymbolLayerV2Widget : public QgsSymbolLayerV2Wid
189193
void offsetChanged();
190194
void referencePointChanged();
191195
void on_mOffsetUnitWidget_changed();
192-
void on_mDataDefinedPropertiesButton_clicked();
193196
void colorModeChanged();
194197
void on_mSpinAngle_valueChanged( double value );
195198

@@ -228,7 +231,6 @@ class GUI_EXPORT QgsShapeburstFillSymbolLayerV2Widget : public QgsSymbolLayerV2W
228231
void on_mButtonEditRamp_clicked();
229232
void offsetChanged();
230233
void on_mOffsetUnitWidget_changed();
231-
void on_mDataDefinedPropertiesButton_clicked();
232234
void on_mIgnoreRingsCheckBox_stateChanged( int state );
233235

234236
protected:
@@ -264,7 +266,6 @@ class GUI_EXPORT QgsMarkerLineSymbolLayerV2Widget : public QgsSymbolLayerV2Widge
264266
void on_mIntervalUnitWidget_changed();
265267
void on_mOffsetUnitWidget_changed();
266268
void on_mOffsetAlongLineUnitWidget_changed();
267-
void on_mDataDefinedPropertiesButton_clicked();
268269

269270
protected:
270271

@@ -306,7 +307,6 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerV2Widget : public QgsSymbolLayerV2Widget
306307
void on_mSizeUnitWidget_changed();
307308
void on_mBorderWidthUnitWidget_changed();
308309
void on_mOffsetUnitWidget_changed();
309-
void on_mDataDefinedPropertiesButton_clicked();
310310
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
311311
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
312312

@@ -352,7 +352,6 @@ class GUI_EXPORT QgsRasterFillSymbolLayerWidget : public QgsSymbolLayerV2Widget,
352352
void on_mRotationSpinBox_valueChanged( double d );
353353
void on_mWidthUnitWidget_changed();
354354
void on_mWidthSpinBox_valueChanged( double d );
355-
void on_mDataDefinedPropertiesButton_clicked();
356355

357356
private:
358357
void updatePreviewImage();
@@ -400,7 +399,6 @@ class GUI_EXPORT QgsSVGFillSymbolLayerWidget : public QgsSymbolLayerV2Widget, pr
400399
void on_mBorderWidthSpinBox_valueChanged( double d );
401400
void on_mTextureWidthUnitWidget_changed();
402401
void on_mSvgOutlineWidthUnitWidget_changed();
403-
void on_mDataDefinedPropertiesButton_clicked();
404402
};
405403

406404
//////////
@@ -430,7 +428,6 @@ class GUI_EXPORT QgsLinePatternFillSymbolLayerWidget : public QgsSymbolLayerV2Wi
430428
void on_mOffsetSpinBox_valueChanged( double d );
431429
void on_mDistanceUnitWidget_changed();
432430
void on_mOffsetUnitWidget_changed();
433-
void on_mDataDefinedPropertiesButton_clicked();
434431
};
435432

436433
//////////
@@ -462,7 +459,6 @@ class GUI_EXPORT QgsPointPatternFillSymbolLayerWidget: public QgsSymbolLayerV2Wi
462459
void on_mVerticalDistanceUnitWidget_changed();
463460
void on_mHorizontalDisplacementUnitWidget_changed();
464461
void on_mVerticalDisplacementUnitWidget_changed();
465-
void on_mDataDefinedPropertiesButton_clicked();
466462
};
467463

468464
/////////

‎src/ui/symbollayer/widget_ellipse.ui

Lines changed: 304 additions & 189 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_gradientfill.ui

Lines changed: 350 additions & 230 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>368</width>
10-
<height>293</height>
9+
<width>580</width>
10+
<height>387</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -26,37 +26,48 @@
2626
<property name="margin">
2727
<number>1</number>
2828
</property>
29-
<item row="0" column="0">
29+
<item row="1" column="0">
3030
<widget class="QLabel" name="mAngleLabel">
3131
<property name="text">
3232
<string>Angle</string>
3333
</property>
3434
</widget>
3535
</item>
36-
<item row="0" column="1">
37-
<widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
38-
<property name="suffix">
39-
<string> °</string>
40-
</property>
41-
<property name="maximum">
42-
<double>360.000000000000000</double>
43-
</property>
44-
<property name="singleStep">
45-
<double>0.500000000000000</double>
46-
</property>
47-
<property name="showClearButton">
48-
<bool>false</bool>
49-
</property>
50-
</widget>
36+
<item row="1" column="1">
37+
<layout class="QHBoxLayout" name="horizontalLayout_2">
38+
<item>
39+
<widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
40+
<property name="suffix">
41+
<string> °</string>
42+
</property>
43+
<property name="maximum">
44+
<double>360.000000000000000</double>
45+
</property>
46+
<property name="singleStep">
47+
<double>0.500000000000000</double>
48+
</property>
49+
<property name="showClearButton" stdset="0">
50+
<bool>false</bool>
51+
</property>
52+
</widget>
53+
</item>
54+
<item>
55+
<widget class="QgsDataDefinedButton" name="mAngleDDBtn">
56+
<property name="text">
57+
<string>...</string>
58+
</property>
59+
</widget>
60+
</item>
61+
</layout>
5162
</item>
52-
<item row="1" column="0">
63+
<item row="3" column="0">
5364
<widget class="QLabel" name="mDistanceLabel">
5465
<property name="text">
5566
<string>Distance</string>
5667
</property>
5768
</widget>
5869
</item>
59-
<item row="1" column="1">
70+
<item row="3" column="1">
6071
<layout class="QHBoxLayout" name="horizontalLayout">
6172
<item>
6273
<widget class="QgsDoubleSpinBox" name="mDistanceSpinBox">
@@ -75,24 +86,38 @@
7586
<property name="singleStep">
7687
<double>0.200000000000000</double>
7788
</property>
78-
<property name="showClearButton">
89+
<property name="showClearButton" stdset="0">
7990
<bool>false</bool>
8091
</property>
8192
</widget>
8293
</item>
8394
<item>
84-
<widget class="QgsUnitSelectionWidget" name="mDistanceUnitWidget" native="true"/>
95+
<widget class="QgsDataDefinedButton" name="mDistanceDDBtn">
96+
<property name="text">
97+
<string>...</string>
98+
</property>
99+
</widget>
100+
</item>
101+
<item>
102+
<widget class="QgsUnitSelectionWidget" name="mDistanceUnitWidget" native="true">
103+
<property name="minimumSize">
104+
<size>
105+
<width>0</width>
106+
<height>0</height>
107+
</size>
108+
</property>
109+
</widget>
85110
</item>
86111
</layout>
87112
</item>
88-
<item row="2" column="0">
113+
<item row="4" column="0">
89114
<widget class="QLabel" name="mOffsetLabel">
90115
<property name="text">
91116
<string>Offset</string>
92117
</property>
93118
</widget>
94119
</item>
95-
<item row="2" column="1">
120+
<item row="4" column="1">
96121
<layout class="QHBoxLayout" name="horizontalLayout_4">
97122
<item>
98123
<widget class="QgsDoubleSpinBox" name="mOffsetSpinBox">
@@ -114,7 +139,7 @@
114139
<property name="singleStep">
115140
<double>0.200000000000000</double>
116141
</property>
117-
<property name="showClearButton">
142+
<property name="showClearButton" stdset="0">
118143
<bool>false</bool>
119144
</property>
120145
</widget>
@@ -124,19 +149,6 @@
124149
</item>
125150
</layout>
126151
</item>
127-
<item row="3" column="0" colspan="2">
128-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
129-
<property name="sizePolicy">
130-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
131-
<horstretch>0</horstretch>
132-
<verstretch>0</verstretch>
133-
</sizepolicy>
134-
</property>
135-
<property name="text">
136-
<string>Data defined properties...</string>
137-
</property>
138-
</widget>
139-
</item>
140152
</layout>
141153
</widget>
142154
<customwidgets>
@@ -151,6 +163,11 @@
151163
<header>qgsunitselectionwidget.h</header>
152164
<container>1</container>
153165
</customwidget>
166+
<customwidget>
167+
<class>QgsDataDefinedButton</class>
168+
<extends>QToolButton</extends>
169+
<header>qgsdatadefinedbutton.h</header>
170+
</customwidget>
154171
</customwidgets>
155172
<resources/>
156173
<connections/>

‎src/ui/symbollayer/widget_markerline.ui

Lines changed: 95 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>368</width>
10-
<height>332</height>
9+
<width>765</width>
10+
<height>404</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -35,20 +35,17 @@
3535
<string>Marker placement</string>
3636
</property>
3737
<layout class="QGridLayout" name="gridLayout">
38-
<item row="0" column="0">
39-
<layout class="QHBoxLayout" name="horizontalLayout_4">
38+
<item row="5" column="1">
39+
<layout class="QHBoxLayout" name="horizontalLayout">
4040
<item>
41-
<widget class="QRadioButton" name="radInterval">
41+
<widget class="QLabel" name="label">
4242
<property name="text">
43-
<string>with interval</string>
44-
</property>
45-
<property name="checked">
46-
<bool>true</bool>
43+
<string>Offset along line</string>
4744
</property>
4845
</widget>
4946
</item>
5047
<item>
51-
<widget class="QgsDoubleSpinBox" name="spinInterval">
48+
<widget class="QgsDoubleSpinBox" name="mSpinOffsetAlongLine">
5249
<property name="sizePolicy">
5350
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
5451
<horstretch>1</horstretch>
@@ -67,55 +64,62 @@
6764
<property name="value">
6865
<double>1.000000000000000</double>
6966
</property>
70-
<property name="showClearButton">
71-
<bool>false</bool>
67+
</widget>
68+
</item>
69+
<item>
70+
<widget class="QgsDataDefinedButton" name="mOffsetAlongLineDDBtn">
71+
<property name="text">
72+
<string>...</string>
7273
</property>
7374
</widget>
7475
</item>
7576
<item>
76-
<widget class="QgsUnitSelectionWidget" name="mIntervalUnitWidget" native="true"/>
77+
<widget class="QgsUnitSelectionWidget" name="mOffsetAlongLineUnitWidget" native="true">
78+
<property name="minimumSize">
79+
<size>
80+
<width>0</width>
81+
<height>0</height>
82+
</size>
83+
</property>
84+
</widget>
7785
</item>
7886
</layout>
7987
</item>
80-
<item row="1" column="0">
81-
<widget class="QRadioButton" name="radVertex">
82-
<property name="text">
83-
<string>on every vertex</string>
84-
</property>
85-
</widget>
86-
</item>
87-
<item row="2" column="0">
88-
<widget class="QRadioButton" name="radVertexLast">
88+
<item row="4" column="1">
89+
<widget class="QRadioButton" name="radCentralPoint">
8990
<property name="text">
90-
<string>on last vertex only</string>
91+
<string>on central point</string>
9192
</property>
9293
</widget>
9394
</item>
94-
<item row="3" column="0">
95-
<widget class="QRadioButton" name="radVertexFirst">
95+
<item row="1" column="1">
96+
<widget class="QRadioButton" name="radVertex">
9697
<property name="text">
97-
<string>on first vertex only</string>
98+
<string>on every vertex</string>
9899
</property>
99100
</widget>
100101
</item>
101-
<item row="4" column="0">
102-
<widget class="QRadioButton" name="radCentralPoint">
102+
<item row="2" column="1">
103+
<widget class="QRadioButton" name="radVertexLast">
103104
<property name="text">
104-
<string>on central point</string>
105+
<string>on last vertex only</string>
105106
</property>
106107
</widget>
107108
</item>
108-
<item row="5" column="0">
109-
<layout class="QHBoxLayout" name="horizontalLayout">
109+
<item row="0" column="1">
110+
<layout class="QHBoxLayout" name="horizontalLayout_4">
110111
<item>
111-
<widget class="QLabel" name="label">
112+
<widget class="QRadioButton" name="radInterval">
112113
<property name="text">
113-
<string>Offset along line</string>
114+
<string>with interval</string>
115+
</property>
116+
<property name="checked">
117+
<bool>true</bool>
114118
</property>
115119
</widget>
116120
</item>
117121
<item>
118-
<widget class="QgsDoubleSpinBox" name="mSpinOffsetAlongLine">
122+
<widget class="QgsDoubleSpinBox" name="spinInterval">
119123
<property name="sizePolicy">
120124
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
121125
<horstretch>1</horstretch>
@@ -134,13 +138,44 @@
134138
<property name="value">
135139
<double>1.000000000000000</double>
136140
</property>
141+
<property name="showClearButton" stdset="0">
142+
<bool>false</bool>
143+
</property>
144+
</widget>
145+
</item>
146+
<item>
147+
<widget class="QgsDataDefinedButton" name="mIntervalDDBtn">
148+
<property name="text">
149+
<string>...</string>
150+
</property>
137151
</widget>
138152
</item>
139153
<item>
140-
<widget class="QgsUnitSelectionWidget" name="mOffsetAlongLineUnitWidget" native="true"/>
154+
<widget class="QgsUnitSelectionWidget" name="mIntervalUnitWidget" native="true">
155+
<property name="minimumSize">
156+
<size>
157+
<width>0</width>
158+
<height>0</height>
159+
</size>
160+
</property>
161+
</widget>
141162
</item>
142163
</layout>
143164
</item>
165+
<item row="3" column="1">
166+
<widget class="QRadioButton" name="radVertexFirst">
167+
<property name="text">
168+
<string>on first vertex only</string>
169+
</property>
170+
</widget>
171+
</item>
172+
<item row="0" column="0">
173+
<widget class="QgsDataDefinedButton" name="mPlacementDDBtn">
174+
<property name="text">
175+
<string>...</string>
176+
</property>
177+
</widget>
178+
</item>
144179
</layout>
145180
</widget>
146181
</item>
@@ -183,24 +218,25 @@
183218
</widget>
184219
</item>
185220
<item>
186-
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
221+
<widget class="QgsDataDefinedButton" name="mLineOffsetDDBtn">
222+
<property name="text">
223+
<string>...</string>
224+
</property>
225+
</widget>
226+
</item>
227+
<item>
228+
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true">
229+
<property name="minimumSize">
230+
<size>
231+
<width>0</width>
232+
<height>0</height>
233+
</size>
234+
</property>
235+
</widget>
187236
</item>
188237
</layout>
189238
</item>
190-
<item row="4" column="0" colspan="2">
191-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
192-
<property name="sizePolicy">
193-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
194-
<horstretch>0</horstretch>
195-
<verstretch>0</verstretch>
196-
</sizepolicy>
197-
</property>
198-
<property name="text">
199-
<string>Data defined properties</string>
200-
</property>
201-
</widget>
202-
</item>
203-
<item row="5" column="0">
239+
<item row="4" column="0">
204240
<spacer name="verticalSpacer">
205241
<property name="orientation">
206242
<enum>Qt::Vertical</enum>
@@ -227,21 +263,26 @@
227263
<header>qgsunitselectionwidget.h</header>
228264
<container>1</container>
229265
</customwidget>
266+
<customwidget>
267+
<class>QgsDataDefinedButton</class>
268+
<extends>QToolButton</extends>
269+
<header>qgsdatadefinedbutton.h</header>
270+
</customwidget>
230271
</customwidgets>
231272
<tabstops>
273+
<tabstop>mPlacementDDBtn</tabstop>
232274
<tabstop>radInterval</tabstop>
233275
<tabstop>spinInterval</tabstop>
234-
<tabstop>mIntervalUnitWidget</tabstop>
276+
<tabstop>mIntervalDDBtn</tabstop>
235277
<tabstop>radVertex</tabstop>
236278
<tabstop>radVertexLast</tabstop>
237279
<tabstop>radVertexFirst</tabstop>
238280
<tabstop>radCentralPoint</tabstop>
239281
<tabstop>mSpinOffsetAlongLine</tabstop>
240-
<tabstop>mOffsetAlongLineUnitWidget</tabstop>
282+
<tabstop>mOffsetAlongLineDDBtn</tabstop>
241283
<tabstop>chkRotateMarker</tabstop>
242284
<tabstop>spinOffset</tabstop>
243-
<tabstop>mOffsetUnitWidget</tabstop>
244-
<tabstop>mDataDefinedPropertiesButton</tabstop>
285+
<tabstop>mLineOffsetDDBtn</tabstop>
245286
</tabstops>
246287
<resources/>
247288
<connections/>

‎src/ui/symbollayer/widget_pointpatternfill.ui

Lines changed: 62 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>457</width>
9+
<width>497</width>
1010
<height>271</height>
1111
</rect>
1212
</property>
@@ -52,13 +52,27 @@
5252
<property name="singleStep">
5353
<double>0.200000000000000</double>
5454
</property>
55-
<property name="showClearButton">
55+
<property name="showClearButton" stdset="0">
5656
<bool>false</bool>
5757
</property>
5858
</widget>
5959
</item>
6060
<item>
61-
<widget class="QgsUnitSelectionWidget" name="mHorizontalDistanceUnitWidget" native="true"/>
61+
<widget class="QgsDataDefinedButton" name="mHorizontalDistanceDDBtn">
62+
<property name="text">
63+
<string>...</string>
64+
</property>
65+
</widget>
66+
</item>
67+
<item>
68+
<widget class="QgsUnitSelectionWidget" name="mHorizontalDistanceUnitWidget" native="true">
69+
<property name="minimumSize">
70+
<size>
71+
<width>0</width>
72+
<height>0</height>
73+
</size>
74+
</property>
75+
</widget>
6276
</item>
6377
</layout>
6478
</item>
@@ -88,11 +102,18 @@
88102
<property name="singleStep">
89103
<double>0.200000000000000</double>
90104
</property>
91-
<property name="showClearButton">
105+
<property name="showClearButton" stdset="0">
92106
<bool>false</bool>
93107
</property>
94108
</widget>
95109
</item>
110+
<item>
111+
<widget class="QgsDataDefinedButton" name="mVerticalDistanceDDBtn">
112+
<property name="text">
113+
<string>...</string>
114+
</property>
115+
</widget>
116+
</item>
96117
<item>
97118
<widget class="QgsUnitSelectionWidget" name="mVerticalDistanceUnitWidget" native="true"/>
98119
</item>
@@ -124,13 +145,27 @@
124145
<property name="singleStep">
125146
<double>0.200000000000000</double>
126147
</property>
127-
<property name="showClearButton">
148+
<property name="showClearButton" stdset="0">
128149
<bool>false</bool>
129150
</property>
130151
</widget>
131152
</item>
132153
<item>
133-
<widget class="QgsUnitSelectionWidget" name="mHorizontalDisplacementUnitWidget" native="true"/>
154+
<widget class="QgsDataDefinedButton" name="mHorizontalDisplacementDDBtn">
155+
<property name="text">
156+
<string>...</string>
157+
</property>
158+
</widget>
159+
</item>
160+
<item>
161+
<widget class="QgsUnitSelectionWidget" name="mHorizontalDisplacementUnitWidget" native="true">
162+
<property name="minimumSize">
163+
<size>
164+
<width>0</width>
165+
<height>0</height>
166+
</size>
167+
</property>
168+
</widget>
134169
</item>
135170
</layout>
136171
</item>
@@ -160,29 +195,30 @@
160195
<property name="singleStep">
161196
<double>0.200000000000000</double>
162197
</property>
163-
<property name="showClearButton">
198+
<property name="showClearButton" stdset="0">
164199
<bool>false</bool>
165200
</property>
166201
</widget>
167202
</item>
168203
<item>
169-
<widget class="QgsUnitSelectionWidget" name="mVerticalDisplacementUnitWidget" native="true"/>
204+
<widget class="QgsDataDefinedButton" name="mVerticalDisplacementDDBtn">
205+
<property name="text">
206+
<string>...</string>
207+
</property>
208+
</widget>
209+
</item>
210+
<item>
211+
<widget class="QgsUnitSelectionWidget" name="mVerticalDisplacementUnitWidget" native="true">
212+
<property name="minimumSize">
213+
<size>
214+
<width>0</width>
215+
<height>0</height>
216+
</size>
217+
</property>
218+
</widget>
170219
</item>
171220
</layout>
172221
</item>
173-
<item row="4" column="0" colspan="2">
174-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
175-
<property name="sizePolicy">
176-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
177-
<horstretch>0</horstretch>
178-
<verstretch>0</verstretch>
179-
</sizepolicy>
180-
</property>
181-
<property name="text">
182-
<string>Data defined properties...</string>
183-
</property>
184-
</widget>
185-
</item>
186222
</layout>
187223
</widget>
188224
<customwidgets>
@@ -197,6 +233,11 @@
197233
<header>qgsunitselectionwidget.h</header>
198234
<container>1</container>
199235
</customwidget>
236+
<customwidget>
237+
<class>QgsDataDefinedButton</class>
238+
<extends>QToolButton</extends>
239+
<header>qgsdatadefinedbutton.h</header>
240+
</customwidget>
200241
</customwidgets>
201242
<resources/>
202243
<connections/>

‎src/ui/symbollayer/widget_rasterfill.ui

Lines changed: 132 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>424</width>
10-
<height>294</height>
9+
<width>649</width>
10+
<height>384</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -26,10 +26,60 @@
2626
</property>
2727
</widget>
2828
</item>
29+
<item>
30+
<widget class="QgsDataDefinedButton" name="mFilenameDDBtn">
31+
<property name="text">
32+
<string>...</string>
33+
</property>
34+
</widget>
35+
</item>
2936
</layout>
3037
</item>
3138
<item>
3239
<layout class="QGridLayout" name="gridLayout">
40+
<item row="0" column="2">
41+
<layout class="QHBoxLayout" name="horizontalLayout_2">
42+
<item>
43+
<widget class="QgsDoubleSpinBox" name="mWidthSpinBox">
44+
<property name="sizePolicy">
45+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
46+
<horstretch>1</horstretch>
47+
<verstretch>0</verstretch>
48+
</sizepolicy>
49+
</property>
50+
<property name="specialValueText">
51+
<string>Original</string>
52+
</property>
53+
<property name="decimals">
54+
<number>6</number>
55+
</property>
56+
<property name="maximum">
57+
<double>99999999.000000000000000</double>
58+
</property>
59+
<property name="singleStep">
60+
<double>0.200000000000000</double>
61+
</property>
62+
</widget>
63+
</item>
64+
<item>
65+
<widget class="QgsDataDefinedButton" name="mWidthDDBtn">
66+
<property name="text">
67+
<string>...</string>
68+
</property>
69+
</widget>
70+
</item>
71+
<item>
72+
<widget class="QgsUnitSelectionWidget" name="mWidthUnitWidget" native="true">
73+
<property name="minimumSize">
74+
<size>
75+
<width>0</width>
76+
<height>0</height>
77+
</size>
78+
</property>
79+
</widget>
80+
</item>
81+
</layout>
82+
</item>
3383
<item row="0" column="1">
3484
<widget class="QLabel" name="mTextureWidthLabel">
3585
<property name="text">
@@ -40,26 +90,30 @@
4090
</property>
4191
</widget>
4292
</item>
43-
<item row="1" column="2">
44-
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
45-
<property name="sizePolicy">
46-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
47-
<horstretch>0</horstretch>
48-
<verstretch>0</verstretch>
49-
</sizepolicy>
93+
<item row="4" column="1">
94+
<widget class="QLabel" name="label">
95+
<property name="text">
96+
<string>Opacity</string>
5097
</property>
51-
<property name="suffix">
52-
<string> °</string>
98+
<property name="buddy">
99+
<cstring>mSliderTransparency</cstring>
53100
</property>
54-
<property name="maximum">
55-
<double>360.000000000000000</double>
101+
</widget>
102+
</item>
103+
<item row="5" column="2">
104+
<spacer name="verticalSpacer">
105+
<property name="orientation">
106+
<enum>Qt::Vertical</enum>
56107
</property>
57-
<property name="singleStep">
58-
<double>0.500000000000000</double>
108+
<property name="sizeHint" stdset="0">
109+
<size>
110+
<width>20</width>
111+
<height>0</height>
112+
</size>
59113
</property>
60-
</widget>
114+
</spacer>
61115
</item>
62-
<item row="2" column="1">
116+
<item row="3" column="1">
63117
<widget class="QLabel" name="label_3">
64118
<property name="text">
65119
<string>Coord mode</string>
@@ -70,6 +124,36 @@
70124
</widget>
71125
</item>
72126
<item row="2" column="2">
127+
<layout class="QHBoxLayout" name="horizontalLayout_7">
128+
<item>
129+
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
130+
<property name="sizePolicy">
131+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
132+
<horstretch>0</horstretch>
133+
<verstretch>0</verstretch>
134+
</sizepolicy>
135+
</property>
136+
<property name="suffix">
137+
<string> °</string>
138+
</property>
139+
<property name="maximum">
140+
<double>360.000000000000000</double>
141+
</property>
142+
<property name="singleStep">
143+
<double>0.500000000000000</double>
144+
</property>
145+
</widget>
146+
</item>
147+
<item>
148+
<widget class="QgsDataDefinedButton" name="mRotationDDBtn">
149+
<property name="text">
150+
<string>...</string>
151+
</property>
152+
</widget>
153+
</item>
154+
</layout>
155+
</item>
156+
<item row="3" column="2">
73157
<widget class="QComboBox" name="cboCoordinateMode">
74158
<item>
75159
<property name="text">
@@ -83,17 +167,7 @@
83167
</item>
84168
</widget>
85169
</item>
86-
<item row="1" column="1">
87-
<widget class="QLabel" name="mRotationLabel">
88-
<property name="text">
89-
<string>Rotation</string>
90-
</property>
91-
<property name="buddy">
92-
<cstring>mRotationSpinBox</cstring>
93-
</property>
94-
</widget>
95-
</item>
96-
<item row="0" column="0" rowspan="5">
170+
<item row="0" column="0" rowspan="6">
97171
<widget class="QLabel" name="mLabelImagePreview">
98172
<property name="sizePolicy">
99173
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -124,37 +198,8 @@
124198
</property>
125199
</widget>
126200
</item>
127-
<item row="0" column="2">
128-
<layout class="QHBoxLayout" name="horizontalLayout_2">
129-
<item>
130-
<widget class="QgsDoubleSpinBox" name="mWidthSpinBox">
131-
<property name="sizePolicy">
132-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
133-
<horstretch>1</horstretch>
134-
<verstretch>0</verstretch>
135-
</sizepolicy>
136-
</property>
137-
<property name="specialValueText">
138-
<string>Original</string>
139-
</property>
140-
<property name="decimals">
141-
<number>6</number>
142-
</property>
143-
<property name="maximum">
144-
<double>99999999.000000000000000</double>
145-
</property>
146-
<property name="singleStep">
147-
<double>0.200000000000000</double>
148-
</property>
149-
</widget>
150-
</item>
151-
<item>
152-
<widget class="QgsUnitSelectionWidget" name="mWidthUnitWidget" native="true"/>
153-
</item>
154-
</layout>
155-
</item>
156-
<item row="3" column="2">
157-
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0">
201+
<item row="4" column="2">
202+
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0,0">
158203
<item>
159204
<widget class="QSlider" name="mSliderTransparency">
160205
<property name="sizePolicy">
@@ -190,31 +235,25 @@
190235
</property>
191236
</widget>
192237
</item>
238+
<item>
239+
<widget class="QgsDataDefinedButton" name="mOpacityDDBtn">
240+
<property name="text">
241+
<string>...</string>
242+
</property>
243+
</widget>
244+
</item>
193245
</layout>
194246
</item>
195-
<item row="3" column="1">
196-
<widget class="QLabel" name="label">
247+
<item row="2" column="1">
248+
<widget class="QLabel" name="mRotationLabel">
197249
<property name="text">
198-
<string>Opacity</string>
250+
<string>Rotation</string>
199251
</property>
200252
<property name="buddy">
201-
<cstring>mSliderTransparency</cstring>
253+
<cstring>mRotationSpinBox</cstring>
202254
</property>
203255
</widget>
204256
</item>
205-
<item row="4" column="2">
206-
<spacer name="verticalSpacer">
207-
<property name="orientation">
208-
<enum>Qt::Vertical</enum>
209-
</property>
210-
<property name="sizeHint" stdset="0">
211-
<size>
212-
<width>20</width>
213-
<height>0</height>
214-
</size>
215-
</property>
216-
</spacer>
217-
</item>
218257
</layout>
219258
</item>
220259
<item>
@@ -276,25 +315,19 @@
276315
</widget>
277316
</item>
278317
<item>
279-
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
318+
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true">
319+
<property name="minimumSize">
320+
<size>
321+
<width>0</width>
322+
<height>0</height>
323+
</size>
324+
</property>
325+
</widget>
280326
</item>
281327
</layout>
282328
</item>
283329
</layout>
284330
</item>
285-
<item>
286-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
287-
<property name="sizePolicy">
288-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
289-
<horstretch>0</horstretch>
290-
<verstretch>0</verstretch>
291-
</sizepolicy>
292-
</property>
293-
<property name="text">
294-
<string>Data defined properties...</string>
295-
</property>
296-
</widget>
297-
</item>
298331
<item>
299332
<spacer name="verticalSpacer_2">
300333
<property name="orientation">
@@ -322,20 +355,26 @@
322355
<header>qgsunitselectionwidget.h</header>
323356
<container>1</container>
324357
</customwidget>
358+
<customwidget>
359+
<class>QgsDataDefinedButton</class>
360+
<extends>QToolButton</extends>
361+
<header>qgsdatadefinedbutton.h</header>
362+
</customwidget>
325363
</customwidgets>
326364
<tabstops>
327365
<tabstop>mImageLineEdit</tabstop>
328366
<tabstop>mBrowseToolButton</tabstop>
367+
<tabstop>mFilenameDDBtn</tabstop>
329368
<tabstop>mWidthSpinBox</tabstop>
330-
<tabstop>mWidthUnitWidget</tabstop>
369+
<tabstop>mWidthDDBtn</tabstop>
331370
<tabstop>mRotationSpinBox</tabstop>
371+
<tabstop>mRotationDDBtn</tabstop>
332372
<tabstop>cboCoordinateMode</tabstop>
333373
<tabstop>mSliderTransparency</tabstop>
334374
<tabstop>mSpinTransparency</tabstop>
375+
<tabstop>mOpacityDDBtn</tabstop>
335376
<tabstop>mSpinOffsetX</tabstop>
336377
<tabstop>mSpinOffsetY</tabstop>
337-
<tabstop>mOffsetUnitWidget</tabstop>
338-
<tabstop>mDataDefinedPropertiesButton</tabstop>
339378
</tabstops>
340379
<resources/>
341380
<connections>

‎src/ui/symbollayer/widget_shapeburstfill.ui

Lines changed: 182 additions & 137 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_simplefill.ui

Lines changed: 107 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,47 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>457</width>
10-
<height>342</height>
9+
<width>640</width>
10+
<height>449</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<widget class="QLabel" name="label">
17+
<item row="7" column="0">
18+
<widget class="QLabel" name="label_5">
1919
<property name="text">
20-
<string>Colors</string>
20+
<string>Border width</string>
21+
</property>
22+
<property name="alignment">
23+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
24+
</property>
25+
</widget>
26+
</item>
27+
<item row="6" column="0">
28+
<widget class="QLabel" name="label_8">
29+
<property name="text">
30+
<string>Join style</string>
2131
</property>
2232
<property name="alignment">
2333
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
2434
</property>
2535
</widget>
2636
</item>
37+
<item row="9" column="0">
38+
<spacer name="verticalSpacer">
39+
<property name="orientation">
40+
<enum>Qt::Vertical</enum>
41+
</property>
42+
<property name="sizeHint" stdset="0">
43+
<size>
44+
<width>20</width>
45+
<height>40</height>
46+
</size>
47+
</property>
48+
</spacer>
49+
</item>
2750
<item row="0" column="1">
2851
<layout class="QHBoxLayout" name="horizontalLayout_2">
2952
<property name="spacing">
@@ -64,6 +87,13 @@
6487
</property>
6588
</widget>
6689
</item>
90+
<item>
91+
<widget class="QgsDataDefinedButton" name="mFillColorDDBtn">
92+
<property name="text">
93+
<string>...</string>
94+
</property>
95+
</widget>
96+
</item>
6797
<item>
6898
<widget class="QLabel" name="label_3">
6999
<property name="sizePolicy">
@@ -99,6 +129,13 @@
99129
</property>
100130
</widget>
101131
</item>
132+
<item>
133+
<widget class="QgsDataDefinedButton" name="mBorderColorDDBtn">
134+
<property name="text">
135+
<string>...</string>
136+
</property>
137+
</widget>
138+
</item>
102139
<item>
103140
<spacer name="horizontalSpacer">
104141
<property name="orientation">
@@ -114,56 +151,47 @@
114151
</item>
115152
</layout>
116153
</item>
117-
<item row="1" column="0">
118-
<widget class="QLabel" name="label_2">
154+
<item row="0" column="0">
155+
<widget class="QLabel" name="label">
119156
<property name="text">
120-
<string>Fill style</string>
157+
<string>Colors</string>
121158
</property>
122159
<property name="alignment">
123160
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
124161
</property>
125162
</widget>
126163
</item>
127-
<item row="1" column="1">
128-
<widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
129-
</item>
130-
<item row="2" column="0">
131-
<widget class="QLabel" name="label_4">
164+
<item row="8" column="0">
165+
<widget class="QLabel" name="label_6">
132166
<property name="text">
133-
<string>Border style</string>
167+
<string>Offset X,Y</string>
134168
</property>
135169
<property name="alignment">
136170
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
137171
</property>
138172
</widget>
139173
</item>
140-
<item row="2" column="1">
141-
<widget class="QgsPenStyleComboBox" name="cboBorderStyle"/>
142-
</item>
143-
<item row="3" column="0">
144-
<widget class="QLabel" name="label_8">
145-
<property name="text">
146-
<string>Join style</string>
147-
</property>
148-
<property name="alignment">
149-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
150-
</property>
151-
</widget>
174+
<item row="6" column="1">
175+
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
152176
</item>
153177
<item row="3" column="1">
154-
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
178+
<layout class="QHBoxLayout" name="horizontalLayout_4">
179+
<item>
180+
<widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
181+
</item>
182+
</layout>
155183
</item>
156-
<item row="4" column="0">
157-
<widget class="QLabel" name="label_5">
184+
<item row="3" column="0">
185+
<widget class="QLabel" name="label_2">
158186
<property name="text">
159-
<string>Border width</string>
187+
<string>Fill style</string>
160188
</property>
161189
<property name="alignment">
162190
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
163191
</property>
164192
</widget>
165193
</item>
166-
<item row="4" column="1">
194+
<item row="7" column="1">
167195
<layout class="QHBoxLayout" name="horizontalLayout_3">
168196
<item>
169197
<widget class="QgsDoubleSpinBox" name="spinBorderWidth">
@@ -182,27 +210,31 @@
182210
<property name="singleStep">
183211
<double>0.200000000000000</double>
184212
</property>
185-
<property name="showClearButton">
213+
<property name="showClearButton" stdset="0">
186214
<bool>false</bool>
187215
</property>
188216
</widget>
189217
</item>
190218
<item>
191-
<widget class="QgsUnitSelectionWidget" name="mBorderWidthUnitWidget" native="true"/>
219+
<widget class="QgsDataDefinedButton" name="mBorderWidthDDBtn">
220+
<property name="text">
221+
<string>...</string>
222+
</property>
223+
</widget>
224+
</item>
225+
<item>
226+
<widget class="QgsUnitSelectionWidget" name="mBorderWidthUnitWidget" native="true">
227+
<property name="minimumSize">
228+
<size>
229+
<width>0</width>
230+
<height>0</height>
231+
</size>
232+
</property>
233+
</widget>
192234
</item>
193235
</layout>
194236
</item>
195-
<item row="5" column="0">
196-
<widget class="QLabel" name="label_6">
197-
<property name="text">
198-
<string>Offset X,Y</string>
199-
</property>
200-
<property name="alignment">
201-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
202-
</property>
203-
</widget>
204-
</item>
205-
<item row="5" column="1">
237+
<item row="8" column="1">
206238
<layout class="QHBoxLayout" name="horizontalLayout">
207239
<item>
208240
<widget class="QgsDoubleSpinBox" name="spinOffsetX">
@@ -253,31 +285,22 @@
253285
</item>
254286
</layout>
255287
</item>
256-
<item row="6" column="0" colspan="2">
257-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
258-
<property name="sizePolicy">
259-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
260-
<horstretch>0</horstretch>
261-
<verstretch>0</verstretch>
262-
</sizepolicy>
263-
</property>
264-
<property name="text">
265-
<string>Data defined properties...</string>
266-
</property>
267-
</widget>
288+
<item row="4" column="1">
289+
<layout class="QHBoxLayout" name="horizontalLayout_5">
290+
<item>
291+
<widget class="QgsPenStyleComboBox" name="cboBorderStyle"/>
292+
</item>
293+
</layout>
268294
</item>
269-
<item row="7" column="0">
270-
<spacer name="verticalSpacer">
271-
<property name="orientation">
272-
<enum>Qt::Vertical</enum>
295+
<item row="4" column="0">
296+
<widget class="QLabel" name="label_4">
297+
<property name="text">
298+
<string>Border style</string>
273299
</property>
274-
<property name="sizeHint" stdset="0">
275-
<size>
276-
<width>20</width>
277-
<height>40</height>
278-
</size>
300+
<property name="alignment">
301+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
279302
</property>
280-
</spacer>
303+
</widget>
281304
</item>
282305
</layout>
283306
</widget>
@@ -304,6 +327,11 @@
304327
<extends>QComboBox</extends>
305328
<header>qgspenstylecombobox.h</header>
306329
</customwidget>
330+
<customwidget>
331+
<class>QgsDataDefinedButton</class>
332+
<extends>QToolButton</extends>
333+
<header>qgsdatadefinedbutton.h</header>
334+
</customwidget>
307335
<customwidget>
308336
<class>QgsPenJoinStyleComboBox</class>
309337
<extends>QComboBox</extends>
@@ -315,6 +343,19 @@
315343
<header>qgsbrushstylecombobox.h</header>
316344
</customwidget>
317345
</customwidgets>
346+
<tabstops>
347+
<tabstop>btnChangeColor</tabstop>
348+
<tabstop>mFillColorDDBtn</tabstop>
349+
<tabstop>btnChangeBorderColor</tabstop>
350+
<tabstop>mBorderColorDDBtn</tabstop>
351+
<tabstop>cboFillStyle</tabstop>
352+
<tabstop>cboBorderStyle</tabstop>
353+
<tabstop>cboJoinStyle</tabstop>
354+
<tabstop>spinBorderWidth</tabstop>
355+
<tabstop>mBorderWidthDDBtn</tabstop>
356+
<tabstop>spinOffsetX</tabstop>
357+
<tabstop>spinOffsetY</tabstop>
358+
</tabstops>
318359
<resources/>
319360
<connections/>
320361
</ui>

‎src/ui/symbollayer/widget_simpleline.ui

Lines changed: 189 additions & 117 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_simplemarker.ui

Lines changed: 289 additions & 196 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_svgfill.ui

Lines changed: 120 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>461</width>
10-
<height>401</height>
9+
<width>740</width>
10+
<height>502</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -79,20 +79,105 @@
7979
</property>
8080
</widget>
8181
</item>
82+
<item>
83+
<widget class="QgsDataDefinedButton" name="mSVGDDBtn">
84+
<property name="text">
85+
<string>...</string>
86+
</property>
87+
</widget>
88+
</item>
8289
</layout>
8390
</item>
8491
<item row="0" column="0">
8592
<layout class="QGridLayout" name="gridLayout">
8693
<property name="horizontalSpacing">
8794
<number>28</number>
8895
</property>
96+
<item row="1" column="0">
97+
<widget class="QLabel" name="mRotationLabel">
98+
<property name="text">
99+
<string>Rotation</string>
100+
</property>
101+
</widget>
102+
</item>
103+
<item row="2" column="0">
104+
<widget class="QLabel" name="mColorLabel">
105+
<property name="text">
106+
<string>Colors</string>
107+
</property>
108+
</widget>
109+
</item>
110+
<item row="1" column="1">
111+
<layout class="QHBoxLayout" name="horizontalLayout_5">
112+
<item>
113+
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
114+
<property name="suffix">
115+
<string> °</string>
116+
</property>
117+
<property name="maximum">
118+
<double>360.000000000000000</double>
119+
</property>
120+
<property name="singleStep">
121+
<double>0.500000000000000</double>
122+
</property>
123+
</widget>
124+
</item>
125+
<item>
126+
<widget class="QgsDataDefinedButton" name="mRotationDDBtn">
127+
<property name="text">
128+
<string>...</string>
129+
</property>
130+
</widget>
131+
</item>
132+
</layout>
133+
</item>
134+
<item row="3" column="0">
135+
<widget class="QLabel" name="mBorderWidthLabel">
136+
<property name="text">
137+
<string>Border width</string>
138+
</property>
139+
</widget>
140+
</item>
89141
<item row="0" column="0">
90142
<widget class="QLabel" name="mTextureWidthLabel">
91143
<property name="text">
92144
<string>Texture width</string>
93145
</property>
94146
</widget>
95147
</item>
148+
<item row="3" column="1">
149+
<layout class="QHBoxLayout" name="horizontalLayout_4">
150+
<item>
151+
<widget class="QgsDoubleSpinBox" name="mBorderWidthSpinBox">
152+
<property name="sizePolicy">
153+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
154+
<horstretch>1</horstretch>
155+
<verstretch>0</verstretch>
156+
</sizepolicy>
157+
</property>
158+
<property name="decimals">
159+
<number>6</number>
160+
</property>
161+
<property name="singleStep">
162+
<double>0.200000000000000</double>
163+
</property>
164+
<property name="showClearButton" stdset="0">
165+
<bool>false</bool>
166+
</property>
167+
</widget>
168+
</item>
169+
<item>
170+
<widget class="QgsDataDefinedButton" name="mBorderWidthDDBtn">
171+
<property name="text">
172+
<string>...</string>
173+
</property>
174+
</widget>
175+
</item>
176+
<item>
177+
<widget class="QgsUnitSelectionWidget" name="mSvgOutlineWidthUnitWidget" native="true"/>
178+
</item>
179+
</layout>
180+
</item>
96181
<item row="0" column="1">
97182
<layout class="QHBoxLayout" name="horizontalLayout_2">
98183
<item>
@@ -112,43 +197,23 @@
112197
<property name="singleStep">
113198
<double>0.200000000000000</double>
114199
</property>
115-
<property name="showClearButton">
200+
<property name="showClearButton" stdset="0">
116201
<bool>false</bool>
117202
</property>
118203
</widget>
119204
</item>
205+
<item>
206+
<widget class="QgsDataDefinedButton" name="mTextureWidthDDBtn">
207+
<property name="text">
208+
<string>...</string>
209+
</property>
210+
</widget>
211+
</item>
120212
<item>
121213
<widget class="QgsUnitSelectionWidget" name="mTextureWidthUnitWidget" native="true"/>
122214
</item>
123215
</layout>
124216
</item>
125-
<item row="1" column="0">
126-
<widget class="QLabel" name="mRotationLabel">
127-
<property name="text">
128-
<string>Rotation</string>
129-
</property>
130-
</widget>
131-
</item>
132-
<item row="1" column="1">
133-
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
134-
<property name="suffix">
135-
<string> °</string>
136-
</property>
137-
<property name="maximum">
138-
<double>360.000000000000000</double>
139-
</property>
140-
<property name="singleStep">
141-
<double>0.500000000000000</double>
142-
</property>
143-
</widget>
144-
</item>
145-
<item row="2" column="0">
146-
<widget class="QLabel" name="mColorLabel">
147-
<property name="text">
148-
<string>Colors</string>
149-
</property>
150-
</widget>
151-
</item>
152217
<item row="2" column="1">
153218
<layout class="QHBoxLayout" name="horizontalLayout_3">
154219
<item>
@@ -183,6 +248,13 @@
183248
</property>
184249
</widget>
185250
</item>
251+
<item>
252+
<widget class="QgsDataDefinedButton" name="mFilColorDDBtn">
253+
<property name="text">
254+
<string>...</string>
255+
</property>
256+
</widget>
257+
</item>
186258
<item>
187259
<widget class="QLabel" name="mBorderColorLabel">
188260
<property name="sizePolicy">
@@ -215,6 +287,13 @@
215287
</property>
216288
</widget>
217289
</item>
290+
<item>
291+
<widget class="QgsDataDefinedButton" name="mBorderColorDDBtn">
292+
<property name="text">
293+
<string>...</string>
294+
</property>
295+
</widget>
296+
</item>
218297
<item>
219298
<spacer name="horizontalSpacer">
220299
<property name="orientation">
@@ -230,52 +309,6 @@
230309
</item>
231310
</layout>
232311
</item>
233-
<item row="3" column="0">
234-
<widget class="QLabel" name="mBorderWidthLabel">
235-
<property name="text">
236-
<string>Border width</string>
237-
</property>
238-
</widget>
239-
</item>
240-
<item row="3" column="1">
241-
<layout class="QHBoxLayout" name="horizontalLayout_4">
242-
<item>
243-
<widget class="QgsDoubleSpinBox" name="mBorderWidthSpinBox">
244-
<property name="sizePolicy">
245-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
246-
<horstretch>1</horstretch>
247-
<verstretch>0</verstretch>
248-
</sizepolicy>
249-
</property>
250-
<property name="decimals">
251-
<number>6</number>
252-
</property>
253-
<property name="singleStep">
254-
<double>0.200000000000000</double>
255-
</property>
256-
<property name="showClearButton">
257-
<bool>false</bool>
258-
</property>
259-
</widget>
260-
</item>
261-
<item>
262-
<widget class="QgsUnitSelectionWidget" name="mSvgOutlineWidthUnitWidget" native="true"/>
263-
</item>
264-
</layout>
265-
</item>
266-
<item row="4" column="0" colspan="2">
267-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
268-
<property name="sizePolicy">
269-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
270-
<horstretch>0</horstretch>
271-
<verstretch>0</verstretch>
272-
</sizepolicy>
273-
</property>
274-
<property name="text">
275-
<string>Data defined properties...</string>
276-
</property>
277-
</widget>
278-
</item>
279312
</layout>
280313
</item>
281314
</layout>
@@ -298,20 +331,28 @@
298331
<header>qgsunitselectionwidget.h</header>
299332
<container>1</container>
300333
</customwidget>
334+
<customwidget>
335+
<class>QgsDataDefinedButton</class>
336+
<extends>QToolButton</extends>
337+
<header>qgsdatadefinedbutton.h</header>
338+
</customwidget>
301339
</customwidgets>
302340
<tabstops>
303341
<tabstop>mTextureWidthSpinBox</tabstop>
304-
<tabstop>mTextureWidthUnitWidget</tabstop>
342+
<tabstop>mTextureWidthDDBtn</tabstop>
305343
<tabstop>mRotationSpinBox</tabstop>
344+
<tabstop>mRotationDDBtn</tabstop>
306345
<tabstop>mChangeColorButton</tabstop>
346+
<tabstop>mFilColorDDBtn</tabstop>
307347
<tabstop>mChangeBorderColorButton</tabstop>
348+
<tabstop>mBorderColorDDBtn</tabstop>
308349
<tabstop>mBorderWidthSpinBox</tabstop>
309-
<tabstop>mSvgOutlineWidthUnitWidget</tabstop>
310-
<tabstop>mDataDefinedPropertiesButton</tabstop>
350+
<tabstop>mBorderWidthDDBtn</tabstop>
311351
<tabstop>mSvgTreeView</tabstop>
312352
<tabstop>mSvgListView</tabstop>
313353
<tabstop>mSVGLineEdit</tabstop>
314354
<tabstop>mBrowseToolButton</tabstop>
355+
<tabstop>mSVGDDBtn</tabstop>
315356
</tabstops>
316357
<resources/>
317358
<connections/>

‎src/ui/symbollayer/widget_svgmarker.ui

Lines changed: 203 additions & 118 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_symbolslist.ui

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>429</width>
10-
<height>429</height>
9+
<width>747</width>
10+
<height>539</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -24,10 +24,13 @@
2424
<layout class="QHBoxLayout" name="horizontalLayout">
2525
<item>
2626
<layout class="QGridLayout" name="gridLayout_3">
27-
<item row="0" column="0">
28-
<widget class="QLabel" name="mSymbolUnitLabel">
27+
<item row="2" column="0">
28+
<widget class="QLabel" name="label_5">
2929
<property name="text">
30-
<string>Unit</string>
30+
<string>Color</string>
31+
</property>
32+
<property name="buddy">
33+
<cstring>btnColor</cstring>
3134
</property>
3235
</widget>
3336
</item>
@@ -41,6 +44,13 @@
4144
</property>
4245
</widget>
4346
</item>
47+
<item row="0" column="0">
48+
<widget class="QLabel" name="mSymbolUnitLabel">
49+
<property name="text">
50+
<string>Unit</string>
51+
</property>
52+
</widget>
53+
</item>
4454
<item row="1" column="1">
4555
<widget class="QSlider" name="mTransparencySlider">
4656
<property name="sizePolicy">
@@ -57,16 +67,6 @@
5767
</property>
5868
</widget>
5969
</item>
60-
<item row="2" column="0">
61-
<widget class="QLabel" name="label_5">
62-
<property name="text">
63-
<string>Color</string>
64-
</property>
65-
<property name="buddy">
66-
<cstring>btnColor</cstring>
67-
</property>
68-
</widget>
69-
</item>
7070
<item row="2" column="1">
7171
<widget class="QgsColorButtonV2" name="btnColor">
7272
<property name="minimumSize">
@@ -104,13 +104,6 @@
104104
</property>
105105
<widget class="QWidget" name="pageMarker">
106106
<layout class="QGridLayout" name="gridLayout">
107-
<item row="0" column="0">
108-
<widget class="QLabel" name="label_2">
109-
<property name="text">
110-
<string>Size</string>
111-
</property>
112-
</widget>
113-
</item>
114107
<item row="0" column="1">
115108
<widget class="QgsDoubleSpinBox" name="spinSize">
116109
<property name="decimals">
@@ -125,19 +118,26 @@
125118
<property name="value">
126119
<double>1.000000000000000</double>
127120
</property>
128-
<property name="showClearButton">
121+
<property name="showClearButton" stdset="0">
129122
<bool>false</bool>
130123
</property>
131124
</widget>
132125
</item>
133-
<item row="1" column="0">
126+
<item row="0" column="0">
127+
<widget class="QLabel" name="label_2">
128+
<property name="text">
129+
<string>Size</string>
130+
</property>
131+
</widget>
132+
</item>
133+
<item row="2" column="0">
134134
<widget class="QLabel" name="label_3">
135135
<property name="text">
136136
<string>Rotation</string>
137137
</property>
138138
</widget>
139139
</item>
140-
<item row="1" column="1">
140+
<item row="2" column="1">
141141
<widget class="QgsDoubleSpinBox" name="spinAngle">
142142
<property name="suffix">
143143
<string> °</string>
@@ -157,13 +157,6 @@
157157
</widget>
158158
<widget class="QWidget" name="pageLine">
159159
<layout class="QGridLayout" name="gridLayout_2">
160-
<item row="0" column="0">
161-
<widget class="QLabel" name="label_4">
162-
<property name="text">
163-
<string>Width</string>
164-
</property>
165-
</widget>
166-
</item>
167160
<item row="0" column="1">
168161
<widget class="QgsDoubleSpinBox" name="spinWidth">
169162
<property name="decimals">
@@ -178,11 +171,18 @@
178171
<property name="value">
179172
<double>1.000000000000000</double>
180173
</property>
181-
<property name="showClearButton">
174+
<property name="showClearButton" stdset="0">
182175
<bool>false</bool>
183176
</property>
184177
</widget>
185178
</item>
179+
<item row="0" column="0">
180+
<widget class="QLabel" name="label_4">
181+
<property name="text">
182+
<string>Width</string>
183+
</property>
184+
</widget>
185+
</item>
186186
</layout>
187187
</widget>
188188
<widget class="QWidget" name="pageFill">
@@ -336,14 +336,13 @@
336336
</customwidget>
337337
</customwidgets>
338338
<tabstops>
339-
<tabstop>viewSymbols</tabstop>
340-
<tabstop>mSymbolUnitWidget</tabstop>
341339
<tabstop>mTransparencySlider</tabstop>
342-
<tabstop>btnColor</tabstop>
343340
<tabstop>spinSize</tabstop>
341+
<tabstop>btnColor</tabstop>
344342
<tabstop>spinAngle</tabstop>
345343
<tabstop>groupsCombo</tabstop>
346344
<tabstop>openStyleManagerButton</tabstop>
345+
<tabstop>viewSymbols</tabstop>
347346
<tabstop>btnAdvanced</tabstop>
348347
<tabstop>spinWidth</tabstop>
349348
</tabstops>

0 commit comments

Comments
 (0)
Failed to load comments.