Skip to content

Commit 0d8875f

Browse files
nyalldawsonnyalldawson
committed
Merge pull request #1078 from 3nids/uiatlas
lighter UI for atlas composer
2 parents 4502592 + 34809e1 commit 0d8875f

2 files changed

Lines changed: 101 additions & 186 deletions

File tree

‎src/app/composer/qgsatlascompositionwidget.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,12 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
7070
{
7171
atlasMap->setEnabled( true );
7272
mConfigurationGroup->setEnabled( true );
73-
mVisibilityGroup->setEnabled( true );
74-
mSortingGroup->setEnabled( true );
75-
mFilteringGroup->setEnabled( true );
7673
mOutputGroup->setEnabled( true );
7774
}
7875
else
7976
{
8077
atlasMap->setEnabled( false );
8178
mConfigurationGroup->setEnabled( false );
82-
mVisibilityGroup->setEnabled( false );
83-
mSortingGroup->setEnabled( false );
84-
mFilteringGroup->setEnabled( false );
8579
mOutputGroup->setEnabled( false );
8680
}
8781
}
@@ -400,8 +394,5 @@ void QgsAtlasCompositionWidget::blockAllSignals( bool b )
400394
{
401395
mUseAtlasCheckBox->blockSignals( b );
402396
mConfigurationGroup->blockSignals( b );
403-
mVisibilityGroup->blockSignals( b );
404-
mSortingGroup->blockSignals( b );
405-
mFilteringGroup->blockSignals( b );
406397
mOutputGroup->blockSignals( b );
407398
}

‎src/ui/qgsatlascompositionwidgetbase.ui‎

