Skip to content

Commit a53bf7e

Browse files
NathanW2NathanW2
committedSep 14, 2014
Move identify toolbar to top to match other docks with toolbars
·
ltr-3_40archive/master_2
1 parent 6a309f5 commit a53bf7e

File tree

1 file changed

+247
-217
lines changed

1 file changed

+247
-217
lines changed
 

‎src/ui/qgsidentifyresultsbase.ui

Lines changed: 247 additions & 217 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,167 @@
1717
<property name="spacing">
1818
<number>0</number>
1919
</property>
20-
<property name="margin">
20+
<property name="leftMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="topMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="bottomMargin">
2130
<number>0</number>
2231
</property>
23-
<item>
24-
<layout class="QHBoxLayout" name="horizontalLayout_3">
25-
<item>
26-
<widget class="QLabel" name="lblViewMode">
27-
<property name="toolTip">
28-
<string>Select view mode for raster layers</string>
29-
</property>
30-
<property name="text">
31-
<string>View</string>
32-
</property>
33-
</widget>
34-
</item>
35-
<item>
36-
<widget class="QComboBox" name="cmbViewMode"/>
37-
</item>
38-
<item>
39-
<spacer name="horizontalSpacer_2">
40-
<property name="orientation">
41-
<enum>Qt::Horizontal</enum>
42-
</property>
43-
<property name="sizeHint" stdset="0">
44-
<size>
45-
<width>58</width>
46-
<height>38</height>
47-
</size>
48-
</property>
49-
</spacer>
50-
</item>
51-
</layout>
52-
</item>
5332
<item>
5433
<widget class="QStackedWidget" name="stackedWidget">
34+
<property name="currentIndex">
35+
<number>0</number>
36+
</property>
5537
<widget class="QWidget" name="stackedWidgetPage1">
5638
<layout class="QVBoxLayout" name="verticalLayout">
5739
<property name="spacing">
5840
<number>0</number>
5941
</property>
60-
<property name="margin">
42+
<property name="leftMargin">
43+
<number>0</number>
44+
</property>
45+
<property name="topMargin">
46+
<number>0</number>
47+
</property>
48+
<property name="rightMargin">
49+
<number>0</number>
50+
</property>
51+
<property name="bottomMargin">
6152
<number>0</number>
6253
</property>
54+
<item>
55+
<layout class="QHBoxLayout" name="horizontalLayout">
56+
<item>
57+
<widget class="QToolButton" name="mExpandToolButton">
58+
<property name="toolTip">
59+
<string>Expand tree.</string>
60+
</property>
61+
<property name="text">
62+
<string>...</string>
63+
</property>
64+
<property name="icon">
65+
<iconset>
66+
<normaloff>../../images/themes/default/mActionExpandTree.png</normaloff>../../images/themes/default/mActionExpandTree.png</iconset>
67+
</property>
68+
</widget>
69+
</item>
70+
<item>
71+
<widget class="QToolButton" name="mCollapseToolButton">
72+
<property name="toolTip">
73+
<string>Collapse tree.</string>
74+
</property>
75+
<property name="text">
76+
<string>...</string>
77+
</property>
78+
<property name="icon">
79+
<iconset>
80+
<normaloff>../../images/themes/default/mActionCollapseTree.png</normaloff>../../images/themes/default/mActionCollapseTree.png</iconset>
81+
</property>
82+
</widget>
83+
</item>
84+
<item>
85+
<widget class="QToolButton" name="mExpandNewToolButton">
86+
<property name="toolTip">
87+
<string>New results will be expanded by default.</string>
88+
</property>
89+
<property name="text">
90+
<string>...</string>
91+
</property>
92+
<property name="icon">
93+
<iconset>
94+
<normaloff>../../images/themes/default/mActionExpandNewTree.png</normaloff>../../images/themes/default/mActionExpandNewTree.png</iconset>
95+
</property>
96+
<property name="checkable">
97+
<bool>true</bool>
98+
</property>
99+
</widget>
100+
</item>
101+
<item>
102+
<widget class="QToolButton" name="mOpenFormButton">
103+
<property name="text">
104+
<string>...</string>
105+
</property>
106+
<property name="icon">
107+
<iconset resource="../../images/images.qrc">
108+
<normaloff>:/images/themes/default/mActionPropertyItem.png</normaloff>:/images/themes/default/mActionPropertyItem.png</iconset>
109+
</property>
110+
</widget>
111+
</item>
112+
<item>
113+
<widget class="QToolButton" name="mClearToolButton">
114+
<property name="toolTip">
115+
<string>Clear Results</string>
116+
</property>
117+
<property name="text">
118+
<string>...</string>
119+
</property>
120+
<property name="icon">
121+
<iconset resource="../../images/images.qrc">
122+
<normaloff>:/images/themes/default/mActionDeselectAll.svg</normaloff>:/images/themes/default/mActionDeselectAll.svg</iconset>
123+
</property>
124+
<property name="checkable">
125+
<bool>false</bool>
126+
</property>
127+
</widget>
128+
</item>
129+
<item>
130+
<widget class="QToolButton" name="mCopyToolButton">
131+
<property name="toolTip">
132+
<string>Copy selected feature to clipboard.</string>
133+
</property>
134+
<property name="text">
135+
<string>...</string>
136+
</property>
137+
<property name="icon">
138+
<iconset resource="../../images/images.qrc">
139+
<normaloff>:/images/themes/default/mActionEditCopy.png</normaloff>:/images/themes/default/mActionEditCopy.png</iconset>
140+
</property>
141+
<property name="checkable">
142+
<bool>false</bool>
143+
</property>
144+
</widget>
145+
</item>
146+
<item>
147+
<widget class="QToolButton" name="mPrintToolButton">
148+
<property name="enabled">
149+
<bool>true</bool>
150+
</property>
151+
<property name="toolTip">
152+
<string>Print selected HTML response.</string>
153+
</property>
154+
<property name="text">
155+
<string>...</string>
156+
</property>
157+
<property name="icon">
158+
<iconset>
159+
<normaloff>../../images/themes/default/mActionFilePrint.png</normaloff>../../images/themes/default/mActionFilePrint.png</iconset>
160+
</property>
161+
<property name="checkable">
162+
<bool>false</bool>
163+
</property>
164+
</widget>
165+
</item>
166+
<item>
167+
<spacer name="horizontalSpacer">
168+
<property name="orientation">
169+
<enum>Qt::Horizontal</enum>
170+
</property>
171+
<property name="sizeHint" stdset="0">
172+
<size>
173+
<width>40</width>
174+
<height>20</height>
175+
</size>
176+
</property>
177+
</spacer>
178+
</item>
179+
</layout>
180+
</item>
63181
<item>
64182
<widget class="QTreeWidget" name="lstResults">
65183
<property name="lineWidth">
@@ -78,14 +196,110 @@
78196
</column>
79197
</widget>
80198
</item>
199+
<item>
200+
<layout class="QHBoxLayout" name="horizontalLayout_2">
201+
<item>
202+
<widget class="QLabel" name="lblIdentifyMode">
203+
<property name="toolTip">
204+
<string>Select identify mode</string>
205+
</property>
206+
<property name="text">
207+
<string>Mode</string>
208+
</property>
209+
</widget>
210+
</item>
211+
<item>
212+
<widget class="QComboBox" name="cmbIdentifyMode">
213+
<property name="sizePolicy">
214+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
215+
<horstretch>0</horstretch>
216+
<verstretch>0</verstretch>
217+
</sizepolicy>
218+
</property>
219+
</widget>
220+
</item>
221+
<item>
222+
<spacer name="horizontalSpacer_43">
223+
<property name="orientation">
224+
<enum>Qt::Horizontal</enum>
225+
</property>
226+
<property name="sizeHint" stdset="0">
227+
<size>
228+
<width>40</width>
229+
<height>20</height>
230+
</size>
231+
</property>
232+
</spacer>
233+
</item>
234+
<item>
235+
<widget class="QCheckBox" name="cbxAutoFeatureForm">
236+
<property name="text">
237+
<string>Auto open form</string>
238+
</property>
239+
</widget>
240+
</item>
241+
</layout>
242+
</item>
243+
<item>
244+
<layout class="QHBoxLayout" name="horizontalLayout_3">
245+
<item>
246+
<widget class="QLabel" name="lblViewMode">
247+
<property name="toolTip">
248+
<string>Select view mode for raster layers</string>
249+
</property>
250+
<property name="text">
251+
<string>View</string>
252+
</property>
253+
</widget>
254+
</item>
255+
<item>
256+
<widget class="QComboBox" name="cmbViewMode"/>
257+
</item>
258+
<item>
259+
<spacer name="horizontalSpacer_2">
260+
<property name="orientation">
261+
<enum>Qt::Horizontal</enum>
262+
</property>
263+
<property name="sizeHint" stdset="0">
264+
<size>
265+
<width>58</width>
266+
<height>38</height>
267+
</size>
268+
</property>
269+
</spacer>
270+
</item>
271+
<item>
272+
<widget class="QToolButton" name="mHelpToolButton">
273+
<property name="enabled">
274+
<bool>true</bool>
275+
</property>
276+
<property name="text">
277+
<string>Help</string>
278+
</property>
279+
<property name="checkable">
280+
<bool>false</bool>
281+
</property>
282+
</widget>
283+
</item>
284+
</layout>
285+
</item>
81286
</layout>
82287
</widget>
83288
<widget class="QWidget" name="stackedWidgetPage2">
84289
<layout class="QVBoxLayout" name="verticalLayout_2">
85290
<property name="spacing">
86291
<number>0</number>
87292
</property>
88-
<property name="margin">
293+
<property name="leftMargin">
294+
<number>0</number>
295+
</property>
296+
<property name="topMargin">
297+
<number>0</number>
298+
</property>
299+
<property name="rightMargin">
300+
<number>0</number>
301+
</property>
302+
<property name="bottomMargin">
89303
<number>0</number>
90304
</property>
91305
<item>
@@ -129,190 +343,6 @@
129343
</widget>
130344
</widget>
131345
</item>
132-
<item>
133-
<layout class="QHBoxLayout" name="horizontalLayout">
134-
<item>
135-
<widget class="QToolButton" name="mExpandToolButton">
136-
<property name="toolTip">
137-
<string>Expand tree.</string>
138-
</property>
139-
<property name="text">
140-
<string>...</string>
141-
</property>
142-
<property name="icon">
143-
<iconset>
144-
<normaloff>../../images/themes/default/mActionExpandTree.png</normaloff>../../images/themes/default/mActionExpandTree.png</iconset>
145-
</property>
146-
</widget>
147-
</item>
148-
<item>
149-
<widget class="QToolButton" name="mCollapseToolButton">
150-
<property name="toolTip">
151-
<string>Collapse tree.</string>
152-
</property>
153-
<property name="text">
154-
<string>...</string>
155-
</property>
156-
<property name="icon">
157-
<iconset>
158-
<normaloff>../../images/themes/default/mActionCollapseTree.png</normaloff>../../images/themes/default/mActionCollapseTree.png</iconset>
159-
</property>
160-
</widget>
161-
</item>
162-
<item>
163-
<widget class="QToolButton" name="mExpandNewToolButton">
164-
<property name="toolTip">
165-
<string>New results will be expanded by default.</string>
166-
</property>
167-
<property name="text">
168-
<string>...</string>
169-
</property>
170-
<property name="icon">
171-
<iconset>
172-
<normaloff>../../images/themes/default/mActionExpandNewTree.png</normaloff>../../images/themes/default/mActionExpandNewTree.png</iconset>
173-
</property>
174-
<property name="checkable">
175-
<bool>true</bool>
176-
</property>
177-
</widget>
178-
</item>
179-
<item>
180-
<widget class="QToolButton" name="mOpenFormButton">
181-
<property name="text">
182-
<string>...</string>
183-
</property>
184-
<property name="icon">
185-
<iconset resource="../../images/images.qrc">
186-
<normaloff>:/images/themes/default/mActionPropertyItem.png</normaloff>:/images/themes/default/mActionPropertyItem.png</iconset>
187-
</property>
188-
</widget>
189-
</item>
190-
<item>
191-
<widget class="QToolButton" name="mClearToolButton">
192-
<property name="toolTip">
193-
<string>Clear Results</string>
194-
</property>
195-
<property name="text">
196-
<string>...</string>
197-
</property>
198-
<property name="icon">
199-
<iconset resource="../../images/images.qrc">
200-
<normaloff>:/images/themes/default/mActionDeselectAll.svg</normaloff>:/images/themes/default/mActionDeselectAll.svg</iconset>
201-
</property>
202-
<property name="checkable">
203-
<bool>false</bool>
204-
</property>
205-
</widget>
206-
</item>
207-
<item>
208-
<widget class="QToolButton" name="mCopyToolButton">
209-
<property name="toolTip">
210-
<string>Copy selected feature to clipboard.</string>
211-
</property>
212-
<property name="text">
213-
<string>...</string>
214-
</property>
215-
<property name="icon">
216-
<iconset resource="../../images/images.qrc">
217-
<normaloff>:/images/themes/default/mActionEditCopy.png</normaloff>:/images/themes/default/mActionEditCopy.png</iconset>
218-
</property>
219-
<property name="checkable">
220-
<bool>false</bool>
221-
</property>
222-
</widget>
223-
</item>
224-
<item>
225-
<widget class="QToolButton" name="mPrintToolButton">
226-
<property name="enabled">
227-
<bool>true</bool>
228-
</property>
229-
<property name="toolTip">
230-
<string>Print selected HTML response.</string>
231-
</property>
232-
<property name="text">
233-
<string>...</string>
234-
</property>
235-
<property name="icon">
236-
<iconset>
237-
<normaloff>../../images/themes/default/mActionFilePrint.png</normaloff>../../images/themes/default/mActionFilePrint.png</iconset>
238-
</property>
239-
<property name="checkable">
240-
<bool>false</bool>
241-
</property>
242-
</widget>
243-
</item>
244-
<item>
245-
<spacer name="horizontalSpacer">
246-
<property name="orientation">
247-
<enum>Qt::Horizontal</enum>
248-
</property>
249-
<property name="sizeHint" stdset="0">
250-
<size>
251-
<width>40</width>
252-
<height>20</height>
253-
</size>
254-
</property>
255-
</spacer>
256-
</item>
257-
<item>
258-
<widget class="QToolButton" name="mHelpToolButton">
259-
<property name="enabled">
260-
<bool>true</bool>
261-
</property>
262-
<property name="text">
263-
<string>Help</string>
264-
</property>
265-
<property name="checkable">
266-
<bool>false</bool>
267-
</property>
268-
</widget>
269-
</item>
270-
</layout>
271-
</item>
272-
<item>
273-
<layout class="QHBoxLayout" name="horizontalLayout_2">
274-
<item>
275-
<widget class="QLabel" name="lblIdentifyMode">
276-
<property name="toolTip">
277-
<string>Select identify mode</string>
278-
</property>
279-
<property name="text">
280-
<string>Mode</string>
281-
</property>
282-
</widget>
283-
</item>
284-
<item>
285-
<widget class="QComboBox" name="cmbIdentifyMode">
286-
<property name="sizePolicy">
287-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
288-
<horstretch>0</horstretch>
289-
<verstretch>0</verstretch>
290-
</sizepolicy>
291-
</property>
292-
</widget>
293-
</item>
294-
<item>
295-
<spacer name="horizontalSpacer_43">
296-
<property name="orientation">
297-
<enum>Qt::Horizontal</enum>
298-
</property>
299-
<property name="sizeHint" stdset="0">
300-
<size>
301-
<width>40</width>
302-
<height>20</height>
303-
</size>
304-
</property>
305-
</spacer>
306-
</item>
307-
<item>
308-
<widget class="QCheckBox" name="cbxAutoFeatureForm">
309-
<property name="text">
310-
<string>Auto open form</string>
311-
</property>
312-
</widget>
313-
</item>
314-
</layout>
315-
</item>
316346
</layout>
317347
</widget>
318348
<layoutdefault spacing="6" margin="11"/>

0 commit comments

Comments
 (0)
Please sign in to comment.