Skip to content

Commit 4698f4d

Browse files
author
wonder
committed
Updated symbol selector GUI to reflect the design created with Tim
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12760 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3e184f7 commit 4698f4d

File tree

2 files changed

+153
-147
lines changed

2 files changed

+153
-147
lines changed

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,9 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt
4141
updateSymbolPreview();
4242
updateSymbolInfo();
4343

44-
//output unit
44+
// output unit
4545
mSymbolUnitComboBox->blockSignals( true );
46-
mSymbolUnitComboBox->addItem( tr( "Millimeter" ) );
47-
mSymbolUnitComboBox->addItem( tr( "Map unit" ) );
48-
if ( mSymbol && mSymbol->outputUnit() == QgsSymbolV2::MM )
49-
{
50-
mSymbolUnitComboBox->setCurrentIndex( mSymbolUnitComboBox->findText( tr( "Millimeter" ) ) );
51-
}
52-
else
53-
{
54-
mSymbolUnitComboBox->setCurrentIndex( mSymbolUnitComboBox->findText( tr( "Map unit" ) ) );
55-
}
46+
mSymbolUnitComboBox->setCurrentIndex( mSymbol->outputUnit() );
5647
mSymbolUnitComboBox->blockSignals( false );
5748

5849
// select correct page in stacked widget
@@ -241,18 +232,8 @@ void QgsSymbolV2SelectorDialog::keyPressEvent( QKeyEvent * e )
241232

242233
void QgsSymbolV2SelectorDialog::on_mSymbolUnitComboBox_currentIndexChanged( const QString & text )
243234
{
244-
if ( !mSymbol )
245-
{
246-
return;
247-
}
248-
if ( text == tr( "Millimeter" ) )
249-
{
250-
mSymbol->setOutputUnit( QgsSymbolV2::MM );
251-
}
252-
else //map unit
253-
{
254-
mSymbol->setOutputUnit( QgsSymbolV2::MapUnit );
255-
}
235+
mSymbol->setOutputUnit( (QgsSymbolV2::OutputUnit) mSymbolUnitComboBox->currentIndex() );
236+
256237
updateSymbolPreview();
257238
emit symbolModified();
258239
}

‎src/ui/qgssymbolv2selectordialogbase.ui

