Skip to content

Commit 35f5da7

Browse files
brushtylerbrushtyler
committedJan 11, 2012
make "action" tab less confusing (partially fix #4211):
display add and update buttons below the edit action widget (following the "new shapefile" UI style) move the "capture output" checkbox away from the "insert field" combo
·
ltr-3_40Before-merge-new_vector_api
1 parent 764e85b commit 35f5da7

File tree

1 file changed

+127
-72
lines changed

1 file changed

+127
-72
lines changed
 

‎src/ui/qgsattributeactiondialogbase.ui

Lines changed: 127 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>695</width>
10-
<height>449</height>
10+
<height>476</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -20,16 +20,13 @@
2020
<string>Attribute Actions</string>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_2">
23-
<property name="margin">
24-
<number>0</number>
25-
</property>
2623
<item row="0" column="0">
2724
<widget class="QGroupBox" name="groupBox_2">
2825
<property name="title">
2926
<string>Action list</string>
3027
</property>
3128
<layout class="QGridLayout" name="gridLayout_3">
32-
<item row="0" column="0" colspan="5">
29+
<item row="0" column="0" colspan="4">
3330
<widget class="QTableWidget" name="attributeActionTable">
3431
<property name="sizePolicy">
3532
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -38,7 +35,7 @@
3835
</sizepolicy>
3936
</property>
4037
<property name="whatsThis">
41-
<string>This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Insert action button. Actions can be edited here by double clicking on the item.</string>
38+
<string>This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Add to action list button. Actions can be edited here by double clicking on the item.</string>
4239
</property>
4340
<property name="selectionMode">
4441
<enum>QAbstractItemView::SingleSelection</enum>
@@ -71,27 +68,17 @@
7168
</column>
7269
</widget>
7370
</item>
74-
<item row="1" column="0">
75-
<widget class="QPushButton" name="insertButton">
76-
<property name="toolTip">
77-
<string>Inserts the action into the list above</string>
78-
</property>
79-
<property name="text">
80-
<string>Insert action</string>
81-
</property>
82-
</widget>
83-
</item>
84-
<item row="1" column="1">
85-
<widget class="QPushButton" name="updateButton">
71+
<item row="1" column="3">
72+
<widget class="QPushButton" name="removeButton">
8673
<property name="toolTip">
87-
<string>Update the selected action</string>
74+
<string>Remove the selected action</string>
8875
</property>
8976
<property name="text">
90-
<string>Update action</string>
77+
<string>Remove action</string>
9178
</property>
9279
</widget>
9380
</item>
94-
<item row="1" column="2">
81+
<item row="1" column="0">
9582
<widget class="QPushButton" name="moveUpButton">
9683
<property name="toolTip">
9784
<string>Move the selected action up</string>
@@ -101,7 +88,7 @@
10188
</property>
10289
</widget>
10390
</item>
104-
<item row="1" column="3">
91+
<item row="1" column="1">
10592
<widget class="QPushButton" name="moveDownButton">
10693
<property name="toolTip">
10794
<string>Move the selected action down</string>
@@ -111,16 +98,6 @@
11198
</property>
11299
</widget>
113100
</item>
114-
<item row="1" column="4">
115-
<widget class="QPushButton" name="removeButton">
116-
<property name="toolTip">
117-
<string>Remove the selected action</string>
118-
</property>
119-
<property name="text">
120-
<string>Remove</string>
121-
</property>
122-
</widget>
123-
</item>
124101
</layout>
125102
</widget>
126103
</item>
@@ -130,6 +107,84 @@
130107
<string>Action properties</string>
131108
</property>
132109
<layout class="QGridLayout" name="gridLayout">
110+
<item row="0" column="0">
111+
<widget class="QLabel" name="label">
112+
<property name="text">
113+
<string>Type</string>
114+
</property>
115+
<property name="buddy">
116+
<cstring>actionType</cstring>
117+
</property>
118+
</widget>
119+
</item>
120+
<item row="0" column="1">
121+
<layout class="QHBoxLayout" name="horizontalLayout_4">
122+
<item>
123+
<widget class="QComboBox" name="actionType">
124+
<property name="sizePolicy">
125+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
126+
<horstretch>0</horstretch>
127+
<verstretch>0</verstretch>
128+
</sizepolicy>
129+
</property>
130+
<item>
131+
<property name="text">
132+
<string>Generic</string>
133+
</property>
134+
</item>
135+
<item>
136+
<property name="text">
137+
<string>Python</string>
138+
</property>
139+
</item>
140+
<item>
141+
<property name="text">
142+
<string>Mac</string>
143+
</property>
144+
</item>
145+
<item>
146+
<property name="text">
147+
<string>Windows</string>
148+
</property>
149+
</item>
150+
<item>
151+
<property name="text">
152+
<string>Unix</string>
153+
</property>
154+
</item>
155+
</widget>
156+
</item>
157+
<item>
158+
<spacer name="horizontalSpacer_3">
159+
<property name="orientation">
160+
<enum>Qt::Horizontal</enum>
161+
</property>
162+
<property name="sizeType">
163+
<enum>QSizePolicy::Fixed</enum>
164+
</property>
165+
<property name="sizeHint" stdset="0">
166+
<size>
167+
<width>37</width>
168+
<height>24</height>
169+
</size>
170+
</property>
171+
</spacer>
172+
</item>
173+
<item>
174+
<widget class="QCheckBox" name="captureCB">
175+
<property name="toolTip">
176+
<string>Captures any output from the action</string>
177+
</property>
178+
<property name="whatsThis">
179+
<string>Captures the standard output or error generated by the action and displays it in a dialog box</string>
180+
</property>
181+
<property name="text">
182+
<string>Capture output</string>
183+
</property>
184+
</widget>
185+
</item>
186+
</layout>
187+
</item>
133188
<item row="1" column="0">
134189
<widget class="QLabel" name="textLabel1">
135190
<property name="whatsThis">
@@ -196,19 +251,6 @@
196251
</item>
197252
</layout>
198253
</item>
199-
<item row="3" column="0">
200-
<widget class="QCheckBox" name="captureCB">
201-
<property name="toolTip">
202-
<string>Captures any output from the action</string>
203-
</property>
204-
<property name="whatsThis">
205-
<string>Captures the standard output or error generated by the action and displays it in a dialog box</string>
206-
</property>
207-
<property name="text">
208-
<string>Capture output</string>
209-
</property>
210-
</widget>
211-
</item>
212254
<item row="3" column="1">
213255
<layout class="QHBoxLayout" name="horizontalLayout_2">
214256
<item>
@@ -220,8 +262,14 @@
220262
</item>
221263
<item>
222264
<widget class="QPushButton" name="insertFieldButton">
265+
<property name="sizePolicy">
266+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
267+
<horstretch>0</horstretch>
268+
<verstretch>0</verstretch>
269+
</sizepolicy>
270+
</property>
223271
<property name="toolTip">
224-
<string>Inserts the selected field into the action, prepended with a %</string>
272+
<string>Inserts the selected field into the action</string>
225273
</property>
226274
<property name="text">
227275
<string>Insert field</string>
@@ -230,34 +278,45 @@
230278
</item>
231279
</layout>
232280
</item>
233-
<item row="0" column="1">
234-
<widget class="QComboBox" name="actionType">
235-
<item>
236-
<property name="text">
237-
<string>Generic</string>
238-
</property>
239-
</item>
240-
<item>
241-
<property name="text">
242-
<string>Python</string>
243-
</property>
244-
</item>
281+
<item row="4" column="0" colspan="2">
282+
<layout class="QHBoxLayout" name="horizontalLayout_3">
245283
<item>
246-
<property name="text">
247-
<string>Mac</string>
248-
</property>
284+
<spacer name="horizontalSpacer">
285+
<property name="orientation">
286+
<enum>Qt::Horizontal</enum>
287+
</property>
288+
<property name="sizeType">
289+
<enum>QSizePolicy::Expanding</enum>
290+
</property>
291+
<property name="sizeHint" stdset="0">
292+
<size>
293+
<width>40</width>
294+
<height>20</height>
295+
</size>
296+
</property>
297+
</spacer>
249298
</item>
250299
<item>
251-
<property name="text">
252-
<string>Windows</string>
253-
</property>
300+
<widget class="QPushButton" name="insertButton">
301+
<property name="toolTip">
302+
<string>Inserts the action into the list above</string>
303+
</property>
304+
<property name="text">
305+
<string>Add to action list</string>
306+
</property>
307+
</widget>
254308
</item>
255309
<item>
256-
<property name="text">
257-
<string>Unix</string>
258-
</property>
310+
<widget class="QPushButton" name="updateButton">
311+
<property name="toolTip">
312+
<string>Update the selected action</string>
313+
</property>
314+
<property name="text">
315+
<string>Update selected action</string>
316+
</property>
317+
</widget>
259318
</item>
260-
</widget>
319+
</layout>
261320
</item>
262321
<item row="0" column="0">
263322
<widget class="QLabel" name="label">
@@ -277,10 +336,6 @@
277336
<layoutdefault spacing="6" margin="11"/>
278337
<tabstops>
279338
<tabstop>attributeActionTable</tabstop>
280-
<tabstop>insertButton</tabstop>
281-
<tabstop>updateButton</tabstop>
282-
<tabstop>moveUpButton</tabstop>
283-
<tabstop>moveDownButton</tabstop>
284339
<tabstop>removeButton</tabstop>
285340
<tabstop>actionType</tabstop>
286341
<tabstop>actionName</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.