Skip to content

Commit df939c3

Browse files
nyalldawsonnyalldawson
committedJan 22, 2015
Data defined all the things!
Add a bunch of missing data defined options for symbology. Also fix dialog sizing issues.
·
ltr-3_40archive/master_2
1 parent 8216f7d commit df939c3

19 files changed

+473
-270
lines changed
 

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@ class QgsDataDefinedSymbolDialog : QDialog
2525
static QString gradientCoordModeHelpText();
2626
static QString gradientSpreadHelpText();
2727
static QString boolHelpText();
28+
static QString lineStyleHelpText();
29+
static QString joinStyleHelpText();
30+
static QString capStyleHelpText();
31+
static QString fillStyleHelpText();
2832
};

‎src/core/symbology-ng/qgsfillsymbollayerv2.cpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ void QgsSimpleFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
8585
{
8686
brush.setColor( QgsSymbolLayerV2Utils::decodeColor( colorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
8787
}
88+
QgsExpression* fillStyleExpression = expression( "fill_style" );
89+
if ( fillStyleExpression )
90+
{
91+
brush.setStyle( QgsSymbolLayerV2Utils::decodeBrushStyle( fillStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
92+
}
8893
QgsExpression* colorBorderExpression = expression( "color_border" );
8994
if ( colorBorderExpression )
9095
{
@@ -98,6 +103,18 @@ void QgsSimpleFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
98103
pen.setWidthF( width );
99104
selPen.setWidthF( width );
100105
}
106+
QgsExpression* borderStyleExpression = expression( "border_style" );
107+
if ( borderStyleExpression )
108+
{
109+
pen.setStyle( QgsSymbolLayerV2Utils::decodePenStyle( borderStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
110+
selPen.setStyle( QgsSymbolLayerV2Utils::decodePenStyle( borderStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
111+
}
112+
QgsExpression* joinStyleExpression = expression( "join_style" );
113+
if ( joinStyleExpression )
114+
{
115+
pen.setJoinStyle( QgsSymbolLayerV2Utils::decodePenJoinStyle( joinStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
116+
selPen.setJoinStyle( QgsSymbolLayerV2Utils::decodePenJoinStyle( joinStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
117+
}
101118
}
102119

103120

@@ -194,6 +211,18 @@ QgsSymbolLayerV2* QgsSimpleFillSymbolLayerV2::create( const QgsStringMap& props
194211
{
195212
sl->setDataDefinedProperty( "width_border", props["width_border_expression"] );
196213
}
214+
if ( props.contains( "fill_style_expression" ) )
215+
{
216+
sl->setDataDefinedProperty( "fill_style", props["fill_style_expression"] );
217+
}
218+
if ( props.contains( "border_style_expression" ) )
219+
{
220+
sl->setDataDefinedProperty( "border_style", props["border_style_expression"] );
221+
}
222+
if ( props.contains( "join_style_expression" ) )
223+
{
224+
sl->setDataDefinedProperty( "join_style", props["join_style_expression"] );
225+
}
197226
return sl;
198227
}
199228

‎src/core/symbology-ng/qgslinesymbollayerv2.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props
187187
l->setDataDefinedProperty( "joinstyle", props["joinstyle_expression"] );
188188
if ( props.contains( "capstyle_expression" ) )
189189
l->setDataDefinedProperty( "capstyle", props["capstyle_expression"] );
190+
if ( props.contains( "line_style_expression" ) )
191+
l->setDataDefinedProperty( "line_style", props["line_style_expression"] );
190192

191193
return l;
192194
}
@@ -534,6 +536,14 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
534536
pen.setDashPattern( dashVector );
535537
}
536538

539+
//line style
540+
QgsExpression* lineStyleExpression = expression( "line_style" );
541+
if ( lineStyleExpression )
542+
{
543+
QString lineStyleString = lineStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
544+
pen.setStyle( QgsSymbolLayerV2Utils::decodePenStyle( lineStyleString ) );
545+
}
546+
537547
//join style
538548
QgsExpression* joinStyleExpression = expression( "joinstyle" );
539549
if ( joinStyleExpression )

‎src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,10 @@ QgsSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& prop
161161
{
162162
m->setDataDefinedProperty( "color_border", props["color_border_expression"] );
163163
}
164+
if ( props.contains( "outline_style_expression" ) )
165+
{
166+
m->setDataDefinedProperty( "outline_style", props["outline_style_expression"] );
167+
}
164168
if ( props.contains( "outline_width_expression" ) )
165169
{
166170
m->setDataDefinedProperty( "outline_width", props["outline_width_expression"] );
@@ -226,7 +230,8 @@ void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& contex
226230
// - size, rotation, shape, color, border color is not data-defined
227231
// - drawing to screen (not printer)
228232
mUsingCache = !hasDataDefinedRotation && !hasDataDefinedSize && !context.renderContext().forceVectorOutput()
229-
&& !dataDefinedProperty( "name" ) && !dataDefinedProperty( "color" ) && !dataDefinedProperty( "color_border" ) && !dataDefinedProperty( "outline_width" ) &&
233+
&& !dataDefinedProperty( "name" ) && !dataDefinedProperty( "color" ) && !dataDefinedProperty( "color_border" )
234+
&& !dataDefinedProperty( "outline_width" ) && !dataDefinedProperty( "outline_style" ) &&
230235
!dataDefinedProperty( "size" );
231236

232237
// use either QPolygonF or QPainterPath for drawing
@@ -581,6 +586,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
581586
QgsExpression* colorExpression = expression( "color" );
582587
QgsExpression* colorBorderExpression = expression( "color_border" );
583588
QgsExpression* outlineWidthExpression = expression( "outline_width" );
589+
QgsExpression* outlineStyleExpression = expression( "outline_style" );
584590
if ( colorExpression )
585591
{
586592
mBrush.setColor( QgsSymbolLayerV2Utils::decodeColor( colorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() ) );
@@ -596,6 +602,12 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
596602
mPen.setWidthF( outlineWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit, mOutlineWidthMapUnitScale ) );
597603
mSelPen.setWidthF( outlineWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit, mOutlineWidthMapUnitScale ) );
598604
}
605+
if ( outlineStyleExpression )
606+
{
607+
QString outlineStyle = outlineStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
608+
mPen.setStyle( QgsSymbolLayerV2Utils::decodePenStyle( outlineStyle ) );
609+
mSelPen.setStyle( QgsSymbolLayerV2Utils::decodePenStyle( outlineStyle ) );
610+
}
599611

600612
p->setBrush( context.selected() ? mSelBrush : mBrush );
601613
p->setPen( context.selected() ? mSelPen : mPen );

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,26 @@ QString QgsDataDefinedSymbolDialog::boolHelpText()
139139
return tr( "0 (false)|1 (true)" );
140140
}
141141

142+
QString QgsDataDefinedSymbolDialog::lineStyleHelpText()
143+
{
144+
return "'no'|'solid'|'dash'|'dot'|'dash dot'|'dash dot dot'";
145+
}
146+
147+
QString QgsDataDefinedSymbolDialog::joinStyleHelpText()
148+
{
149+
return "'bevel'|'miter'|'round'";
150+
}
151+
152+
QString QgsDataDefinedSymbolDialog::capStyleHelpText()
153+
{
154+
return "'square'|'flat'|'round'";
155+
}
156+
157+
QString QgsDataDefinedSymbolDialog::fillStyleHelpText()
158+
{
159+
return "'solid'|'horizontal'|'vertical'|'cross'|'b_diagonal'|'f_diagonal'|"
160+
"'diagonal_x'|'dense1'|'dense2'|'dense3'|'dense4'|'dense5'|"
161+
"'dense6'|'dense7'|'no'";
162+
}
163+
142164

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ class GUI_EXPORT QgsDataDefinedSymbolDialog: public QDialog, private Ui::QgsData
3939
static QString gradientCoordModeHelpText();
4040
static QString gradientSpreadHelpText();
4141
static QString boolHelpText();
42+
static QString lineStyleHelpText();
43+
static QString joinStyleHelpText();
44+
static QString capStyleHelpText();
45+
static QString fillStyleHelpText();
4246

4347
private:
4448
const QgsVectorLayer* mVectorLayer;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
116116
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, "" );
117117
registerDataDefinedButton( mFillColorDDBtn, "fill_color", QgsDataDefinedButton::String, "'red,green,blue,alpha' e.g. '255,0,0,255'" );
118118
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'" );
119+
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
120120
registerDataDefinedButton( mShapeDDBtn, "symbol_name", QgsDataDefinedButton::String, "'circle', 'rectangle', 'cross', 'triangle'" );
121121
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, "'x,y' e.g. '2,3.5'" );
122122
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, "'left', 'center' or 'right'" );

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,9 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
186186
registerDataDefinedButton( mPenWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
187187
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::offsetHelpText() );
188188
registerDataDefinedButton( mDashPatternDDBtn, "customdash", QgsDataDefinedButton::String, tr( "'<dash>;<space>' e.g. '8;2;1;2'" ) );
189-
registerDataDefinedButton( mJoinStyleDDBtn, "joinstyle", QgsDataDefinedButton::String, tr( "'bevel'|'miter'|'round'" ) );
190-
registerDataDefinedButton( mCapStyleDDBtn, "capstyle", QgsDataDefinedButton::String, tr( "'square'|'flat'|'round'" ) );
189+
registerDataDefinedButton( mPenStyleDDBtn, "line_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
190+
registerDataDefinedButton( mJoinStyleDDBtn, "joinstyle", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::joinStyleHelpText() );
191+
registerDataDefinedButton( mCapStyleDDBtn, "capstyle", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::capStyleHelpText() );
191192
}
192193

193194
QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2Widget::symbolLayer()
@@ -425,6 +426,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
425426
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
426427
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
427428
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, "" );
429+
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
428430
registerDataDefinedButton( mSizeDDBtn, "size", QgsDataDefinedButton::Double, "" );
429431
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, "" );
430432
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::offsetHelpText() );
@@ -626,6 +628,10 @@ void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
626628
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
627629
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
628630
registerDataDefinedButton( mBorderWidthDDBtn, "width_border", QgsDataDefinedButton::Double, "" );
631+
registerDataDefinedButton( mFillStyleDDBtn, "fill_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::fillStyleHelpText() );
632+
registerDataDefinedButton( mBorderStyleDDBtn, "border_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
633+
registerDataDefinedButton( mJoinStyleDDBtn, "join_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::joinStyleHelpText() );
634+
629635
}
630636

631637
QgsSymbolLayerV2* QgsSimpleFillSymbolLayerV2Widget::symbolLayer()

‎src/ui/symbollayer/widget_gradientfill.ui

Lines changed: 4 additions & 4 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>780</width>
10-
<height>657</height>
9+
<width>556</width>
10+
<height>342</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -139,7 +139,7 @@
139139
<item>
140140
<widget class="QCheckBox" name="checkRefPoint1Centroid">
141141
<property name="text">
142-
<string>Feature centroid</string>
142+
<string>Centroid</string>
143143
</property>
144144
</widget>
145145
</item>
@@ -411,7 +411,7 @@
411411
<item>
412412
<widget class="QCheckBox" name="checkRefPoint2Centroid">
413413
<property name="text">
414-
<string>Feature centroid</string>
414+
<string>Centroid</string>
415415
</property>
416416
</widget>
417417
</item>

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 2 additions & 2 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>580</width>
10-
<height>387</height>
9+
<width>345</width>
10+
<height>176</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_markerline.ui

Lines changed: 2 additions & 2 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>765</width>
10-
<height>404</height>
9+
<width>377</width>
10+
<height>327</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_pointpatternfill.ui

Lines changed: 2 additions & 2 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>497</width>
10-
<height>271</height>
9+
<width>389</width>
10+
<height>189</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_rasterfill.ui

Lines changed: 2 additions & 2 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>649</width>
10-
<height>384</height>
9+
<width>453</width>
10+
<height>269</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_shapeburstfill.ui

Lines changed: 77 additions & 30 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>703</width>
10-
<height>504</height>
9+
<width>467</width>
10+
<height>358</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -252,22 +252,39 @@
252252
<property name="title">
253253
<string>Shading style</string>
254254
</property>
255-
<layout class="QFormLayout" name="formLayout_3">
256-
<item row="2" column="0">
257-
<widget class="QRadioButton" name="mRadioUseWholeShape">
258-
<property name="text">
259-
<string>Shade whole shape</string>
260-
</property>
261-
</widget>
262-
</item>
263-
<item row="6" column="0">
264-
<widget class="QCheckBox" name="mIgnoreRingsCheckBox">
265-
<property name="text">
266-
<string>Ignore rings in polygons while shading</string>
267-
</property>
268-
</widget>
255+
<layout class="QVBoxLayout" name="verticalLayout">
256+
<item>
257+
<layout class="QHBoxLayout" name="horizontalLayout_5">
258+
<item>
259+
<widget class="QRadioButton" name="mRadioUseWholeShape">
260+
<property name="text">
261+
<string>Shade whole shape</string>
262+
</property>
263+
</widget>
264+
</item>
265+
<item>
266+
<widget class="QgsDataDefinedButton" name="mShadeWholeShapeDDBtn">
267+
<property name="text">
268+
<string>...</string>
269+
</property>
270+
</widget>
271+
</item>
272+
<item>
273+
<spacer name="horizontalSpacer_2">
274+
<property name="orientation">
275+
<enum>Qt::Horizontal</enum>
276+
</property>
277+
<property name="sizeHint" stdset="0">
278+
<size>
279+
<width>40</width>
280+
<height>20</height>
281+
</size>
282+
</property>
283+
</spacer>
284+
</item>
285+
</layout>
269286
</item>
270-
<item row="5" column="0" colspan="2">
287+
<item>
271288
<layout class="QHBoxLayout" name="horizontalLayout_3">
272289
<property name="spacing">
273290
<number>6</number>
@@ -305,6 +322,19 @@
305322
</property>
306323
</widget>
307324
</item>
325+
<item>
326+
<spacer name="horizontalSpacer_3">
327+
<property name="orientation">
328+
<enum>Qt::Horizontal</enum>
329+
</property>
330+
<property name="sizeHint" stdset="0">
331+
<size>
332+
<width>40</width>
333+
<height>20</height>
334+
</size>
335+
</property>
336+
</spacer>
337+
</item>
308338
<item>
309339
<widget class="QgsUnitSelectionWidget" name="mDistanceUnitWidget" native="true">
310340
<property name="minimumSize">
@@ -317,19 +347,36 @@
317347
</item>
318348
</layout>
319349
</item>
320-
<item row="2" column="1">
321-
<widget class="QgsDataDefinedButton" name="mShadeWholeShapeDDBtn">
322-
<property name="text">
323-
<string>...</string>
324-
</property>
325-
</widget>
326-
</item>
327-
<item row="6" column="1">
328-
<widget class="QgsDataDefinedButton" name="mIgnoreRingsDDBtn">
329-
<property name="text">
330-
<string>...</string>
331-
</property>
332-
</widget>
350+
<item>
351+
<layout class="QHBoxLayout" name="horizontalLayout_6">
352+
<item>
353+
<widget class="QCheckBox" name="mIgnoreRingsCheckBox">
354+
<property name="text">
355+
<string>Ignore rings in polygons while shading</string>
356+
</property>
357+
</widget>
358+
</item>
359+
<item>
360+
<widget class="QgsDataDefinedButton" name="mIgnoreRingsDDBtn">
361+
<property name="text">
362+
<string>...</string>
363+
</property>
364+
</widget>
365+
</item>
366+
<item>
367+
<spacer name="horizontalSpacer_4">
368+
<property name="orientation">
369+
<enum>Qt::Horizontal</enum>
370+
</property>
371+
<property name="sizeHint" stdset="0">
372+
<size>
373+
<width>40</width>
374+
<height>20</height>
375+
</size>
376+
</property>
377+
</spacer>
378+
</item>
379+
</layout>
333380
</item>
334381
</layout>
335382
</widget>

‎src/ui/symbollayer/widget_simplefill.ui

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,28 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>640</width>
10-
<height>449</height>
9+
<width>506</width>
10+
<height>248</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17+
<item row="6" column="1">
18+
<layout class="QHBoxLayout" name="horizontalLayout_6">
19+
<item>
20+
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
21+
</item>
22+
<item>
23+
<widget class="QgsDataDefinedButton" name="mJoinStyleDDBtn">
24+
<property name="text">
25+
<string>...</string>
26+
</property>
27+
</widget>
28+
</item>
29+
</layout>
30+
</item>
1731
<item row="7" column="0">
1832
<widget class="QLabel" name="label_5">
1933
<property name="text">
@@ -34,7 +48,7 @@
3448
</property>
3549
</widget>
3650
</item>
37-
<item row="9" column="0">
51+
<item row="10" column="0">
3852
<spacer name="verticalSpacer">
3953
<property name="orientation">
4054
<enum>Qt::Vertical</enum>
@@ -171,14 +185,18 @@
171185
</property>
172186
</widget>
173187
</item>
174-
<item row="6" column="1">
175-
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
176-
</item>
177188
<item row="3" column="1">
178189
<layout class="QHBoxLayout" name="horizontalLayout_4">
179190
<item>
180191
<widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
181192
</item>
193+
<item>
194+
<widget class="QgsDataDefinedButton" name="mFillStyleDDBtn">
195+
<property name="text">
196+
<string>...</string>
197+
</property>
198+
</widget>
199+
</item>
182200
</layout>
183201
</item>
184202
<item row="3" column="0">
@@ -230,6 +248,9 @@
230248
<height>0</height>
231249
</size>
232250
</property>
251+
<property name="focusPolicy">
252+
<enum>Qt::StrongFocus</enum>
253+
</property>
233254
</widget>
234255
</item>
235256
</layout>
@@ -281,7 +302,11 @@
281302
</widget>
282303
</item>
283304
<item>
284-
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
305+
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true">
306+
<property name="focusPolicy">
307+
<enum>Qt::StrongFocus</enum>
308+
</property>
309+
</widget>
285310
</item>
286311
</layout>
287312
</item>
@@ -290,6 +315,13 @@
290315
<item>
291316
<widget class="QgsPenStyleComboBox" name="cboBorderStyle"/>
292317
</item>
318+
<item>
319+
<widget class="QgsDataDefinedButton" name="mBorderStyleDDBtn">
320+
<property name="text">
321+
<string>...</string>
322+
</property>
323+
</widget>
324+
</item>
293325
</layout>
294326
</item>
295327
<item row="4" column="0">
@@ -349,12 +381,17 @@
349381
<tabstop>btnChangeBorderColor</tabstop>
350382
<tabstop>mBorderColorDDBtn</tabstop>
351383
<tabstop>cboFillStyle</tabstop>
384+
<tabstop>mFillStyleDDBtn</tabstop>
352385
<tabstop>cboBorderStyle</tabstop>
386+
<tabstop>mBorderStyleDDBtn</tabstop>
353387
<tabstop>cboJoinStyle</tabstop>
388+
<tabstop>mJoinStyleDDBtn</tabstop>
354389
<tabstop>spinBorderWidth</tabstop>
355390
<tabstop>mBorderWidthDDBtn</tabstop>
391+
<tabstop>mBorderWidthUnitWidget</tabstop>
356392
<tabstop>spinOffsetX</tabstop>
357393
<tabstop>spinOffsetY</tabstop>
394+
<tabstop>mOffsetUnitWidget</tabstop>
358395
</tabstops>
359396
<resources/>
360397
<connections/>

‎src/ui/symbollayer/widget_simpleline.ui

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,41 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>770</width>
10-
<height>424</height>
9+
<width>417</width>
10+
<height>337</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17+
<item row="3" column="1">
18+
<layout class="QHBoxLayout" name="horizontalLayout">
19+
<item>
20+
<widget class="QgsPenStyleComboBox" name="cboPenStyle"/>
21+
</item>
22+
<item>
23+
<widget class="QgsDataDefinedButton" name="mPenStyleDDBtn">
24+
<property name="text">
25+
<string>...</string>
26+
</property>
27+
</widget>
28+
</item>
29+
</layout>
30+
</item>
31+
<item row="8" column="0">
32+
<spacer name="verticalSpacer">
33+
<property name="orientation">
34+
<enum>Qt::Vertical</enum>
35+
</property>
36+
<property name="sizeHint" stdset="0">
37+
<size>
38+
<width>20</width>
39+
<height>40</height>
40+
</size>
41+
</property>
42+
</spacer>
43+
</item>
1744
<item row="0" column="0">
1845
<widget class="QLabel" name="label">
1946
<property name="text">
@@ -183,9 +210,6 @@
183210
</property>
184211
</widget>
185212
</item>
186-
<item row="3" column="1">
187-
<widget class="QgsPenStyleComboBox" name="cboPenStyle"/>
188-
</item>
189213
<item row="4" column="0">
190214
<widget class="QLabel" name="label_5">
191215
<property name="text">
@@ -269,26 +293,13 @@
269293
</item>
270294
</layout>
271295
</item>
272-
<item row="7" column="0">
296+
<item row="7" column="0" colspan="2">
273297
<widget class="QCheckBox" name="mDrawInsideCheckBox">
274298
<property name="text">
275299
<string>Draw line only inside polygon</string>
276300
</property>
277301
</widget>
278302
</item>
279-
<item row="8" column="0" colspan="2">
280-
<spacer name="verticalSpacer">
281-
<property name="orientation">
282-
<enum>Qt::Vertical</enum>
283-
</property>
284-
<property name="sizeHint" stdset="0">
285-
<size>
286-
<width>749</width>
287-
<height>82</height>
288-
</size>
289-
</property>
290-
</spacer>
291-
</item>
292303
</layout>
293304
</widget>
294305
<customwidgets>
@@ -338,6 +349,7 @@
338349
<tabstop>spinOffset</tabstop>
339350
<tabstop>mOffsetDDBtn</tabstop>
340351
<tabstop>cboPenStyle</tabstop>
352+
<tabstop>mPenStyleDDBtn</tabstop>
341353
<tabstop>cboJoinStyle</tabstop>
342354
<tabstop>mJoinStyleDDBtn</tabstop>
343355
<tabstop>cboCapStyle</tabstop>

‎src/ui/symbollayer/widget_simplemarker.ui

Lines changed: 214 additions & 194 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_svgfill.ui

Lines changed: 2 additions & 2 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>740</width>
10-
<height>502</height>
9+
<width>519</width>
10+
<height>353</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_svgmarker.ui

Lines changed: 2 additions & 2 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>642</width>
10-
<height>470</height>
9+
<width>519</width>
10+
<height>364</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

0 commit comments

Comments
 (0)
Please sign in to comment.