Lines changed: 149 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -45,122 +45,160 @@
4545
</widget>
4646
</item>
4747
<item>
48-
<widget class="QStackedWidget" name="stackedWidget">
49-
<property name="currentIndex">
50-
<number>2</number>
51-
</property>
52-
<widget class="QWidget" name="pageMarker">
53-
<layout class="QGridLayout" name="gridLayout">
54-
<item row="0" column="0">
55-
<widget class="QLabel" name="label_5">
56-
<property name="text">
57-
<string>Color</string>
58-
</property>
59-
</widget>
60-
</item>
61-
<item row="0" column="1">
62-
<widget class="QgsColorButtonV2" name="btnColorMarker">
63-
<property name="text">
64-
<string>Change</string>
65-
</property>
66-
</widget>
67-
</item>
68-
<item row="1" column="0">
69-
<widget class="QLabel" name="label_2">
70-
<property name="text">
71-
<string>Size</string>
72-
</property>
73-
</widget>
74-
</item>
75-
<item row="1" column="1">
76-
<widget class="QDoubleSpinBox" name="spinSize">
77-
<property name="decimals">
78-
<number>1</number>
79-
</property>
80-
<property name="value">
81-
<double>1.000000000000000</double>
82-
</property>
83-
</widget>
84-
</item>
85-
<item row="2" column="0">
86-
<widget class="QLabel" name="label_3">
48+
<layout class="QVBoxLayout" name="verticalLayout">
49+
<item>
50+
<layout class="QHBoxLayout" name="horizontalLayout_4">
51+
<item>
52+
<widget class="QLabel" name="mSymbolUnitLabel">
8753
<property name="text">
88-
<string>Rotation</string>
54+
<string>Unit</string>
8955
</property>
9056
</widget>
9157
</item>
92-
<item row="2" column="1">
93-
<widget class="QDoubleSpinBox" name="spinAngle">
94-
<property name="suffix">
95-
<string>°</string>
96-
</property>
97-
<property name="decimals">
98-
<number>1</number>
99-
</property>
100-
<property name="maximum">
101-
<double>360.000000000000000</double>
102-
</property>
103-
<property name="singleStep">
104-
<double>5.000000000000000</double>
105-
</property>
58+
<item>
59+
<widget class="QComboBox" name="mSymbolUnitComboBox">
60+
<item>
61+
<property name="text">
62+
<string>Millimeter</string>
63+
</property>
64+
</item>
65+
<item>
66+
<property name="text">
67+
<string>Map unit</string>
68+
</property>
69+
</item>
10670
</widget>
10771
</item>
10872
</layout>
109-
</widget>
110-
<widget class="QWidget" name="pageLine">
111-
<layout class="QGridLayout" name="gridLayout_2">
112-
<item row="0" column="0">
113-
<widget class="QLabel" name="label_6">
114-
<property name="text">
115-
<string>Color</string>
116-
</property>
117-
</widget>
118-
</item>
119-
<item row="0" column="1">
120-
<widget class="QgsColorButtonV2" name="btnColorLine">
121-
<property name="text">
122-
<string>Change</string>
123-
</property>
124-
</widget>
125-
</item>
126-
<item row="1" column="0">
127-
<widget class="QLabel" name="label_4">
128-
<property name="text">
129-
<string>Width</string>
130-
</property>
131-
</widget>
132-
</item>
133-
<item row="1" column="1">
134-
<widget class="QDoubleSpinBox" name="spinWidth">
135-
<property name="decimals">
136-
<number>1</number>
73+
</item>
74+
<item>
75+
<widget class="QStackedWidget" name="stackedWidget">
76+
<property name="currentIndex">
77+
<number>0</number>
78+
</property>
79+
<widget class="QWidget" name="pageMarker">
80+
<layout class="QGridLayout" name="gridLayout">
81+
<property name="margin">
82+
<number>0</number>
13783
</property>
138-
<property name="value">
139-
<double>1.000000000000000</double>
84+
<item row="0" column="0">
85+
<widget class="QLabel" name="label_5">
86+
<property name="text">
87+
<string>Color</string>
88+
</property>
89+
</widget>
90+
</item>
91+
<item row="0" column="1">
92+
<widget class="QgsColorButtonV2" name="btnColorMarker">
93+
<property name="text">
94+
<string>Change</string>
95+
</property>
96+
</widget>
97+
</item>
98+
<item row="1" column="0">
99+
<widget class="QLabel" name="label_2">
100+
<property name="text">
101+
<string>Size</string>
102+
</property>
103+
</widget>
104+
</item>
105+
<item row="1" column="1">
106+
<widget class="QDoubleSpinBox" name="spinSize">
107+
<property name="decimals">
108+
<number>1</number>
109+
</property>
110+
<property name="value">
111+
<double>1.000000000000000</double>
112+
</property>
113+
</widget>
114+
</item>
115+
<item row="2" column="0">
116+
<widget class="QLabel" name="label_3">
117+
<property name="text">
118+
<string>Rotation</string>
119+
</property>
120+
</widget>
121+
</item>
122+
<item row="2" column="1">
123+
<widget class="QDoubleSpinBox" name="spinAngle">
124+
<property name="suffix">
125+
<string>°</string>
126+
</property>
127+
<property name="decimals">
128+
<number>1</number>
129+
</property>
130+
<property name="maximum">
131+
<double>360.000000000000000</double>
132+
</property>
133+
<property name="singleStep">
134+
<double>5.000000000000000</double>
135+
</property>
136+
</widget>
137+
</item>
138+
</layout>
139+
</widget>
140+
<widget class="QWidget" name="pageLine">
141+
<layout class="QGridLayout" name="gridLayout_2">
142+
<property name="margin">
143+
<number>0</number>
140144
</property>
141-
</widget>
142-
</item>
143-
</layout>
144-
</widget>
145-
<widget class="QWidget" name="pageFill">
146-
<layout class="QHBoxLayout" name="horizontalLayout_2">
147-
<item>
148-
<widget class="QLabel" name="label_7">
149-
<property name="text">
150-
<string>Color</string>
145+
<item row="0" column="0">
146+
<widget class="QLabel" name="label_6">
147+
<property name="text">
148+
<string>Color</string>
149+
</property>
150+
</widget>
151+
</item>
152+
<item row="0" column="1">
153+
<widget class="QgsColorButtonV2" name="btnColorLine">
154+
<property name="text">
155+
<string>Change</string>
156+
</property>
157+
</widget>
158+
</item>
159+
<item row="1" column="0">
160+
<widget class="QLabel" name="label_4">
161+
<property name="text">
162+
<string>Width</string>
163+
</property>
164+
</widget>
165+
</item>
166+
<item row="1" column="1">
167+
<widget class="QDoubleSpinBox" name="spinWidth">
168+
<property name="decimals">
169+
<number>1</number>
170+
</property>
171+
<property name="value">
172+
<double>1.000000000000000</double>
173+
</property>
174+
</widget>
175+
</item>
176+
</layout>
177+
</widget>
178+
<widget class="QWidget" name="pageFill">
179+
<layout class="QHBoxLayout" name="horizontalLayout_2">
180+
<property name="margin">
181+
<number>0</number>
151182
</property>
152-
</widget>
153-
</item>
154-
<item>
155-
<widget class="QgsColorButtonV2" name="btnColorFill">
156-
<property name="text">
157-
<string>Change</string>
158-
</property>
159-
</widget>
160-
</item>
161-
</layout>
162-
</widget>
163-
</widget>
183+
<item>
184+
<widget class="QLabel" name="label_7">
185+
<property name="text">
186+
<string>Color</string>
187+
</property>
188+
</widget>
189+
</item>
190+
<item>
191+
<widget class="QgsColorButtonV2" name="btnColorFill">
192+
<property name="text">
193+
<string>Change</string>
194+
</property>
195+
</widget>
196+
</item>
197+
</layout>
198+
</widget>
199+
</widget>
200+
</item>
201+
</layout>
164202
</item>
165203
</layout>
166204
</item>
@@ -196,27 +234,13 @@
196234
</layout>
197235
</item>
198236
<item row="2" column="0">
199-
<layout class="QHBoxLayout" name="horizontalLayout_4">
200-
<item>
201-
<widget class="QLabel" name="mSymbolUnitLabel">
202-
<property name="text">
203-
<string>Symbol Unit:</string>
204-
</property>
205-
</widget>
206-
</item>
207-
<item>
208-
<widget class="QComboBox" name="mSymbolUnitComboBox"/>
209-
</item>
210-
</layout>
211-
</item>
212-
<item row="3" column="0">
213237
<widget class="QLabel" name="label">
214238
<property name="text">
215239
<string>Symbols from style:</string>
216240
</property>
217241
</widget>
218242
</item>
219-
<item row="4" column="0">
243+
<item row="3" column="0">
220244
<widget class="QListView" name="viewSymbols">
221245
<property name="sizePolicy">
222246
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -244,7 +268,7 @@
244268
</property>
245269
</widget>
246270
</item>
247-
<item row="5" column="0">
271+
<item row="4" column="0">
248272
<widget class="QDialogButtonBox" name="buttonBox">
249273
<property name="orientation">
250274
<enum>Qt::Horizontal</enum>
@@ -264,13 +288,14 @@
264288
</customwidget>
265289
</customwidgets>
266290
<tabstops>
291+
<tabstop>btnSymbolProperties</tabstop>
292+
<tabstop>mSymbolUnitComboBox</tabstop>
293+
<tabstop>btnColorFill</tabstop>
267294
<tabstop>btnColorMarker</tabstop>
268295
<tabstop>spinSize</tabstop>
269296
<tabstop>spinAngle</tabstop>
270297
<tabstop>btnColorLine</tabstop>
271298
<tabstop>spinWidth</tabstop>
272-
<tabstop>btnColorFill</tabstop>
273-
<tabstop>btnSymbolProperties</tabstop>
274299
<tabstop>btnAddToStyle</tabstop>
275300
<tabstop>viewSymbols</tabstop>
276301
<tabstop>buttonBox</tabstop>

0 commit comments

Comments
 (0)