Skip to content

Commit 293d95b

Browse files
author
timlinux
committedNov 15, 2009
UI tidy ups
git-svn-id: http://svn.osgeo.org/qgis/trunk@12123 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 242c93d commit 293d95b

File tree

4 files changed

+224
-235
lines changed

4 files changed

+224
-235
lines changed
 

‎src/plugins/diagram_overlay/qgsdiagramdialogbase.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>398</width>
10-
<height>441</height>
9+
<width>338</width>
10+
<height>324</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<item row="0" column="0">
2121
<widget class="QLabel" name="mTitleLabel">
2222
<property name="text">
23-
<string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
23+
<string>Scale linearly between 0 and the following attribute value / diagram size:</string>
2424
</property>
2525
<property name="wordWrap">
2626
<bool>true</bool>

‎src/ui/qgssinglesymboldialogbase.ui

Lines changed: 220 additions & 231 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>518</height>
9+
<width>360</width>
10+
<height>470</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -19,210 +19,146 @@
1919
<property name="windowTitle">
2020
<string>Single Symbol</string>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout_5">
22+
<layout class="QGridLayout" name="gridLayout_6">
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
2626
<item row="0" column="0">
27-
<widget class="QLabel" name="mLabel">
28-
<property name="minimumSize">
29-
<size>
30-
<width>0</width>
31-
<height>22</height>
32-
</size>
27+
<widget class="QScrollArea" name="scrollArea">
28+
<property name="widgetResizable">
29+
<bool>true</bool>
3330
</property>
34-
<property name="text">
35-
<string>Label</string>
36-
</property>
37-
<property name="buddy">
38-
<cstring>mLabelEdit</cstring>
39-
</property>
40-
</widget>
41-
</item>
42-
<item row="0" column="1">
43-
<widget class="QLineEdit" name="mLabelEdit">
44-
<property name="minimumSize">
45-
<size>
46-
<width>0</width>
47-
<height>22</height>
48-
</size>
49-
</property>
50-
</widget>
51-
</item>
52-
<item row="1" column="0" colspan="2">
53-
<widget class="QGroupBox" name="mGroupPoint">
54-
<property name="sizePolicy">
55-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
56-
<horstretch>0</horstretch>
57-
<verstretch>0</verstretch>
58-
</sizepolicy>
59-
</property>
60-
<property name="title">
61-
<string>Point Symbol</string>
62-
</property>
63-
<layout class="QGridLayout" name="gridLayout_4">
64-
<item row="0" column="0" colspan="3">
65-
<widget class="QListWidget" name="lstSymbols">
66-
<property name="sizePolicy">
67-
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
68-
<horstretch>0</horstretch>
69-
<verstretch>0</verstretch>
70-
</sizepolicy>
71-
</property>
72-
<property name="dragDropMode">
73-
<enum>QAbstractItemView::DragDrop</enum>
74-
</property>
75-
<property name="alternatingRowColors">
76-
<bool>false</bool>
77-
</property>
78-
<property name="iconSize">
79-
<size>
80-
<width>0</width>
81-
<height>-1</height>
82-
</size>
83-
</property>
84-
<property name="resizeMode">
85-
<enum>QListView::Adjust</enum>
86-
</property>
87-
<property name="viewMode">
88-
<enum>QListView::IconMode</enum>
89-
</property>
90-
<property name="uniformItemSizes">
91-
<bool>true</bool>
92-
</property>
93-
<property name="wordWrap">
94-
<bool>false</bool>
95-
</property>
96-
</widget>
97-
</item>
98-
<item row="1" column="0">
99-
<widget class="QLabel" name="textLabel1_2">
100-
<property name="text">
101-
<string>Size</string>
102-
</property>
103-
<property name="buddy">
104-
<cstring>mPointSizeSpinBox</cstring>
105-
</property>
106-
</widget>
107-
</item>
108-
<item row="1" column="1">
109-
<widget class="QDoubleSpinBox" name="mPointSizeSpinBox">
110-
<property name="decimals">
111-
<number>5</number>
112-
</property>
113-
<property name="maximum">
114-
<double>1000000.000000000000000</double>
115-
</property>
116-
<property name="singleStep">
117-
<double>0.100000000000000</double>
118-
</property>
119-
<property name="value">
120-
<double>1.000000000000000</double>
121-
</property>
122-
</widget>
123-
</item>
124-
<item row="1" column="2">
125-
<widget class="QCheckBox" name="mPointSizeUnitsCheckBox">
126-
<property name="text">
127-
<string>In map units</string>
128-
</property>
129-
</widget>
130-
</item>
131-
<item row="2" column="2">
132-
<layout class="QHBoxLayout" name="horizontalLayout"/>
133-
</item>
134-
</layout>
135-
</widget>
136-
</item>
137-
<item row="2" column="0" colspan="2">
138-
<layout class="QHBoxLayout" name="horizontalLayout_2">
139-
<item>
140-
<widget class="QGroupBox" name="mGroupDrawingByField">
141-
<property name="title">
142-
<string>Drawing by field</string>
143-
</property>
144-
<layout class="QGridLayout" name="gridLayout">
145-
<item row="0" column="0">
146-
<widget class="QLabel" name="mLblRotationField">
147-
<property name="text">
148-
<string>Rotation</string>
149-
</property>
150-
<property name="buddy">
151-
<cstring>mRotationClassificationComboBox</cstring>
152-
</property>
153-
</widget>
154-
</item>
155-
<item row="0" column="1">
156-
<widget class="QComboBox" name="mRotationClassificationComboBox">
157-
<property name="minimumSize">
158-
<size>
159-
<width>0</width>
160-
<height>20</height>
161-
</size>
162-
</property>
163-
</widget>
164-
</item>
165-
<item row="1" column="0">
166-
<widget class="QLabel" name="textLabel9">
167-
<property name="text">
168-
<string>Area scale</string>
169-
</property>
170-
<property name="buddy">
171-
<cstring>mScaleClassificationComboBox</cstring>
172-
</property>
173-
</widget>
174-
</item>
175-
<item row="1" column="1">
176-
<widget class="QComboBox" name="mScaleClassificationComboBox">
177-
<property name="minimumSize">
178-
<size>
179-
<width>0</width>
180-
<height>20</height>
181-
</size>
182-
</property>
183-
</widget>
184-
</item>
185-
<item row="2" column="0">
186-
<widget class="QLabel" name="label">
187-
<property name="text">
188-
<string>Symbol</string>
189-
</property>
190-
<property name="buddy">
191-
<cstring>mSymbolComboBox</cstring>
192-
</property>
193-
</widget>
194-
</item>
195-
<item row="2" column="1">
196-
<widget class="QComboBox" name="mSymbolComboBox"/>
197-
</item>
198-
<item row="3" column="0">
199-
<spacer name="verticalSpacer_2">
200-
<property name="orientation">
201-
<enum>Qt::Vertical</enum>
202-
</property>
203-
<property name="sizeHint" stdset="0">
204-
<size>
205-
<width>20</width>
206-
<height>40</height>
207-
</size>
208-
</property>
209-
</spacer>
210-
</item>
211-
</layout>
212-
</widget>
213-
</item>
214-
<item>
215-
<layout class="QVBoxLayout" name="verticalLayout">
216-
<item>
31+
<widget class="QWidget" name="scrollAreaWidgetContents">
32+
<property name="geometry">
33+
<rect>
34+
<x>0</x>
35+
<y>0</y>
36+
<width>337</width>
37+
<height>616</height>
38+
</rect>
39+
</property>
40+
<layout class="QGridLayout" name="gridLayout_5">
41+
<item row="0" column="0">
42+
<widget class="QGroupBox" name="mGroupPoint">
43+
<property name="sizePolicy">
44+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
45+
<horstretch>0</horstretch>
46+
<verstretch>0</verstretch>
47+
</sizepolicy>
48+
</property>
49+
<property name="title">
50+
<string>Point Symbol</string>
51+
</property>
52+
<layout class="QGridLayout" name="gridLayout_4">
53+
<item row="0" column="0" colspan="3">
54+
<widget class="QListWidget" name="lstSymbols">
55+
<property name="sizePolicy">
56+
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
57+
<horstretch>0</horstretch>
58+
<verstretch>0</verstretch>
59+
</sizepolicy>
60+
</property>
61+
<property name="dragDropMode">
62+
<enum>QAbstractItemView::DragDrop</enum>
63+
</property>
64+
<property name="alternatingRowColors">
65+
<bool>false</bool>
66+
</property>
67+
<property name="iconSize">
68+
<size>
69+
<width>0</width>
70+
<height>-1</height>
71+
</size>
72+
</property>
73+
<property name="resizeMode">
74+
<enum>QListView::Adjust</enum>
75+
</property>
76+
<property name="viewMode">
77+
<enum>QListView::IconMode</enum>
78+
</property>
79+
<property name="uniformItemSizes">
80+
<bool>true</bool>
81+
</property>
82+
<property name="wordWrap">
83+
<bool>false</bool>
84+
</property>
85+
</widget>
86+
</item>
87+
<item row="1" column="0">
88+
<widget class="QLabel" name="textLabel1_2">
89+
<property name="text">
90+
<string>Size</string>
91+
</property>
92+
<property name="buddy">
93+
<cstring>mPointSizeSpinBox</cstring>
94+
</property>
95+
</widget>
96+
</item>
97+
<item row="1" column="1">
98+
<widget class="QDoubleSpinBox" name="mPointSizeSpinBox">
99+
<property name="decimals">
100+
<number>5</number>
101+
</property>
102+
<property name="maximum">
103+
<double>1000000.000000000000000</double>
104+
</property>
105+
<property name="singleStep">
106+
<double>0.100000000000000</double>
107+
</property>
108+
<property name="value">
109+
<double>1.000000000000000</double>
110+
</property>
111+
</widget>
112+
</item>
113+
<item row="1" column="2">
114+
<widget class="QCheckBox" name="mPointSizeUnitsCheckBox">
115+
<property name="text">
116+
<string>In map units</string>
117+
</property>
118+
</widget>
119+
</item>
120+
<item row="2" column="2">
121+
<layout class="QHBoxLayout" name="horizontalLayout"/>
122+
</item>
123+
</layout>
124+
</widget>
125+
</item>
126+
<item row="1" column="0">
127+
<widget class="QLabel" name="mLabel">
128+
<property name="minimumSize">
129+
<size>
130+
<width>0</width>
131+
<height>22</height>
132+
</size>
133+
</property>
134+
<property name="text">
135+
<string>Label</string>
136+
</property>
137+
<property name="buddy">
138+
<cstring>mLabelEdit</cstring>
139+
</property>
140+
</widget>
141+
</item>
142+
<item row="2" column="0">
143+
<widget class="QLineEdit" name="mLabelEdit">
144+
<property name="minimumSize">
145+
<size>
146+
<width>0</width>
147+
<height>22</height>
148+
</size>
149+
</property>
150+
</widget>
151+
</item>
152+
<item row="3" column="0">
217153
<widget class="QGroupBox" name="groupBox">
218154
<property name="title">
219155
<string>Fill options</string>
220156
</property>
221-
<layout class="QGridLayout" name="gridLayout_3">
222-
<item row="0" column="0">
157+
<layout class="QHBoxLayout" name="horizontalLayout_2">
158+
<item>
223159
<widget class="QComboBox" name="cboFillStyle">
224160
<property name="sizePolicy">
225-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
161+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
226162
<horstretch>0</horstretch>
227163
<verstretch>0</verstretch>
228164
</sizepolicy>
@@ -239,16 +175,22 @@
239175
<height>16777215</height>
240176
</size>
241177
</property>
178+
<property name="iconSize">
179+
<size>
180+
<width>32</width>
181+
<height>32</height>
182+
</size>
183+
</property>
242184
</widget>
243185
</item>
244-
<item row="0" column="1">
186+
<item>
245187
<widget class="QToolButton" name="toolSelectTexture">
246188
<property name="text">
247189
<string>...</string>
248190
</property>
249191
</widget>
250192
</item>
251-
<item row="0" column="2">
193+
<item>
252194
<widget class="QgsColorButton" name="btnFillColor">
253195
<property name="sizePolicy">
254196
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -259,7 +201,7 @@
259201
<property name="minimumSize">
260202
<size>
261203
<width>32</width>
262-
<height>20</height>
204+
<height>0</height>
263205
</size>
264206
</property>
265207
<property name="maximumSize">
@@ -273,7 +215,7 @@
273215
</property>
274216
</widget>
275217
</item>
276-
<item row="0" column="3">
218+
<item>
277219
<spacer name="horizontalSpacer">
278220
<property name="orientation">
279221
<enum>Qt::Horizontal</enum>
@@ -289,7 +231,7 @@
289231
</layout>
290232
</widget>
291233
</item>
292-
<item>
234+
<item row="4" column="0">
293235
<widget class="QGroupBox" name="groupBox_3">
294236
<property name="sizePolicy">
295237
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -300,11 +242,14 @@
300242
<property name="title">
301243
<string>Outline options</string>
302244
</property>
303-
<layout class="QGridLayout" name="gridLayout_2">
304-
<item row="0" column="0">
245+
<layout class="QHBoxLayout" name="horizontalLayout_3">
246+
<item>
247+
<layout class="QHBoxLayout"/>
248+
</item>
249+
<item>
305250
<widget class="QComboBox" name="cboOutlineStyle">
306251
<property name="sizePolicy">
307-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
252+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
308253
<horstretch>0</horstretch>
309254
<verstretch>0</verstretch>
310255
</sizepolicy>
@@ -315,15 +260,15 @@
315260
<height>20</height>
316261
</size>
317262
</property>
318-
<property name="maximumSize">
263+
<property name="iconSize">
319264
<size>
320-
<width>172</width>
321-
<height>16777215</height>
265+
<width>32</width>
266+
<height>32</height>
322267
</size>
323268
</property>
324269
</widget>
325270
</item>
326-
<item row="0" column="1">
271+
<item>
327272
<widget class="QgsColorButton" name="btnOutlineColor">
328273
<property name="sizePolicy">
329274
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -334,7 +279,7 @@
334279
<property name="minimumSize">
335280
<size>
336281
<width>32</width>
337-
<height>20</height>
282+
<height>0</height>
338283
</size>
339284
</property>
340285
<property name="maximumSize">
@@ -348,7 +293,7 @@
348293
</property>
349294
</widget>
350295
</item>
351-
<item row="0" column="2">
296+
<item>
352297
<widget class="QLabel" name="outlinewidthlabel">
353298
<property name="text">
354299
<string>Width</string>
@@ -358,8 +303,14 @@
358303
</property>
359304
</widget>
360305
</item>
361-
<item row="0" column="3">
306+
<item>
362307
<widget class="QDoubleSpinBox" name="outlinewidthspinbox">
308+
<property name="sizePolicy">
309+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
310+
<horstretch>0</horstretch>
311+
<verstretch>0</verstretch>
312+
</sizepolicy>
313+
</property>
363314
<property name="minimumSize">
364315
<size>
365316
<width>0</width>
@@ -377,10 +328,7 @@
377328
</property>
378329
</widget>
379330
</item>
380-
<item row="1" column="0">
381-
<layout class="QHBoxLayout"/>
382-
</item>
383-
<item row="0" column="4">
331+
<item>
384332
<spacer name="horizontalSpacer_2">
385333
<property name="orientation">
386334
<enum>Qt::Horizontal</enum>
@@ -396,22 +344,57 @@
396344
</layout>
397345
</widget>
398346
</item>
399-
<item>
400-
<spacer name="verticalSpacer">
401-
<property name="orientation">
402-
<enum>Qt::Vertical</enum>
403-
</property>
404-
<property name="sizeHint" stdset="0">
405-
<size>
406-
<width>20</width>
407-
<height>40</height>
408-
</size>
347+
<item row="5" column="0">
348+
<widget class="QGroupBox" name="mGroupDrawingByField">
349+
<property name="title">
350+
<string>Drawing by field</string>
409351
</property>
410-
</spacer>
352+
<layout class="QGridLayout" name="gridLayout">
353+
<item row="0" column="0">
354+
<widget class="QLabel" name="mLblRotationField">
355+
<property name="text">
356+
<string>Rotation</string>
357+
</property>
358+
<property name="buddy">
359+
<cstring>mRotationClassificationComboBox</cstring>
360+
</property>
361+
</widget>
362+
</item>
363+
<item row="0" column="1">
364+
<widget class="QComboBox" name="mRotationClassificationComboBox"/>
365+
</item>
366+
<item row="1" column="0">
367+
<widget class="QLabel" name="textLabel9">
368+
<property name="text">
369+
<string>Area scale</string>
370+
</property>
371+
<property name="buddy">
372+
<cstring>mScaleClassificationComboBox</cstring>
373+
</property>
374+
</widget>
375+
</item>
376+
<item row="1" column="1">
377+
<widget class="QComboBox" name="mScaleClassificationComboBox"/>
378+
</item>
379+
<item row="2" column="0">
380+
<widget class="QLabel" name="label">
381+
<property name="text">
382+
<string>Symbol</string>
383+
</property>
384+
<property name="buddy">
385+
<cstring>mSymbolComboBox</cstring>
386+
</property>
387+
</widget>
388+
</item>
389+
<item row="2" column="1">
390+
<widget class="QComboBox" name="mSymbolComboBox"/>
391+
</item>
392+
</layout>
393+
</widget>
411394
</item>
412395
</layout>
413-
</item>
414-
</layout>
396+
</widget>
397+
</widget>
415398
</item>
416399
</layout>
417400
</widget>
@@ -424,14 +407,20 @@
424407
</customwidget>
425408
</customwidgets>
426409
<tabstops>
427-
<tabstop>mLabelEdit</tabstop>
428410
<tabstop>lstSymbols</tabstop>
429-
<tabstop>mRotationClassificationComboBox</tabstop>
430-
<tabstop>mSymbolComboBox</tabstop>
431-
<tabstop>mScaleClassificationComboBox</tabstop>
411+
<tabstop>mPointSizeSpinBox</tabstop>
412+
<tabstop>mPointSizeUnitsCheckBox</tabstop>
413+
<tabstop>mLabelEdit</tabstop>
414+
<tabstop>cboFillStyle</tabstop>
415+
<tabstop>toolSelectTexture</tabstop>
416+
<tabstop>btnFillColor</tabstop>
432417
<tabstop>cboOutlineStyle</tabstop>
433418
<tabstop>btnOutlineColor</tabstop>
434419
<tabstop>outlinewidthspinbox</tabstop>
420+
<tabstop>mRotationClassificationComboBox</tabstop>
421+
<tabstop>mScaleClassificationComboBox</tabstop>
422+
<tabstop>mSymbolComboBox</tabstop>
423+
<tabstop>scrollArea</tabstop>
435424
</tabstops>
436425
<resources/>
437426
<connections/>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<item row="0" column="2" colspan="3">
7575
<widget class="QStackedWidget" name="stackedWidget">
7676
<property name="currentIndex">
77-
<number>3</number>
77+
<number>0</number>
7878
</property>
7979
<widget class="QWidget" name="page_3">
8080
<layout class="QGridLayout" name="gridLayout_4">

0 commit comments

Comments
 (0)
Please sign in to comment.