Skip to content

Commit 3ff610a

Browse files
NathanW2NathanW2
committedNov 1, 2011
Move help above field values, less movement in Ui for user;add save and open button
·
ltr-3_40Before-merge-new_vector_api
1 parent 900011b commit 3ff610a

File tree

1 file changed

+354
-259
lines changed

1 file changed

+354
-259
lines changed
 

‎src/ui/qgsexpressionbuilder.ui

+354-259
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>603</width>
10-
<height>583</height>
9+
<width>561</width>
10+
<height>587</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -20,10 +20,262 @@
2020
<string>Form</string>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout">
23+
<property name="horizontalSpacing">
24+
<number>0</number>
25+
</property>
26+
<property name="verticalSpacing">
27+
<number>3</number>
28+
</property>
2329
<property name="margin">
2430
<number>0</number>
2531
</property>
26-
<item row="2" column="0">
32+
<item row="0" column="0">
33+
<layout class="QGridLayout" name="gridLayout_3">
34+
<property name="spacing">
35+
<number>10</number>
36+
</property>
37+
<item row="0" column="0">
38+
<widget class="QGroupBox" name="moperationListGroup">
39+
<property name="title">
40+
<string>Function List</string>
41+
</property>
42+
<property name="flat">
43+
<bool>true</bool>
44+
</property>
45+
<layout class="QGridLayout" name="gridLayout_6">
46+
<property name="margin">
47+
<number>0</number>
48+
</property>
49+
<property name="spacing">
50+
<number>0</number>
51+
</property>
52+
<item row="5" column="0">
53+
<widget class="QTreeView" name="expressionTree">
54+
<property name="frameShape">
55+
<enum>QFrame::StyledPanel</enum>
56+
</property>
57+
<property name="frameShadow">
58+
<enum>QFrame::Sunken</enum>
59+
</property>
60+
<property name="editTriggers">
61+
<set>QAbstractItemView::NoEditTriggers</set>
62+
</property>
63+
<property name="uniformRowHeights">
64+
<bool>false</bool>
65+
</property>
66+
<property name="sortingEnabled">
67+
<bool>false</bool>
68+
</property>
69+
<property name="animated">
70+
<bool>true</bool>
71+
</property>
72+
<attribute name="headerVisible">
73+
<bool>false</bool>
74+
</attribute>
75+
</widget>
76+
</item>
77+
<item row="2" column="0">
78+
<layout class="QHBoxLayout" name="horizontalLayout">
79+
<property name="spacing">
80+
<number>0</number>
81+
</property>
82+
<property name="topMargin">
83+
<number>2</number>
84+
</property>
85+
<property name="bottomMargin">
86+
<number>2</number>
87+
</property>
88+
<item>
89+
<widget class="QLabel" name="label">
90+
<property name="enabled">
91+
<bool>true</bool>
92+
</property>
93+
<property name="text">
94+
<string>Search</string>
95+
</property>
96+
<property name="scaledContents">
97+
<bool>false</bool>
98+
</property>
99+
</widget>
100+
</item>
101+
<item>
102+
<widget class="QLineEdit" name="txtSearchEdit">
103+
<property name="enabled">
104+
<bool>true</bool>
105+
</property>
106+
</widget>
107+
</item>
108+
</layout>
109+
</item>
110+
</layout>
111+
</widget>
112+
</item>
113+
<item row="0" column="1">
114+
<layout class="QVBoxLayout" name="verticalLayout_2">
115+
<property name="spacing">
116+
<number>0</number>
117+
</property>
118+
<property name="sizeConstraint">
119+
<enum>QLayout::SetDefaultConstraint</enum>
120+
</property>
121+
<property name="topMargin">
122+
<number>0</number>
123+
</property>
124+
<property name="rightMargin">
125+
<number>0</number>
126+
</property>
127+
<item>
128+
<widget class="QGroupBox" name="mFunctionHelGroup">
129+
<property name="title">
130+
<string>Selected Function Help</string>
131+
</property>
132+
<property name="flat">
133+
<bool>true</bool>
134+
</property>
135+
<layout class="QGridLayout" name="gridLayout_5">
136+
<property name="leftMargin">
137+
<number>0</number>
138+
</property>
139+
<property name="topMargin">
140+
<number>3</number>
141+
</property>
142+
<property name="rightMargin">
143+
<number>0</number>
144+
</property>
145+
<property name="bottomMargin">
146+
<number>0</number>
147+
</property>
148+
<property name="spacing">
149+
<number>0</number>
150+
</property>
151+
<item row="0" column="0">
152+
<widget class="QScrollArea" name="scrollArea">
153+
<property name="maximumSize">
154+
<size>
155+
<width>16777215</width>
156+
<height>16777215</height>
157+
</size>
158+
</property>
159+
<property name="frameShape">
160+
<enum>QFrame::NoFrame</enum>
161+
</property>
162+
<property name="widgetResizable">
163+
<bool>true</bool>
164+
</property>
165+
<widget class="QWidget" name="scrollAreaWidgetContents">
166+
<property name="geometry">
167+
<rect>
168+
<x>0</x>
169+
<y>0</y>
170+
<width>270</width>
171+
<height>137</height>
172+
</rect>
173+
</property>
174+
<layout class="QGridLayout" name="gridLayout_4">
175+
<property name="margin">
176+
<number>3</number>
177+
</property>
178+
<property name="spacing">
179+
<number>0</number>
180+
</property>
181+
<item row="0" column="0">
182+
<widget class="QLabel" name="txtHelpText">
183+
<property name="sizePolicy">
184+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
185+
<horstretch>0</horstretch>
186+
<verstretch>0</verstretch>
187+
</sizepolicy>
188+
</property>
189+
<property name="text">
190+
<string/>
191+
</property>
192+
<property name="textFormat">
193+
<enum>Qt::AutoText</enum>
194+
</property>
195+
<property name="alignment">
196+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
197+
</property>
198+
<property name="wordWrap">
199+
<bool>true</bool>
200+
</property>
201+
<property name="openExternalLinks">
202+
<bool>false</bool>
203+
</property>
204+
<property name="textInteractionFlags">
205+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
206+
</property>
207+
</widget>
208+
</item>
209+
</layout>
210+
</widget>
211+
</widget>
212+
</item>
213+
</layout>
214+
</widget>
215+
</item>
216+
<item>
217+
<widget class="QGroupBox" name="groupBox_2">
218+
<property name="title">
219+
<string>Field Values</string>
220+
</property>
221+
<property name="flat">
222+
<bool>true</bool>
223+
</property>
224+
<layout class="QGridLayout" name="gridLayout_7">
225+
<property name="leftMargin">
226+
<number>0</number>
227+
</property>
228+
<property name="topMargin">
229+
<number>3</number>
230+
</property>
231+
<property name="rightMargin">
232+
<number>0</number>
233+
</property>
234+
<property name="bottomMargin">
235+
<number>0</number>
236+
</property>
237+
<property name="spacing">
238+
<number>0</number>
239+
</property>
240+
<item row="0" column="0">
241+
<widget class="QListWidget" name="mValueListWidget">
242+
<property name="sizePolicy">
243+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
244+
<horstretch>0</horstretch>
245+
<verstretch>0</verstretch>
246+
</sizepolicy>
247+
</property>
248+
<property name="maximumSize">
249+
<size>
250+
<width>16777215</width>
251+
<height>16777215</height>
252+
</size>
253+
</property>
254+
<property name="autoFillBackground">
255+
<bool>false</bool>
256+
</property>
257+
<property name="editTriggers">
258+
<set>QAbstractItemView::NoEditTriggers</set>
259+
</property>
260+
<property name="showDropIndicator" stdset="0">
261+
<bool>false</bool>
262+
</property>
263+
<property name="alternatingRowColors">
264+
<bool>true</bool>
265+
</property>
266+
<property name="viewMode">
267+
<enum>QListView::ListMode</enum>
268+
</property>
269+
</widget>
270+
</item>
271+
</layout>
272+
</widget>
273+
</item>
274+
</layout>
275+
</item>
276+
</layout>
277+
</item>
278+
<item row="1" column="0">
27279
<widget class="QGroupBox" name="mOperatorsGroupBox">
28280
<property name="sizePolicy">
29281
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -67,6 +319,9 @@
67319
<property name="alignment">
68320
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
69321
</property>
322+
<property name="flat">
323+
<bool>true</bool>
324+
</property>
70325
<layout class="QHBoxLayout" name="horizontalLayout_2">
71326
<property name="spacing">
72327
<number>2</number>
@@ -87,7 +342,7 @@
87342
<widget class="QPushButton" name="btnPlusPushButton">
88343
<property name="sizePolicy">
89344
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
90-
<horstretch>12</horstretch>
345+
<horstretch>0</horstretch>
91346
<verstretch>0</verstretch>
92347
</sizepolicy>
93348
</property>
@@ -160,7 +415,7 @@
160415
</layout>
161416
</widget>
162417
</item>
163-
<item row="3" column="0">
418+
<item row="2" column="0">
164419
<widget class="QGroupBox" name="groupBox">
165420
<property name="sizePolicy">
166421
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -189,302 +444,142 @@
189444
<property name="title">
190445
<string>Expression</string>
191446
</property>
447+
<property name="flat">
448+
<bool>true</bool>
449+
</property>
192450
<layout class="QGridLayout" name="gridLayout_2">
193-
<property name="leftMargin">
451+
<property name="margin">
194452
<number>0</number>
195453
</property>
196-
<property name="topMargin">
197-
<number>4</number>
198-
</property>
199-
<property name="rightMargin">
200-
<number>0</number>
201-
</property>
202-
<property name="bottomMargin">
203-
<number>0</number>
454+
<property name="spacing">
455+
<number>3</number>
204456
</property>
205-
<item row="0" column="0">
457+
<item row="2" column="0">
206458
<widget class="QTextEdit" name="txtExpressionString">
207459
<property name="minimumSize">
208460
<size>
209461
<width>0</width>
210462
<height>32</height>
211463
</size>
212464
</property>
465+
<property name="cursor" stdset="0">
466+
<cursorShape>IBeamCursor</cursorShape>
467+
</property>
213468
</widget>
214469
</item>
215-
<item row="1" column="0">
216-
<layout class="QHBoxLayout" name="horizontalLayout_3">
470+
<item row="2" column="1">
471+
<layout class="QVBoxLayout" name="verticalLayout">
217472
<property name="spacing">
218473
<number>3</number>
219474
</property>
220-
<property name="topMargin">
221-
<number>0</number>
222-
</property>
223475
<item>
224-
<widget class="QLabel" name="label_2">
225-
<property name="sizePolicy">
226-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
227-
<horstretch>0</horstretch>
228-
<verstretch>0</verstretch>
229-
</sizepolicy>
230-
</property>
231-
<property name="toolTip">
232-
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
233-
</property>
476+
<widget class="QPushButton" name="btnOpen">
234477
<property name="text">
235-
<string>Output preview: </string>
478+
<string/>
479+
</property>
480+
<property name="icon">
481+
<iconset>
482+
<normaloff>../../images/themes/gis/mActionFileOpen.png</normaloff>../../images/themes/gis/mActionFileOpen.png</iconset>
236483
</property>
237484
</widget>
238485
</item>
239486
<item>
240-
<widget class="QLabel" name="lblPreview">
241-
<property name="font">
242-
<font>
243-
<weight>50</weight>
244-
<italic>true</italic>
245-
<bold>false</bold>
246-
<underline>false</underline>
247-
</font>
248-
</property>
249-
<property name="toolTip">
250-
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
251-
</property>
252-
<property name="frameShape">
253-
<enum>QFrame::StyledPanel</enum>
254-
</property>
255-
<property name="frameShadow">
256-
<enum>QFrame::Sunken</enum>
257-
</property>
258-
<property name="lineWidth">
259-
<number>0</number>
260-
</property>
261-
<property name="midLineWidth">
262-
<number>0</number>
263-
</property>
487+
<widget class="QPushButton" name="btnSave">
264488
<property name="text">
265489
<string/>
266490
</property>
491+
<property name="icon">
492+
<iconset>
493+
<normaloff>../../images/themes/gis/mActionFileSave.png</normaloff>../../images/themes/gis/mActionFileSave.png</iconset>
494+
</property>
267495
</widget>
268496
</item>
497+
<item>
498+
<spacer name="verticalSpacer">
499+
<property name="orientation">
500+
<enum>Qt::Vertical</enum>
501+
</property>
502+
<property name="sizeHint" stdset="0">
503+
<size>
504+
<width>20</width>
505+
<height>40</height>
506+
</size>
507+
</property>
508+
</spacer>
509+
</item>
269510
</layout>
270511
</item>
271512
</layout>
272513
</widget>
273514
</item>
274-
<item row="1" column="0">
275-
<layout class="QGridLayout" name="gridLayout_3">
276-
<item row="0" column="0">
277-
<widget class="QGroupBox" name="moperationListGroup">
278-
<property name="title">
279-
<string>Function List</string>
515+
<item row="3" column="0">
516+
<layout class="QHBoxLayout" name="horizontalLayout_3">
517+
<property name="spacing">
518+
<number>3</number>
519+
</property>
520+
<property name="topMargin">
521+
<number>0</number>
522+
</property>
523+
<item>
524+
<widget class="QLabel" name="label_2">
525+
<property name="sizePolicy">
526+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
527+
<horstretch>0</horstretch>
528+
<verstretch>0</verstretch>
529+
</sizepolicy>
280530
</property>
281-
<property name="flat">
282-
<bool>true</bool>
531+
<property name="toolTip">
532+
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
533+
</property>
534+
<property name="text">
535+
<string>Output preview: </string>
283536
</property>
284-
<layout class="QGridLayout" name="gridLayout_6">
285-
<property name="margin">
286-
<number>0</number>
287-
</property>
288-
<property name="spacing">
289-
<number>0</number>
290-
</property>
291-
<item row="5" column="0">
292-
<widget class="QTreeView" name="expressionTree">
293-
<property name="frameShape">
294-
<enum>QFrame::StyledPanel</enum>
295-
</property>
296-
<property name="frameShadow">
297-
<enum>QFrame::Sunken</enum>
298-
</property>
299-
<property name="editTriggers">
300-
<set>QAbstractItemView::NoEditTriggers</set>
301-
</property>
302-
<property name="uniformRowHeights">
303-
<bool>false</bool>
304-
</property>
305-
<property name="sortingEnabled">
306-
<bool>false</bool>
307-
</property>
308-
<property name="animated">
309-
<bool>true</bool>
310-
</property>
311-
<attribute name="headerVisible">
312-
<bool>false</bool>
313-
</attribute>
314-
</widget>
315-
</item>
316-
<item row="2" column="0">
317-
<layout class="QHBoxLayout" name="horizontalLayout">
318-
<property name="spacing">
319-
<number>0</number>
320-
</property>
321-
<property name="topMargin">
322-
<number>2</number>
323-
</property>
324-
<property name="bottomMargin">
325-
<number>2</number>
326-
</property>
327-
<item>
328-
<widget class="QLabel" name="label">
329-
<property name="enabled">
330-
<bool>true</bool>
331-
</property>
332-
<property name="text">
333-
<string>Search</string>
334-
</property>
335-
<property name="scaledContents">
336-
<bool>false</bool>
337-
</property>
338-
</widget>
339-
</item>
340-
<item>
341-
<widget class="QLineEdit" name="txtSearchEdit">
342-
<property name="enabled">
343-
<bool>true</bool>
344-
</property>
345-
</widget>
346-
</item>
347-
</layout>
348-
</item>
349-
</layout>
350537
</widget>
351538
</item>
352-
<item row="0" column="1">
353-
<layout class="QVBoxLayout" name="verticalLayout_2">
354-
<property name="spacing">
355-
<number>0</number>
539+
<item>
540+
<widget class="QLabel" name="lblPreview">
541+
<property name="sizePolicy">
542+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
543+
<horstretch>0</horstretch>
544+
<verstretch>0</verstretch>
545+
</sizepolicy>
356546
</property>
357-
<property name="sizeConstraint">
358-
<enum>QLayout::SetDefaultConstraint</enum>
547+
<property name="font">
548+
<font>
549+
<weight>50</weight>
550+
<italic>true</italic>
551+
<bold>false</bold>
552+
<underline>false</underline>
553+
</font>
359554
</property>
360-
<property name="topMargin">
555+
<property name="toolTip">
556+
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
557+
</property>
558+
<property name="frameShape">
559+
<enum>QFrame::StyledPanel</enum>
560+
</property>
561+
<property name="frameShadow">
562+
<enum>QFrame::Sunken</enum>
563+
</property>
564+
<property name="lineWidth">
361565
<number>0</number>
362566
</property>
363-
<property name="rightMargin">
567+
<property name="midLineWidth">
364568
<number>0</number>
365569
</property>
366-
<item>
367-
<widget class="QLabel" name="mValueListLabel">
368-
<property name="text">
369-
<string>Field Values</string>
370-
</property>
371-
</widget>
372-
</item>
373-
<item>
374-
<widget class="QListWidget" name="mValueListWidget">
375-
<property name="sizePolicy">
376-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
377-
<horstretch>0</horstretch>
378-
<verstretch>0</verstretch>
379-
</sizepolicy>
380-
</property>
381-
<property name="maximumSize">
382-
<size>
383-
<width>16777215</width>
384-
<height>16777215</height>
385-
</size>
386-
</property>
387-
<property name="autoFillBackground">
388-
<bool>false</bool>
389-
</property>
390-
<property name="editTriggers">
391-
<set>QAbstractItemView::NoEditTriggers</set>
392-
</property>
393-
<property name="showDropIndicator" stdset="0">
394-
<bool>false</bool>
395-
</property>
396-
<property name="alternatingRowColors">
397-
<bool>true</bool>
398-
</property>
399-
<property name="viewMode">
400-
<enum>QListView::ListMode</enum>
401-
</property>
402-
</widget>
403-
</item>
404-
<item>
405-
<widget class="QGroupBox" name="mFunctionHelGroup">
406-
<property name="title">
407-
<string>Function Help</string>
408-
</property>
409-
<property name="flat">
410-
<bool>true</bool>
411-
</property>
412-
<layout class="QGridLayout" name="gridLayout_5">
413-
<property name="leftMargin">
414-
<number>0</number>
415-
</property>
416-
<property name="topMargin">
417-
<number>3</number>
418-
</property>
419-
<property name="rightMargin">
420-
<number>0</number>
421-
</property>
422-
<property name="bottomMargin">
423-
<number>0</number>
424-
</property>
425-
<property name="spacing">
426-
<number>0</number>
427-
</property>
428-
<item row="0" column="0">
429-
<widget class="QScrollArea" name="scrollArea">
430-
<property name="maximumSize">
431-
<size>
432-
<width>16777215</width>
433-
<height>16777215</height>
434-
</size>
435-
</property>
436-
<property name="frameShape">
437-
<enum>QFrame::NoFrame</enum>
438-
</property>
439-
<property name="widgetResizable">
440-
<bool>true</bool>
441-
</property>
442-
<widget class="QWidget" name="scrollAreaWidgetContents">
443-
<property name="geometry">
444-
<rect>
445-
<x>0</x>
446-
<y>0</y>
447-
<width>287</width>
448-
<height>138</height>
449-
</rect>
450-
</property>
451-
<layout class="QGridLayout" name="gridLayout_4">
452-
<property name="margin">
453-
<number>3</number>
454-
</property>
455-
<property name="spacing">
456-
<number>0</number>
457-
</property>
458-
<item row="0" column="0">
459-
<widget class="QLabel" name="txtHelpText">
460-
<property name="sizePolicy">
461-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
462-
<horstretch>0</horstretch>
463-
<verstretch>0</verstretch>
464-
</sizepolicy>
465-
</property>
466-
<property name="text">
467-
<string/>
468-
</property>
469-
<property name="textFormat">
470-
<enum>Qt::AutoText</enum>
471-
</property>
472-
<property name="alignment">
473-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
474-
</property>
475-
<property name="wordWrap">
476-
<bool>true</bool>
477-
</property>
478-
</widget>
479-
</item>
480-
</layout>
481-
</widget>
482-
</widget>
483-
</item>
484-
</layout>
485-
</widget>
486-
</item>
487-
</layout>
570+
<property name="text">
571+
<string/>
572+
</property>
573+
<property name="scaledContents">
574+
<bool>false</bool>
575+
</property>
576+
<property name="wordWrap">
577+
<bool>false</bool>
578+
</property>
579+
<property name="textInteractionFlags">
580+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
581+
</property>
582+
</widget>
488583
</item>
489584
</layout>
490585
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.