Skip to content

Commit d232360

Browse files
mhugentmhugent
committedApr 1, 2013
Bring cap style combo box back (got lost somehow while merging the branch)
·
ltr-3_40archive/master_2
1 parent 16b1e93 commit d232360

File tree

2 files changed

+104
-89
lines changed

2 files changed

+104
-89
lines changed
 

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec
5656
connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( colorChanged( const QColor& ) ) );
5757
connect( cboPenStyle, SIGNAL( currentIndexChanged( int ) ), this, SLOT( penStyleChanged() ) );
5858
connect( spinOffset, SIGNAL( valueChanged( double ) ), this, SLOT( offsetChanged() ) );
59+
connect( cboCapStyle, SIGNAL( currentIndexChanged( int ) ), this, SLOT( penStyleChanged() ) );
5960
connect( cboJoinStyle, SIGNAL( currentIndexChanged( int ) ), this, SLOT( penStyleChanged() ) );
6061
updatePatternIcon();
6162

@@ -87,10 +88,13 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
8788
spinOffset->setValue( mLayer->offset() );
8889
cboPenStyle->blockSignals( true );
8990
cboJoinStyle->blockSignals( true );
91+
cboCapStyle->blockSignals( true );
9092
cboPenStyle->setPenStyle( mLayer->penStyle() );
9193
cboJoinStyle->setPenJoinStyle( mLayer->penJoinStyle() );
94+
cboCapStyle->setPenCapStyle( mLayer->penCapStyle() );
9295
cboPenStyle->blockSignals( false );
9396
cboJoinStyle->blockSignals( false );
97+
cboCapStyle->blockSignals( false );
9498

9599
//use a custom dash pattern?
96100
bool useCustomDashPattern = mLayer->useCustomDashPattern();
@@ -126,6 +130,7 @@ void QgsSimpleLineSymbolLayerV2Widget::penStyleChanged()
126130
{
127131
mLayer->setPenStyle( cboPenStyle->penStyle() );
128132
mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() );
133+
mLayer->setPenCapStyle( cboCapStyle->penCapStyle() );
129134
emit changed();
130135
}
131136

‎src/ui/symbollayer/widget_simpleline.ui

