Skip to content

Commit 002ace2

Browse files
nirvnNathanW2
nirvn
authored and
NathanW2
committedJun 28, 2016
[styledock] improve categorized, graduated, and rule-based renderer layout (#3247)
·
ltr-3_40archive/master_2
1 parent 00dc27f commit 002ace2

File tree

3 files changed

+84
-90
lines changed

3 files changed

+84
-90
lines changed
 

‎src/ui/qgscategorizedsymbolrendererv2widget.ui

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
</widget>
152152
</item>
153153
<item>
154-
<widget class="QToolButton" name="btnAddCategory">
155-
<property name="text">
154+
<widget class="QPushButton" name="btnAddCategory">
155+
<property name="toolTip">
156156
<string>Add</string>
157157
</property>
158158
<property name="icon">
@@ -162,8 +162,8 @@
162162
</widget>
163163
</item>
164164
<item>
165-
<widget class="QToolButton" name="btnDeleteCategories">
166-
<property name="text">
165+
<widget class="QPushButton" name="btnDeleteCategories">
166+
<property name="toolTip">
167167
<string>Delete</string>
168168
</property>
169169
<property name="icon">
@@ -177,10 +177,6 @@
177177
<property name="text">
178178
<string>Delete all</string>
179179
</property>
180-
<property name="icon">
181-
<iconset resource="../../images/images.qrc">
182-
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
183-
</property>
184180
</widget>
185181
</item>
186182
<item>

‎src/ui/qgsgraduatedsymbolrendererv2widget.ui

Lines changed: 38 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,12 @@ Negative rounds to powers of 10</string>
308308
<string>Classes</string>
309309
</attribute>
310310
<layout class="QVBoxLayout" name="verticalLayout">
311+
<property name="leftMargin">
312+
<number>0</number>
313+
</property>
314+
<property name="rightMargin">
315+
<number>0</number>
316+
</property>
311317
<item>
312318
<layout class="QHBoxLayout" name="horizontalLayout_5">
313319
<item>
@@ -378,13 +384,6 @@ Negative rounds to powers of 10</string>
378384
</property>
379385
</widget>
380386
</item>
381-
<item>
382-
<widget class="QPushButton" name="btnGraduatedClassify">
383-
<property name="text">
384-
<string>Classify</string>
385-
</property>
386-
</widget>
387-
</item>
388387
<item>
389388
<spacer name="horizontalSpacer_4">
390389
<property name="orientation">
@@ -428,8 +427,15 @@ Negative rounds to powers of 10</string>
428427
<item>
429428
<layout class="QHBoxLayout" name="horizontalLayout_3">
430429
<item>
431-
<widget class="QToolButton" name="btnGraduatedAdd">
430+
<widget class="QPushButton" name="btnGraduatedClassify">
432431
<property name="text">
432+
<string>Classify</string>
433+
</property>
434+
</widget>
435+
</item>
436+
<item>
437+
<widget class="QPushButton" name="btnGraduatedAdd">
438+
<property name="toolTip">
433439
<string>Add class</string>
434440
</property>
435441
<property name="icon">
@@ -439,8 +445,8 @@ Negative rounds to powers of 10</string>
439445
</widget>
440446
</item>
441447
<item>
442-
<widget class="QToolButton" name="btnGraduatedDelete">
443-
<property name="text">
448+
<widget class="QPushButton" name="btnGraduatedDelete">
449+
<property name="toolTip">
444450
<string>Delete</string>
445451
</property>
446452
<property name="icon">
@@ -454,20 +460,6 @@ Negative rounds to powers of 10</string>
454460
<property name="text">
455461
<string>Delete all</string>
456462
</property>
457-
<property name="icon">
458-
<iconset resource="../../images/images.qrc">
459-
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
460-
</property>
461-
</widget>
462-
</item>
463-
<item>
464-
<widget class="QCheckBox" name="cbxLinkBoundaries">
465-
<property name="text">
466-
<string>Link class boundaries</string>
467-
</property>
468-
<property name="checked">
469-
<bool>true</bool>
470-
</property>
471463
</widget>
472464
</item>
473465
<item>
@@ -477,12 +469,33 @@ Negative rounds to powers of 10</string>
477469
</property>
478470
<property name="sizeHint" stdset="0">
479471
<size>
480-
<width>40</width>
472+
<width>0</width>
481473
<height>20</height>
482474
</size>
483475
</property>
484476
</spacer>
485477
</item>
478+
<item>
479+
<widget class="QPushButton" name="btnAdvanced">
480+
<property name="text">
481+
<string>Advanced</string>
482+
</property>
483+
</widget>
484+
</item>
485+
</layout>
486+
</item>
487+
<item>
488+
<layout class="QHBoxLayout" name="_2">
489+
<item>
490+
<widget class="QCheckBox" name="cbxLinkBoundaries">
491+
<property name="text">
492+
<string>Link class boundaries</string>
493+
</property>
494+
<property name="checked">
495+
<bool>true</bool>
496+
</property>
497+
</widget>
498+
</item>
486499
</layout>
487500
</item>
488501
</layout>
@@ -499,30 +512,6 @@ Negative rounds to powers of 10</string>
499512
</widget>
500513
</widget>
501514
</item>
502-
<item row="6" column="0" colspan="2">
503-
<layout class="QHBoxLayout" name="_2">
504-
<item>
505-
<spacer>
506-
<property name="orientation">
507-
<enum>Qt::Horizontal</enum>
508-
</property>
509-
<property name="sizeHint" stdset="0">
510-
<size>
511-
<width>40</width>
512-
<height>20</height>
513-
</size>
514-
</property>
515-
</spacer>
516-
</item>
517-
<item>
518-
<widget class="QPushButton" name="btnAdvanced">
519-
<property name="text">
520-
<string>Advanced</string>
521-
</property>
522-
</widget>
523-
</item>
524-
</layout>
525-
</item>
526515
</layout>
527516
</widget>
528517
<customwidgets>

‎src/ui/qgsrulebasedrendererv2widget.ui

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
</rect>
1212
</property>
1313
<layout class="QVBoxLayout" name="verticalLayout">
14-
<property name="leftMargin">
15-
<number>0</number>
16-
</property>
17-
<property name="topMargin">
18-
<number>0</number>
19-
</property>
20-
<property name="rightMargin">
21-
<number>0</number>
22-
</property>
23-
<property name="bottomMargin">
24-
<number>0</number>
25-
</property>
2614
<item>
2715
<widget class="QTreeView" name="viewRules">
2816
<property name="contextMenuPolicy">
@@ -71,33 +59,68 @@
7159
</widget>
7260
</item>
7361
<item>
74-
<widget class="QPushButton" name="btnEditRule">
62+
<widget class="QPushButton" name="btnRemoveRule">
7563
<property name="toolTip">
76-
<string>Edit current rule</string>
64+
<string>Remove selected rules</string>
7765
</property>
7866
<property name="text">
7967
<string/>
8068
</property>
8169
<property name="icon">
8270
<iconset resource="../../images/images.qrc">
83-
<normaloff>:/images/themes/default/symbologyEdit.png</normaloff>:/images/themes/default/symbologyEdit.png</iconset>
71+
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
8472
</property>
8573
</widget>
8674
</item>
8775
<item>
88-
<widget class="QPushButton" name="btnRemoveRule">
76+
<widget class="QPushButton" name="btnEditRule">
8977
<property name="toolTip">
90-
<string>Remove selected rules</string>
78+
<string>Edit current rule</string>
9179
</property>
9280
<property name="text">
9381
<string/>
9482
</property>
9583
<property name="icon">
9684
<iconset resource="../../images/images.qrc">
97-
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
85+
<normaloff>:/images/themes/default/symbologyEdit.png</normaloff>:/images/themes/default/symbologyEdit.png</iconset>
86+
</property>
87+
</widget>
88+
</item>
89+
<item>
90+
<widget class="QPushButton" name="btnCountFeatures">
91+
<property name="toolTip">
92+
<string>Count features</string>
93+
</property>
94+
<property name="icon">
95+
<iconset resource="../../images/images.qrc">
96+
<normaloff>:/images/themes/default/mActionSum.svg</normaloff>:/images/themes/default/mActionSum.svg</iconset>
97+
</property>
98+
</widget>
99+
</item>
100+
<item>
101+
<spacer name="horizontalSpacer">
102+
<property name="orientation">
103+
<enum>Qt::Horizontal</enum>
104+
</property>
105+
<property name="sizeHint" stdset="0">
106+
<size>
107+
<width>0</width>
108+
<height>20</height>
109+
</size>
110+
</property>
111+
</spacer>
112+
</item>
113+
<item>
114+
<widget class="QPushButton" name="btnRenderingOrder">
115+
<property name="text">
116+
<string>Symbol levels...</string>
98117
</property>
99118
</widget>
100119
</item>
120+
</layout>
121+
</item>
122+
<item>
123+
<layout class="QHBoxLayout" name="horizontalLayout2">
101124
<item>
102125
<widget class="QPushButton" name="btnRefineRule">
103126
<property name="enabled">
@@ -121,14 +144,7 @@
121144
</widget>
122145
</item>
123146
<item>
124-
<widget class="QPushButton" name="btnCountFeatures">
125-
<property name="text">
126-
<string>Count features</string>
127-
</property>
128-
</widget>
129-
</item>
130-
<item>
131-
<spacer name="horizontalSpacer">
147+
<spacer name="horizontalSpacer2">
132148
<property name="orientation">
133149
<enum>Qt::Horizontal</enum>
134150
</property>
@@ -140,13 +156,6 @@
140156
</property>
141157
</spacer>
142158
</item>
143-
<item>
144-
<widget class="QPushButton" name="btnRenderingOrder">
145-
<property name="text">
146-
<string>Symbol levels...</string>
147-
</property>
148-
</widget>
149-
</item>
150159
</layout>
151160
</item>
152161
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.