Lines changed: 101 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,7 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="leftMargin">
27-
<number>0</number>
28-
</property>
29-
<property name="topMargin">
30-
<number>0</number>
31-
</property>
32-
<property name="rightMargin">
33-
<number>0</number>
34-
</property>
35-
<property name="bottomMargin">
26+
<property name="margin">
3627
<number>0</number>
3728
</property>
3829
<item>
@@ -41,24 +32,15 @@
4132
<enum>QFrame::StyledPanel</enum>
4233
</property>
4334
<layout class="QGridLayout" name="gridLayout">
44-
<property name="leftMargin">
45-
<number>0</number>
46-
</property>
47-
<property name="topMargin">
48-
<number>0</number>
49-
</property>
50-
<property name="rightMargin">
51-
<number>0</number>
52-
</property>
53-
<property name="bottomMargin">
54-
<number>0</number>
55-
</property>
5635
<property name="horizontalSpacing">
5736
<number>0</number>
5837
</property>
5938
<property name="verticalSpacing">
6039
<number>3</number>
6140
</property>
41+
<property name="margin">
42+
<number>0</number>
43+
</property>
6244
<item row="0" column="1">
6345
<widget class="QCheckBox" name="mUseAtlasCheckBox">
6446
<property name="text">
@@ -133,49 +115,62 @@
133115
<property name="collapsed" stdset="0">
134116
<bool>false</bool>
135117
</property>
136-
<layout class="QFormLayout" name="formLayout_4">
137-
<property name="fieldGrowthPolicy">
138-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
139-
</property>
140-
<property name="labelAlignment">
141-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
142-
</property>
118+
<layout class="QGridLayout" name="gridLayout_2">
143119
<item row="0" column="0">
144120
<widget class="QLabel" name="mHorizontalAlignementLabel">
145121
<property name="text">
146-
<string>Coverage layer</string>
122+
<string>Coverage layer </string>
123+
</property>
124+
</widget>
125+
</item>
126+
<item row="2" column="0">
127+
<widget class="QCheckBox" name="mAtlasFeatureFilterCheckBox">
128+
<property name="text">
129+
<string>Filter with</string>
130+
</property>
131+
</widget>
132+
</item>
133+
<item row="0" column="2">
134+
<widget class="QComboBox" name="mAtlasCoverageLayerComboBox">
135+
<property name="sizePolicy">
136+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
137+
<horstretch>0</horstretch>
138+
<verstretch>0</verstretch>
139+
</sizepolicy>
147140
</property>
148141
</widget>
149142
</item>
150143
<item row="0" column="1">
151-
<layout class="QHBoxLayout" name="horizontalLayout_5">
152-
<item>
153-
<widget class="QComboBox" name="mAtlasCoverageLayerComboBox"/>
154-
</item>
155-
</layout>
144+
<spacer name="horizontalSpacer_3">
145+
<property name="orientation">
146+
<enum>Qt::Horizontal</enum>
147+
</property>
148+
<property name="sizeType">
149+
<enum>QSizePolicy::Preferred</enum>
150+
</property>
151+
<property name="sizeHint" stdset="0">
152+
<size>
153+
<width>20</width>
154+
<height>20</height>
155+
</size>
156+
</property>
157+
</spacer>
156158
</item>
157-
</layout>
158-
</widget>
159-
</item>
160-
<item>
161-
<widget class="QgsCollapsibleGroupBoxBasic" name="mVisibilityGroup">
162-
<property name="enabled">
163-
<bool>false</bool>
164-
</property>
165-
<property name="title">
166-
<string>Visibility</string>
167-
</property>
168-
<property name="checkable">
169-
<bool>false</bool>
170-
</property>
171-
<property name="syncGroup" stdset="0">
172-
<string notr="true">composeritem</string>
173-
</property>
174-
<property name="collapsed" stdset="0">
175-
<bool>false</bool>
176-
</property>
177-
<layout class="QVBoxLayout" name="verticalLayout_2">
178-
<item>
159+
<item row="2" column="2">
160+
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit"/>
161+
</item>
162+
<item row="2" column="3">
163+
<widget class="QToolButton" name="mAtlasFeatureFilterButton">
164+
<property name="text">
165+
<string>...</string>
166+
</property>
167+
<property name="icon">
168+
<iconset resource="../../images/images.qrc">
169+
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
170+
</property>
171+
</widget>
172+
</item>
173+
<item row="1" column="0" colspan="4">
179174
<widget class="QCheckBox" name="mAtlasHideCoverageCheckBox">
180175
<property name="text">
181176
<string>Hidden coverage layer</string>
@@ -185,105 +180,6 @@
185180
</layout>
186181
</widget>
187182
</item>
188-
<item>
189-
<widget class="QgsCollapsibleGroupBoxBasic" name="mSortingGroup">
190-
<property name="enabled">
191-
<bool>false</bool>
192-
</property>
193-
<property name="title">
194-
<string>Feature sorting</string>
195-
</property>
196-
<property name="checkable">
197-
<bool>false</bool>
198-
</property>
199-
<property name="syncGroup" stdset="0">
200-
<string notr="true">composeritem</string>
201-
</property>
202-
<property name="collapsed" stdset="0">
203-
<bool>true</bool>
204-
</property>
205-
<layout class="QVBoxLayout" name="verticalLayout_3">
206-
<item>
207-
<layout class="QHBoxLayout" name="horizontalLayout">
208-
<item>
209-
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
210-
<property name="sizePolicy">
211-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
212-
<horstretch>0</horstretch>
213-
<verstretch>0</verstretch>
214-
</sizepolicy>
215-
</property>
216-
<property name="text">
217-
<string>Sort by</string>
218-
</property>
219-
</widget>
220-
</item>
221-
<item>
222-
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
223-
</item>
224-
<item>
225-
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
226-
<property name="toolTip">
227-
<string>Sort direction</string>
228-
</property>
229-
<property name="text">
230-
<string>...</string>
231-
</property>
232-
<property name="arrowType">
233-
<enum>Qt::UpArrow</enum>
234-
</property>
235-
</widget>
236-
</item>
237-
</layout>
238-
</item>
239-
</layout>
240-
</widget>
241-
</item>
242-
<item>
243-
<widget class="QgsCollapsibleGroupBoxBasic" name="mFilteringGroup">
244-
<property name="enabled">
245-
<bool>false</bool>
246-
</property>
247-
<property name="title">
248-
<string>Feature filtering</string>
249-
</property>
250-
<property name="checkable">
251-
<bool>false</bool>
252-
</property>
253-
<property name="syncGroup" stdset="0">
254-
<string notr="true">composeritem</string>
255-
</property>
256-
<property name="collapsed" stdset="0">
257-
<bool>true</bool>
258-
</property>
259-
<layout class="QFormLayout" name="formLayout_2">
260-
<property name="fieldGrowthPolicy">
261-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
262-
</property>
263-
<item row="0" column="0" colspan="2">
264-
<layout class="QHBoxLayout" name="horizontalLayout_2">
265-
<item>
266-
<widget class="QCheckBox" name="mAtlasFeatureFilterCheckBox">
267-
<property name="text">
268-
<string>Filter with</string>
269-
</property>
270-
</widget>
271-
</item>
272-
<item>
273-
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit"/>
274-
</item>
275-
<item>
276-
<widget class="QToolButton" name="mAtlasFeatureFilterButton">
277-
<property name="text">
278-
<string>...</string>
279-
</property>
280-
</widget>
281-
</item>
282-
</layout>
283-
</item>
284-
</layout>
285-
</widget>
286-
</item>
287183
<item>
288184
<widget class="QgsCollapsibleGroupBoxBasic" name="mOutputGroup">
289185
<property name="enabled">
@@ -302,36 +198,62 @@
302198
<bool>false</bool>
303199
</property>
304200
<layout class="QGridLayout" name="gridLayout_3">
305-
<item row="2" column="0" colspan="2">
306-
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
201+
<item row="0" column="0" colspan="2">
202+
<widget class="QLabel" name="label_4">
307203
<property name="text">
308-
<string>Single file export when possible</string>
204+
<string>Output filename expression</string>
309205
</property>
310206
</widget>
311207
</item>
312-
<item row="0" column="0" colspan="2">
313-
<widget class="QLabel" name="label_4">
208+
<item row="3" column="1">
209+
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
210+
</item>
211+
<item row="3" column="0">
212+
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
213+
<property name="sizePolicy">
214+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
215+
<horstretch>0</horstretch>
216+
<verstretch>0</verstretch>
217+
</sizepolicy>
218+
</property>
314219
<property name="text">
315-
<string>Output filename expression</string>
220+
<string>Sort by</string>
221+
</property>
222+
</widget>
223+
</item>
224+
<item row="3" column="2">
225+
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
226+
<property name="toolTip">
227+
<string>Sort direction</string>
228+
</property>
229+
<property name="text">
230+
<string>...</string>
231+
</property>
232+
<property name="arrowType">
233+
<enum>Qt::UpArrow</enum>
234+
</property>
235+
</widget>
236+
</item>
237+
<item row="1" column="2">
238+
<widget class="QToolButton" name="mAtlasFilenameExpressionButton">
239+
<property name="text">
240+
<string>...</string>
241+
</property>
242+
<property name="icon">
243+
<iconset resource="../../images/images.qrc">
244+
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
316245
</property>
317246
</widget>
318247
</item>
319248
<item row="1" column="0" colspan="2">
320-
<layout class="QHBoxLayout" name="horizontalLayout_3">
321-
<property name="leftMargin">
322-
<number>12</number>
249+
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
250+
</item>
251+
<item row="2" column="0" colspan="3">
252+
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
253+
<property name="text">
254+
<string>Single file export when possible</string>
323255
</property>
324-
<item>
325-
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
326-
</item>
327-
<item>
328-
<widget class="QToolButton" name="mAtlasFilenameExpressionButton">
329-
<property name="text">
330-
<string>...</string>
331-
</property>
332-
</widget>
333-
</item>
334-
</layout>
256+
</widget>
335257
</item>
336258
</layout>
337259
</widget>
@@ -366,6 +288,8 @@
366288
<container>1</container>
367289
</customwidget>
368290
</customwidgets>
369-
<resources/>
291+
<resources>
292+
<include location="../../images/images.qrc"/>
293+
</resources>
370294
<connections/>
371295
</ui>

0 commit comments

Comments
 (0)