Skip to content

Commit 12edcdc

Browse files
author
Hugo Mercier
committedFeb 25, 2013
Merge pull request #1 from dakcarto/atlas-ui
[Atlas] Update spacing for atlas panel
2 parents 34e6b9a + 9517c0e commit 12edcdc

File tree

1 file changed

+331
-281
lines changed

1 file changed

+331
-281
lines changed
 

‎src/ui/qgsatlascompositionwidgetbase.ui

Lines changed: 331 additions & 281 deletions
Original file line numberDiff line numberDiff line change
@@ -37,321 +37,371 @@
3737
</widget>
3838
</item>
3939
<item>
40-
<widget class="QCheckBox" name="mUseAtlasCheckBox">
41-
<property name="text">
42-
<string>Generate an atlas</string>
43-
</property>
44-
</widget>
45-
</item>
46-
<item>
47-
<widget class="QScrollArea" name="scrollArea">
48-
<property name="widgetResizable">
49-
<bool>true</bool>
40+
<widget class="QFrame" name="verticalFrame">
41+
<property name="frameShape">
42+
<enum>QFrame::StyledPanel</enum>
5043
</property>
51-
<widget class="QWidget" name="scrollAreaWidgetContents">
52-
<property name="enabled">
53-
<bool>true</bool>
44+
<layout class="QGridLayout" name="gridLayout">
45+
<property name="horizontalSpacing">
46+
<number>0</number>
47+
</property>
48+
<property name="verticalSpacing">
49+
<number>3</number>
5450
</property>
55-
<property name="geometry">
56-
<rect>
57-
<x>0</x>
58-
<y>0</y>
59-
<width>433</width>
60-
<height>551</height>
61-
</rect>
51+
<property name="margin">
52+
<number>0</number>
6253
</property>
63-
<layout class="QVBoxLayout" name="mainLayout">
64-
<item>
65-
<widget class="QgsCollapsibleGroupBoxBasic" name="mConfigurationGroup">
54+
<item row="0" column="1">
55+
<widget class="QCheckBox" name="mUseAtlasCheckBox">
56+
<property name="text">
57+
<string>Generate an atlas</string>
58+
</property>
59+
</widget>
60+
</item>
61+
<item row="0" column="2">
62+
<spacer name="horizontalSpacer">
63+
<property name="orientation">
64+
<enum>Qt::Horizontal</enum>
65+
</property>
66+
<property name="sizeHint" stdset="0">
67+
<size>
68+
<width>40</width>
69+
<height>20</height>
70+
</size>
71+
</property>
72+
</spacer>
73+
</item>
74+
<item row="0" column="0">
75+
<spacer name="horizontalSpacer_2">
76+
<property name="orientation">
77+
<enum>Qt::Horizontal</enum>
78+
</property>
79+
<property name="sizeType">
80+
<enum>QSizePolicy::Fixed</enum>
81+
</property>
82+
<property name="sizeHint" stdset="0">
83+
<size>
84+
<width>12</width>
85+
<height>20</height>
86+
</size>
87+
</property>
88+
</spacer>
89+
</item>
90+
<item row="1" column="0" colspan="3">
91+
<widget class="QScrollArea" name="scrollArea">
92+
<property name="widgetResizable">
93+
<bool>true</bool>
94+
</property>
95+
<widget class="QWidget" name="scrollAreaWidgetContents">
6696
<property name="enabled">
67-
<bool>false</bool>
68-
</property>
69-
<property name="title">
70-
<string>Configuration</string>
71-
</property>
72-
<property name="checkable">
73-
<bool>false</bool>
74-
</property>
75-
<property name="syncGroup" stdset="0">
76-
<string notr="true">composeritem</string>
77-
</property>
78-
<property name="collapsed" stdset="0">
79-
<bool>false</bool>
97+
<bool>true</bool>
8098
</property>
81-
<layout class="QFormLayout" name="formLayout_4">
82-
<property name="fieldGrowthPolicy">
83-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
84-
</property>
85-
<property name="labelAlignment">
86-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
99+
<property name="geometry">
100+
<rect>
101+
<x>0</x>
102+
<y>0</y>
103+
<width>431</width>
104+
<height>546</height>
105+
</rect>
106+
</property>
107+
<layout class="QVBoxLayout" name="mainLayout">
108+
<property name="bottomMargin">
109+
<number>0</number>
87110
</property>
88-
<item row="0" column="0">
89-
<widget class="QLabel" name="mVerticalAlignementLabel">
90-
<property name="text">
91-
<string>Composer map</string>
111+
<item>
112+
<widget class="QgsCollapsibleGroupBoxBasic" name="mConfigurationGroup">
113+
<property name="enabled">
114+
<bool>false</bool>
92115
</property>
93-
</widget>
94-
</item>
95-
<item row="0" column="1">
96-
<layout class="QHBoxLayout" name="horizontalLayout_6">
97-
<item>
98-
<widget class="QComboBox" name="mComposerMapComboBox"/>
99-
</item>
100-
</layout>
101-
</item>
102-
<item row="1" column="0">
103-
<widget class="QLabel" name="mHorizontalAlignementLabel">
104-
<property name="text">
105-
<string>Coverage layer</string>
116+
<property name="title">
117+
<string>Configuration</string>
118+
</property>
119+
<property name="checkable">
120+
<bool>false</bool>
121+
</property>
122+
<property name="syncGroup" stdset="0">
123+
<string notr="true">composeritem</string>
106124
</property>
125+
<property name="collapsed" stdset="0">
126+
<bool>false</bool>
127+
</property>
128+
<layout class="QFormLayout" name="formLayout_4">
129+
<property name="fieldGrowthPolicy">
130+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
131+
</property>
132+
<property name="labelAlignment">
133+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
134+
</property>
135+
<item row="0" column="0">
136+
<widget class="QLabel" name="mVerticalAlignementLabel">
137+
<property name="text">
138+
<string>Composer map</string>
139+
</property>
140+
</widget>
141+
</item>
142+
<item row="0" column="1">
143+
<layout class="QHBoxLayout" name="horizontalLayout_6">
144+
<item>
145+
<widget class="QComboBox" name="mComposerMapComboBox"/>
146+
</item>
147+
</layout>
148+
</item>
149+
<item row="1" column="0">
150+
<widget class="QLabel" name="mHorizontalAlignementLabel">
151+
<property name="text">
152+
<string>Coverage layer</string>
153+
</property>
154+
</widget>
155+
</item>
156+
<item row="1" column="1">
157+
<layout class="QHBoxLayout" name="horizontalLayout_5">
158+
<item>
159+
<widget class="QComboBox" name="mAtlasCoverageLayerComboBox"/>
160+
</item>
161+
</layout>
162+
</item>
163+
</layout>
107164
</widget>
108165
</item>
109-
<item row="1" column="1">
110-
<layout class="QHBoxLayout" name="horizontalLayout_5">
111-
<item>
112-
<widget class="QComboBox" name="mAtlasCoverageLayerComboBox"/>
113-
</item>
114-
</layout>
115-
</item>
116-
</layout>
117-
</widget>
118-
</item>
119-
<item>
120-
<widget class="QgsCollapsibleGroupBoxBasic" name="mVisibilityGroup">
121-
<property name="enabled">
122-
<bool>false</bool>
123-
</property>
124-
<property name="title">
125-
<string>Visibility</string>
126-
</property>
127-
<property name="checkable">
128-
<bool>false</bool>
129-
</property>
130-
<property name="syncGroup" stdset="0">
131-
<string notr="true">composeritem</string>
132-
</property>
133-
<property name="collapsed" stdset="0">
134-
<bool>false</bool>
135-
</property>
136-
<layout class="QVBoxLayout" name="verticalLayout_2">
137166
<item>
138-
<widget class="QCheckBox" name="mAtlasHideCoverageCheckBox">
139-
<property name="text">
140-
<string>Hidden coverage layer</string>
167+
<widget class="QgsCollapsibleGroupBoxBasic" name="mVisibilityGroup">
168+
<property name="enabled">
169+
<bool>false</bool>
141170
</property>
142-
</widget>
143-
</item>
144-
</layout>
145-
</widget>
146-
</item>
147-
<item>
148-
<widget class="QgsCollapsibleGroupBoxBasic" name="mSortingGroup">
149-
<property name="enabled">
150-
<bool>false</bool>
151-
</property>
152-
<property name="title">
153-
<string>Feature sorting</string>
154-
</property>
155-
<property name="checkable">
156-
<bool>false</bool>
157-
</property>
158-
<property name="syncGroup" stdset="0">
159-
<string notr="true">composeritem</string>
160-
</property>
161-
<property name="collapsed" stdset="0">
162-
<bool>true</bool>
163-
</property>
164-
<layout class="QFormLayout" name="formLayout">
165-
<property name="fieldGrowthPolicy">
166-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
167-
</property>
168-
<item row="0" column="0">
169-
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
170-
<property name="text">
171-
<string>Sort by</string>
171+
<property name="title">
172+
<string>Visibility</string>
172173
</property>
173-
</widget>
174-
</item>
175-
<item row="0" column="1">
176-
<layout class="QHBoxLayout" name="horizontalLayout">
177-
<item>
178-
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
179-
</item>
180-
<item>
181-
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
182-
<property name="toolTip">
183-
<string>Sort direction</string>
184-
</property>
185-
<property name="text">
186-
<string>...</string>
187-
</property>
188-
<property name="arrowType">
189-
<enum>Qt::UpArrow</enum>
190-
</property>
191-
</widget>
192-
</item>
193-
</layout>
194-
</item>
195-
</layout>
196-
</widget>
197-
</item>
198-
<item>
199-
<widget class="QgsCollapsibleGroupBoxBasic" name="mFilteringGroup">
200-
<property name="enabled">
201-
<bool>false</bool>
202-
</property>
203-
<property name="title">
204-
<string>Feature filtering</string>
205-
</property>
206-
<property name="checkable">
207-
<bool>false</bool>
208-
</property>
209-
<property name="syncGroup" stdset="0">
210-
<string notr="true">composeritem</string>
211-
</property>
212-
<property name="collapsed" stdset="0">
213-
<bool>true</bool>
214-
</property>
215-
<layout class="QFormLayout" name="formLayout_2">
216-
<property name="fieldGrowthPolicy">
217-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
218-
</property>
219-
<item row="0" column="1">
220-
<layout class="QHBoxLayout" name="horizontalLayout_2">
221-
<item>
222-
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit"/>
223-
</item>
224-
<item>
225-
<widget class="QToolButton" name="mAtlasFeatureFilterButton">
226-
<property name="text">
227-
<string>...</string>
228-
</property>
229-
</widget>
230-
</item>
231-
</layout>
232-
</item>
233-
<item row="0" column="0">
234-
<widget class="QLabel" name="label_2">
235-
<property name="text">
236-
<string>Filter with</string>
174+
<property name="checkable">
175+
<bool>false</bool>
237176
</property>
177+
<property name="syncGroup" stdset="0">
178+
<string notr="true">composeritem</string>
179+
</property>
180+
<property name="collapsed" stdset="0">
181+
<bool>false</bool>
182+
</property>
183+
<layout class="QVBoxLayout" name="verticalLayout_2">
184+
<item>
185+
<widget class="QCheckBox" name="mAtlasHideCoverageCheckBox">
186+
<property name="text">
187+
<string>Hidden coverage layer</string>
188+
</property>
189+
</widget>
190+
</item>
191+
</layout>
238192
</widget>
239193
</item>
240-
</layout>
241-
</widget>
242-
</item>
243-
<item>
244-
<widget class="QgsCollapsibleGroupBoxBasic" name="mScalingGroup">
245-
<property name="enabled">
246-
<bool>false</bool>
247-
</property>
248-
<property name="title">
249-
<string>Scaling</string>
250-
</property>
251-
<property name="checkable">
252-
<bool>false</bool>
253-
</property>
254-
<property name="syncGroup" stdset="0">
255-
<string notr="true">composeritem</string>
256-
</property>
257-
<property name="collapsed" stdset="0">
258-
<bool>false</bool>
259-
</property>
260-
<layout class="QFormLayout" name="formLayout_3">
261-
<item row="1" column="0">
262-
<widget class="QCheckBox" name="mAtlasFixedScaleCheckBox">
263-
<property name="text">
264-
<string>Fixed scale</string>
194+
<item>
195+
<widget class="QgsCollapsibleGroupBoxBasic" name="mSortingGroup">
196+
<property name="enabled">
197+
<bool>false</bool>
198+
</property>
199+
<property name="title">
200+
<string>Feature sorting</string>
265201
</property>
202+
<property name="checkable">
203+
<bool>false</bool>
204+
</property>
205+
<property name="syncGroup" stdset="0">
206+
<string notr="true">composeritem</string>
207+
</property>
208+
<property name="collapsed" stdset="0">
209+
<bool>true</bool>
210+
</property>
211+
<layout class="QFormLayout" name="formLayout">
212+
<property name="fieldGrowthPolicy">
213+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
214+
</property>
215+
<item row="0" column="0">
216+
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
217+
<property name="text">
218+
<string>Sort by</string>
219+
</property>
220+
</widget>
221+
</item>
222+
<item row="0" column="1">
223+
<layout class="QHBoxLayout" name="horizontalLayout">
224+
<item>
225+
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
226+
</item>
227+
<item>
228+
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
229+
<property name="toolTip">
230+
<string>Sort direction</string>
231+
</property>
232+
<property name="text">
233+
<string>...</string>
234+
</property>
235+
<property name="arrowType">
236+
<enum>Qt::UpArrow</enum>
237+
</property>
238+
</widget>
239+
</item>
240+
</layout>
241+
</item>
242+
</layout>
266243
</widget>
267244
</item>
268-
<item row="0" column="0">
269-
<widget class="QLabel" name="label_3">
270-
<property name="text">
271-
<string>Margin around feature</string>
245+
<item>
246+
<widget class="QgsCollapsibleGroupBoxBasic" name="mFilteringGroup">
247+
<property name="enabled">
248+
<bool>false</bool>
249+
</property>
250+
<property name="title">
251+
<string>Feature filtering</string>
252+
</property>
253+
<property name="checkable">
254+
<bool>false</bool>
272255
</property>
256+
<property name="syncGroup" stdset="0">
257+
<string notr="true">composeritem</string>
258+
</property>
259+
<property name="collapsed" stdset="0">
260+
<bool>true</bool>
261+
</property>
262+
<layout class="QFormLayout" name="formLayout_2">
263+
<property name="fieldGrowthPolicy">
264+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
265+
</property>
266+
<item row="0" column="1">
267+
<layout class="QHBoxLayout" name="horizontalLayout_2">
268+
<item>
269+
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit"/>
270+
</item>
271+
<item>
272+
<widget class="QToolButton" name="mAtlasFeatureFilterButton">
273+
<property name="text">
274+
<string>...</string>
275+
</property>
276+
</widget>
277+
</item>
278+
</layout>
279+
</item>
280+
<item row="0" column="0">
281+
<widget class="QLabel" name="label_2">
282+
<property name="text">
283+
<string>Filter with</string>
284+
</property>
285+
</widget>
286+
</item>
287+
</layout>
273288
</widget>
274289
</item>
275-
<item row="0" column="1">
276-
<widget class="QSpinBox" name="mAtlasMarginSpinBox">
277-
<property name="suffix">
278-
<string>%</string>
290+
<item>
291+
<widget class="QgsCollapsibleGroupBoxBasic" name="mScalingGroup">
292+
<property name="enabled">
293+
<bool>false</bool>
279294
</property>
280-
<property name="maximum">
281-
<number>100</number>
295+
<property name="title">
296+
<string>Scaling</string>
282297
</property>
283-
<property name="value">
284-
<number>10</number>
298+
<property name="checkable">
299+
<bool>false</bool>
285300
</property>
301+
<property name="syncGroup" stdset="0">
302+
<string notr="true">composeritem</string>
303+
</property>
304+
<property name="collapsed" stdset="0">
305+
<bool>false</bool>
306+
</property>
307+
<layout class="QFormLayout" name="formLayout_3">
308+
<item row="1" column="0">
309+
<widget class="QCheckBox" name="mAtlasFixedScaleCheckBox">
310+
<property name="text">
311+
<string>Fixed scale</string>
312+
</property>
313+
</widget>
314+
</item>
315+
<item row="0" column="0">
316+
<widget class="QLabel" name="label_3">
317+
<property name="text">
318+
<string>Margin around feature</string>
319+
</property>
320+
</widget>
321+
</item>
322+
<item row="0" column="1">
323+
<widget class="QSpinBox" name="mAtlasMarginSpinBox">
324+
<property name="suffix">
325+
<string>%</string>
326+
</property>
327+
<property name="maximum">
328+
<number>100</number>
329+
</property>
330+
<property name="value">
331+
<number>10</number>
332+
</property>
333+
</widget>
334+
</item>
335+
</layout>
286336
</widget>
287337
</item>
288-
</layout>
289-
</widget>
290-
</item>
291-
<item>
292-
<widget class="QgsCollapsibleGroupBoxBasic" name="mOutputGroup">
293-
<property name="enabled">
294-
<bool>false</bool>
295-
</property>
296-
<property name="title">
297-
<string>Output</string>
298-
</property>
299-
<property name="checkable">
300-
<bool>false</bool>
301-
</property>
302-
<property name="syncGroup" stdset="0">
303-
<string notr="true">composeritem</string>
304-
</property>
305-
<property name="collapsed" stdset="0">
306-
<bool>false</bool>
307-
</property>
308-
<layout class="QFormLayout" name="formLayout_5">
309-
<item row="0" column="0">
310-
<widget class="QLabel" name="label_4">
311-
<property name="text">
312-
<string>Output filename expression</string>
338+
<item>
339+
<widget class="QgsCollapsibleGroupBoxBasic" name="mOutputGroup">
340+
<property name="enabled">
341+
<bool>false</bool>
342+
</property>
343+
<property name="title">
344+
<string>Output</string>
345+
</property>
346+
<property name="checkable">
347+
<bool>false</bool>
348+
</property>
349+
<property name="syncGroup" stdset="0">
350+
<string notr="true">composeritem</string>
351+
</property>
352+
<property name="collapsed" stdset="0">
353+
<bool>false</bool>
313354
</property>
355+
<layout class="QFormLayout" name="formLayout_5">
356+
<item row="0" column="0">
357+
<widget class="QLabel" name="label_4">
358+
<property name="text">
359+
<string>Output filename expression</string>
360+
</property>
361+
</widget>
362+
</item>
363+
<item row="0" column="1">
364+
<layout class="QHBoxLayout" name="horizontalLayout_3">
365+
<item>
366+
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
367+
</item>
368+
<item>
369+
<widget class="QToolButton" name="mAtlasFilenameExpressionButton">
370+
<property name="text">
371+
<string>...</string>
372+
</property>
373+
</widget>
374+
</item>
375+
</layout>
376+
</item>
377+
<item row="1" column="0" colspan="2">
378+
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
379+
<property name="text">
380+
<string>Single file export when possible</string>
381+
</property>
382+
</widget>
383+
</item>
384+
</layout>
314385
</widget>
315386
</item>
316-
<item row="0" column="1">
317-
<layout class="QHBoxLayout" name="horizontalLayout_3">
318-
<item>
319-
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
320-
</item>
321-
<item>
322-
<widget class="QToolButton" name="mAtlasFilenameExpressionButton">
323-
<property name="text">
324-
<string>...</string>
325-
</property>
326-
</widget>
327-
</item>
328-
</layout>
329-
</item>
330-
<item row="1" column="0" colspan="2">
331-
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
332-
<property name="text">
333-
<string>Single file export when possible</string>
387+
<item>
388+
<spacer name="verticalSpacer">
389+
<property name="orientation">
390+
<enum>Qt::Vertical</enum>
334391
</property>
335-
</widget>
392+
<property name="sizeHint" stdset="0">
393+
<size>
394+
<width>20</width>
395+
<height>40</height>
396+
</size>
397+
</property>
398+
</spacer>
336399
</item>
337400
</layout>
338401
</widget>
339-
</item>
340-
<item>
341-
<spacer name="verticalSpacer">
342-
<property name="orientation">
343-
<enum>Qt::Vertical</enum>
344-
</property>
345-
<property name="sizeHint" stdset="0">
346-
<size>
347-
<width>20</width>
348-
<height>40</height>
349-
</size>
350-
</property>
351-
</spacer>
352-
</item>
353-
</layout>
354-
</widget>
402+
</widget>
403+
</item>
404+
</layout>
355405
</widget>
356406
</item>
357407
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.