Lines changed: 99 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -14,64 +14,72 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="1" colspan="2">
18-
<widget class="QgsColorButton" name="btnChangeColor">
19-
<property name="sizePolicy">
20-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
21-
<horstretch>0</horstretch>
22-
<verstretch>0</verstretch>
23-
</sizepolicy>
24-
</property>
25-
<property name="text">
26-
<string>Change...</string>
27-
</property>
28-
</widget>
29-
</item>
30-
<item row="0" column="0">
31-
<widget class="QLabel" name="label">
17+
<item row="4" column="0">
18+
<widget class="QLabel" name="label_5">
3219
<property name="text">
33-
<string>Color</string>
20+
<string>Join style</string>
3421
</property>
3522
</widget>
3623
</item>
37-
<item row="1" column="0">
38-
<widget class="QLabel" name="label_2">
39-
<property name="text">
40-
<string>Pen width</string>
24+
<item row="7" column="0" colspan="3">
25+
<layout class="QHBoxLayout" name="horizontalLayout">
26+
<property name="sizeConstraint">
27+
<enum>QLayout::SetFixedSize</enum>
4128
</property>
42-
</widget>
29+
<item>
30+
<widget class="QCheckBox" name="mCustomCheckBox">
31+
<property name="text">
32+
<string>Use custom dash pattern</string>
33+
</property>
34+
</widget>
35+
</item>
36+
<item>
37+
<widget class="QPushButton" name="mChangePatternButton">
38+
<property name="text">
39+
<string>Change</string>
40+
</property>
41+
</widget>
42+
</item>
43+
</layout>
4344
</item>
44-
<item row="4" column="0">
45-
<widget class="QLabel" name="label_5">
45+
<item row="3" column="0">
46+
<widget class="QLabel" name="label_3">
4647
<property name="text">
47-
<string>Join style</string>
48+
<string>Pen style</string>
4849
</property>
4950
</widget>
5051
</item>
51-
<item row="1" column="1">
52-
<widget class="QDoubleSpinBox" name="spinWidth">
52+
<item row="0" column="1" colspan="2">
53+
<widget class="QgsColorButton" name="btnChangeColor">
5354
<property name="sizePolicy">
5455
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
5556
<horstretch>0</horstretch>
5657
<verstretch>0</verstretch>
5758
</sizepolicy>
5859
</property>
60+
<property name="text">
61+
<string>Change...</string>
62+
</property>
63+
</widget>
64+
</item>
65+
<item row="2" column="1">
66+
<widget class="QDoubleSpinBox" name="spinOffset">
5967
<property name="alignment">
6068
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
6169
</property>
6270
<property name="decimals">
6371
<number>5</number>
6472
</property>
73+
<property name="minimum">
74+
<double>-100000.000000000000000</double>
75+
</property>
6576
<property name="maximum">
6677
<double>100000.000000000000000</double>
6778
</property>
68-
<property name="value">
69-
<double>1.000000000000000</double>
70-
</property>
7179
</widget>
7280
</item>
73-
<item row="1" column="2">
74-
<widget class="QComboBox" name="mPenWidthUnitComboBox">
81+
<item row="2" column="2">
82+
<widget class="QComboBox" name="mOffsetUnitComboBox">
7583
<property name="sizePolicy">
7684
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
7785
<horstretch>0</horstretch>
@@ -90,65 +98,33 @@
9098
</item>
9199
</widget>
92100
</item>
93-
<item row="2" column="0">
94-
<widget class="QLabel" name="label_4">
95-
<property name="text">
96-
<string>Offset</string>
101+
<item row="1" column="1">
102+
<widget class="QDoubleSpinBox" name="spinWidth">
103+
<property name="sizePolicy">
104+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
105+
<horstretch>0</horstretch>
106+
<verstretch>0</verstretch>
107+
</sizepolicy>
97108
</property>
98-
</widget>
99-
</item>
100-
<item row="2" column="1">
101-
<widget class="QDoubleSpinBox" name="spinOffset">
102109
<property name="alignment">
103110
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
104111
</property>
105112
<property name="decimals">
106113
<number>5</number>
107114
</property>
108-
<property name="minimum">
109-
<double>-100000.000000000000000</double>
110-
</property>
111115
<property name="maximum">
112116
<double>100000.000000000000000</double>
113117
</property>
118+
<property name="value">
119+
<double>1.000000000000000</double>
120+
</property>
114121
</widget>
115122
</item>
116123
<item row="4" column="1" colspan="2">
117124
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
118125
</item>
119-
<item row="6" column="0" colspan="3">
120-
<layout class="QHBoxLayout" name="horizontalLayout">
121-
<property name="sizeConstraint">
122-
<enum>QLayout::SetFixedSize</enum>
123-
</property>
124-
<item>
125-
<widget class="QCheckBox" name="mCustomCheckBox">
126-
<property name="text">
127-
<string>Use custom dash pattern</string>
128-
</property>
129-
</widget>
130-
</item>
131-
<item>
132-
<widget class="QPushButton" name="mChangePatternButton">
133-
<property name="text">
134-
<string>Change</string>
135-
</property>
136-
</widget>
137-
</item>
138-
</layout>
139-
</item>
140-
<item row="3" column="1" colspan="2">
141-
<widget class="QgsPenStyleComboBox" name="cboPenStyle"/>
142-
</item>
143-
<item row="3" column="0">
144-
<widget class="QLabel" name="label_3">
145-
<property name="text">
146-
<string>Pen style</string>
147-
</property>
148-
</widget>
149-
</item>
150-
<item row="2" column="2">
151-
<widget class="QComboBox" name="mOffsetUnitComboBox">
126+
<item row="1" column="2">
127+
<widget class="QComboBox" name="mPenWidthUnitComboBox">
152128
<property name="sizePolicy">
153129
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
154130
<horstretch>0</horstretch>
@@ -167,14 +143,7 @@
167143
</item>
168144
</widget>
169145
</item>
170-
<item row="7" column="0">
171-
<widget class="QLabel" name="mDashPatternUnitLabel">
172-
<property name="text">
173-
<string>Dash pattern unit</string>
174-
</property>
175-
</widget>
176-
</item>
177-
<item row="7" column="1" colspan="2">
146+
<item row="8" column="1" colspan="2">
178147
<widget class="QComboBox" name="mDashPatternUnitComboBox">
179148
<item>
180149
<property name="text">
@@ -188,7 +157,10 @@
188157
</item>
189158
</widget>
190159
</item>
191-
<item row="8" column="0" colspan="3">
160+
<item row="3" column="1" colspan="2">
161+
<widget class="QgsPenStyleComboBox" name="cboPenStyle"/>
162+
</item>
163+
<item row="9" column="0" colspan="3">
192164
<layout class="QHBoxLayout" name="horizontalLayout_2">
193165
<item>
194166
<widget class="QLabel" name="mDataDefinedPropertiesLabel">
@@ -212,14 +184,47 @@
212184
</item>
213185
</layout>
214186
</item>
187+
<item row="1" column="0">
188+
<widget class="QLabel" name="label_2">
189+
<property name="text">
190+
<string>Pen width</string>
191+
</property>
192+
</widget>
193+
</item>
194+
<item row="2" column="0">
195+
<widget class="QLabel" name="label_4">
196+
<property name="text">
197+
<string>Offset</string>
198+
</property>
199+
</widget>
200+
</item>
201+
<item row="0" column="0">
202+
<widget class="QLabel" name="label">
203+
<property name="text">
204+
<string>Color</string>
205+
</property>
206+
</widget>
207+
</item>
208+
<item row="8" column="0">
209+
<widget class="QLabel" name="mDashPatternUnitLabel">
210+
<property name="text">
211+
<string>Dash pattern unit</string>
212+
</property>
213+
</widget>
214+
</item>
215+
<item row="5" column="1" colspan="2">
216+
<widget class="QgsPenCapStyleComboBox" name="cboCapStyle"/>
217+
</item>
218+
<item row="5" column="0">
219+
<widget class="QLabel" name="label_6">
220+
<property name="text">
221+
<string>Cap style</string>
222+
</property>
223+
</widget>
224+
</item>
215225
</layout>
216226
</widget>
217227
<customwidgets>
218-
<customwidget>
219-
<class>QgsColorButton</class>
220-
<extends>QPushButton</extends>
221-
<header>qgscolorbutton.h</header>
222-
</customwidget>
223228
<customwidget>
224229
<class>QgsPenStyleComboBox</class>
225230
<extends>QComboBox</extends>
@@ -235,6 +240,11 @@
235240
<extends>QComboBox</extends>
236241
<header>qgspenstylecombobox.h</header>
237242
</customwidget>
243+
<customwidget>
244+
<class>QgsColorButton</class>
245+
<extends>QPushButton</extends>
246+
<header>qgscolorbutton.h</header>
247+
</customwidget>
238248
</customwidgets>
239249
<resources/>
240250
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.