Skip to content

Commit 76f4f7c

Browse files
NathanW2NathanW2
committed
Conditional UI tweaks
1 parent 8cbfe00 commit 76f4f7c

File tree

1 file changed

+119
-89
lines changed

1 file changed

+119
-89
lines changed

‎src/ui/qgsfieldconditionalformatwidget.ui‎

Lines changed: 119 additions & 89 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>410</width>
10-
<height>337</height>
9+
<width>387</width>
10+
<height>461</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -20,7 +20,16 @@
2020
<string>Form</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
23-
<property name="margin">
23+
<property name="leftMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="topMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="rightMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="bottomMargin">
2433
<number>0</number>
2534
</property>
2635
<item>
@@ -40,33 +49,18 @@
4049
</property>
4150
<widget class="QWidget" name="page">
4251
<layout class="QGridLayout" name="gridLayout">
43-
<property name="margin">
52+
<property name="leftMargin">
53+
<number>0</number>
54+
</property>
55+
<property name="topMargin">
56+
<number>0</number>
57+
</property>
58+
<property name="rightMargin">
59+
<number>0</number>
60+
</property>
61+
<property name="bottomMargin">
4462
<number>0</number>
4563
</property>
46-
<item row="2" column="0" colspan="2">
47-
<widget class="QPushButton" name="mNewButton">
48-
<property name="text">
49-
<string>New Rule</string>
50-
</property>
51-
<property name="icon">
52-
<iconset resource="../../images/images.qrc">
53-
<normaloff>:/images/themes/default/symbologyAdd.png</normaloff>:/images/themes/default/symbologyAdd.png</iconset>
54-
</property>
55-
</widget>
56-
</item>
57-
<item row="0" column="0">
58-
<widget class="QLabel" name="label_2">
59-
<property name="sizePolicy">
60-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
61-
<horstretch>0</horstretch>
62-
<verstretch>0</verstretch>
63-
</sizepolicy>
64-
</property>
65-
<property name="text">
66-
<string>Field</string>
67-
</property>
68-
</widget>
69-
</item>
7064
<item row="1" column="0" colspan="2">
7165
<widget class="QListView" name="listView">
7266
<property name="editTriggers">
@@ -80,27 +74,65 @@
8074
</property>
8175
</widget>
8276
</item>
83-
<item row="0" column="1">
84-
<widget class="QgsFieldComboBox" name="mFieldCombo"/>
77+
<item row="0" column="0" colspan="2">
78+
<layout class="QHBoxLayout" name="horizontalLayout">
79+
<property name="topMargin">
80+
<number>0</number>
81+
</property>
82+
<item>
83+
<widget class="QLabel" name="label_2">
84+
<property name="sizePolicy">
85+
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
86+
<horstretch>0</horstretch>
87+
<verstretch>0</verstretch>
88+
</sizepolicy>
89+
</property>
90+
<property name="text">
91+
<string>Field</string>
92+
</property>
93+
</widget>
94+
</item>
95+
<item>
96+
<widget class="QgsFieldComboBox" name="mFieldCombo"/>
97+
</item>
98+
<item>
99+
<widget class="QPushButton" name="mNewButton">
100+
<property name="sizePolicy">
101+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
102+
<horstretch>0</horstretch>
103+
<verstretch>0</verstretch>
104+
</sizepolicy>
105+
</property>
106+
<property name="text">
107+
<string>New Rule</string>
108+
</property>
109+
<property name="icon">
110+
<iconset resource="../../images/images.qrc">
111+
<normaloff>:/images/themes/default/symbologyAdd.png</normaloff>:/images/themes/default/symbologyAdd.png</iconset>
112+
</property>
113+
</widget>
114+
</item>
115+
</layout>
85116
</item>
86117
</layout>
87118
</widget>
88119
<widget class="QWidget" name="page_2">
89-
<layout class="QFormLayout" name="formLayout">
90-
<property name="fieldGrowthPolicy">
91-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
92-
</property>
93-
<item row="4" column="0">
120+
<layout class="QGridLayout" name="gridLayout_3">
121+
<item row="0" column="0">
94122
<widget class="QLabel" name="label">
95123
<property name="text">
96124
<string>Condition</string>
97125
</property>
98126
</widget>
99127
</item>
100-
<item row="4" column="1">
128+
<item row="1" column="0">
101129
<layout class="QHBoxLayout" name="horizontalLayout_5">
102130
<item>
103-
<widget class="QLineEdit" name="mRuleEdit"/>
131+
<widget class="QLineEdit" name="mRuleEdit">
132+
<property name="text">
133+
<string>@value</string>
134+
</property>
135+
</widget>
104136
</item>
105137
<item>
106138
<widget class="QToolButton" name="btnBuildExpression">
@@ -115,19 +147,12 @@
115147
</item>
116148
</layout>
117149
</item>
118-
<item row="5" column="0">
119-
<widget class="QLabel" name="label_3">
120-
<property name="text">
121-
<string>Format</string>
122-
</property>
123-
</widget>
124-
</item>
125-
<item row="5" column="1">
150+
<item row="2" column="0">
126151
<layout class="QGridLayout" name="gridLayout_2">
127-
<item row="0" column="0">
128-
<widget class="QPushButton" name="mDefault1">
152+
<item row="1" column="1">
153+
<widget class="QPushButton" name="mDefault3">
129154
<property name="styleSheet">
130-
<string notr="true">background-color: rgb(208, 255, 187);</string>
155+
<string notr="true">background-color: rgb(240, 204, 146);</string>
131156
</property>
132157
<property name="text">
133158
<string>abc - 123</string>
@@ -137,66 +162,66 @@
137162
</property>
138163
<property name="backColor" stdset="0">
139164
<color>
140-
<red>154</red>
141-
<green>216</green>
142-
<blue>113</blue>
165+
<red>241</red>
166+
<green>186</green>
167+
<blue>118</blue>
143168
</color>
144169
</property>
145170
<attribute name="buttonGroup">
146171
<string notr="true">mDefaultButtons</string>
147172
</attribute>
148173
</widget>
149174
</item>
150-
<item row="0" column="2">
151-
<widget class="QPushButton" name="mDefault2">
175+
<item row="2" column="2">
176+
<widget class="QPushButton" name="pushButton_7">
152177
<property name="styleSheet">
153-
<string notr="true">background-color: rgb(255, 167, 151);</string>
178+
<string notr="true">color: rgb(170, 64, 75);</string>
154179
</property>
155180
<property name="text">
156181
<string>abc - 123</string>
157182
</property>
158183
<property name="checkable">
159184
<bool>true</bool>
160185
</property>
161-
<property name="backColor" stdset="0">
186+
<property name="fontColor" stdset="0">
162187
<color>
163-
<red>255</red>
164-
<green>130</green>
165-
<blue>130</blue>
188+
<red>188</red>
189+
<green>54</green>
190+
<blue>49</blue>
166191
</color>
167192
</property>
168193
<attribute name="buttonGroup">
169194
<string notr="true">mDefaultButtons</string>
170195
</attribute>
171196
</widget>
172197
</item>
173-
<item row="0" column="1">
174-
<widget class="QPushButton" name="mDefault3">
198+
<item row="2" column="1">
199+
<widget class="QPushButton" name="pushButton_8">
175200
<property name="styleSheet">
176-
<string notr="true">background-color: rgb(240, 204, 146);</string>
201+
<string notr="true">color: rgb(209, 166, 57);</string>
177202
</property>
178203
<property name="text">
179204
<string>abc - 123</string>
180205
</property>
181206
<property name="checkable">
182207
<bool>true</bool>
183208
</property>
184-
<property name="backColor" stdset="0">
209+
<property name="fontColor" stdset="0">
185210
<color>
186-
<red>241</red>
187-
<green>186</green>
188-
<blue>118</blue>
211+
<red>207</red>
212+
<green>141</green>
213+
<blue>61</blue>
189214
</color>
190215
</property>
191216
<attribute name="buttonGroup">
192217
<string notr="true">mDefaultButtons</string>
193218
</attribute>
194219
</widget>
195220
</item>
196-
<item row="1" column="2">
197-
<widget class="QPushButton" name="pushButton_7">
221+
<item row="2" column="0">
222+
<widget class="QPushButton" name="pushButton_3">
198223
<property name="styleSheet">
199-
<string notr="true">color: rgb(170, 64, 75);</string>
224+
<string notr="true">color: rgb(98, 136, 78);</string>
200225
</property>
201226
<property name="text">
202227
<string>abc - 123</string>
@@ -206,32 +231,32 @@
206231
</property>
207232
<property name="fontColor" stdset="0">
208233
<color>
209-
<red>188</red>
210-
<green>54</green>
211-
<blue>49</blue>
234+
<red>80</red>
235+
<green>157</green>
236+
<blue>52</blue>
212237
</color>
213238
</property>
214239
<attribute name="buttonGroup">
215240
<string notr="true">mDefaultButtons</string>
216241
</attribute>
217242
</widget>
218243
</item>
219-
<item row="1" column="1">
220-
<widget class="QPushButton" name="pushButton_8">
244+
<item row="1" column="2">
245+
<widget class="QPushButton" name="mDefault2">
221246
<property name="styleSheet">
222-
<string notr="true">color: rgb(209, 166, 57);</string>
247+
<string notr="true">background-color: rgb(255, 167, 151);</string>
223248
</property>
224249
<property name="text">
225250
<string>abc - 123</string>
226251
</property>
227252
<property name="checkable">
228253
<bool>true</bool>
229254
</property>
230-
<property name="fontColor" stdset="0">
255+
<property name="backColor" stdset="0">
231256
<color>
232-
<red>207</red>
233-
<green>141</green>
234-
<blue>61</blue>
257+
<red>255</red>
258+
<green>130</green>
259+
<blue>130</blue>
235260
</color>
236261
</property>
237262
<attribute name="buttonGroup">
@@ -240,31 +265,38 @@
240265
</widget>
241266
</item>
242267
<item row="1" column="0">
243-
<widget class="QPushButton" name="pushButton_3">
268+
<widget class="QPushButton" name="mDefault1">
244269
<property name="styleSheet">
245-
<string notr="true">color: rgb(98, 136, 78);</string>
270+
<string notr="true">background-color: rgb(208, 255, 187);</string>
246271
</property>
247272
<property name="text">
248273
<string>abc - 123</string>
249274
</property>
250275
<property name="checkable">
251276
<bool>true</bool>
252277
</property>
253-
<property name="fontColor" stdset="0">
278+
<property name="backColor" stdset="0">
254279
<color>
255-
<red>80</red>
256-
<green>157</green>
257-
<blue>52</blue>
280+
<red>154</red>
281+
<green>216</green>
282+
<blue>113</blue>
258283
</color>
259284
</property>
260285
<attribute name="buttonGroup">
261286
<string notr="true">mDefaultButtons</string>
262287
</attribute>
263288
</widget>
264289
</item>
290+
<item row="0" column="0">
291+
<widget class="QLabel" name="label_3">
292+
<property name="text">
293+
<string>Format</string>
294+
</property>
295+
</widget>
296+
</item>
265297
</layout>
266298
</item>
267-
<item row="6" column="1">
299+
<item row="3" column="0">
268300
<widget class="QGroupBox" name="horizontalGroupBox_2">
269301
<property name="title">
270302
<string>Custom</string>
@@ -586,7 +618,7 @@
586618
</layout>
587619
</widget>
588620
</item>
589-
<item row="9" column="0" colspan="2">
621+
<item row="4" column="0">
590622
<spacer name="verticalSpacer">
591623
<property name="orientation">
592624
<enum>Qt::Vertical</enum>
@@ -602,7 +634,7 @@
602634
</property>
603635
</spacer>
604636
</item>
605-
<item row="10" column="0" colspan="2">
637+
<item row="5" column="0">
606638
<layout class="QHBoxLayout" name="horizontalLayout_2">
607639
<item>
608640
<widget class="QPushButton" name="mSaveRule">
@@ -667,9 +699,7 @@
667699
</customwidget>
668700
</customwidgets>
669701
<tabstops>
670-
<tabstop>mFieldCombo</tabstop>
671702
<tabstop>listView</tabstop>
672-
<tabstop>mNewButton</tabstop>
673703
<tabstop>mRuleEdit</tabstop>
674704
<tabstop>btnBuildExpression</tabstop>
675705
<tabstop>mDefault1</tabstop>

0 commit comments

Comments
 (0)