Skip to content

Commit d1a05f7

Browse files
author
Hugo Mercier
committedFeb 7, 2013
[Atlas] Replace the sort direction combobox by a up/down button
·
ltr-3_40archive/master_2
1 parent 915493c commit d1a05f7

File tree

3 files changed

+56
-36
lines changed

3 files changed

+56
-36
lines changed
 

‎src/app/composer/qgsatlascompositionwidget.cpp

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
6161
}
6262

6363
// Sort direction
64-
mAtlasSortFeatureDirectionComboBox->insertItem( 0, tr("Ascending") );
65-
mAtlasSortFeatureDirectionComboBox->insertItem( 1, tr("Descending") );
66-
mAtlasSortFeatureDirectionComboBox->setEnabled( false );
64+
mAtlasSortFeatureDirectionButton->setEnabled( false );
6765

6866
mAtlasSortFeatureKeyComboBox->setEnabled( false );
6967

@@ -289,11 +287,11 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureCheckBox_stateChanged( int s
289287
}
290288

291289
if ( state == Qt::Checked ) {
292-
mAtlasSortFeatureDirectionComboBox->setEnabled( true );
290+
mAtlasSortFeatureDirectionButton->setEnabled( true );
293291
mAtlasSortFeatureKeyComboBox->setEnabled( true );
294292
}
295293
else {
296-
mAtlasSortFeatureDirectionComboBox->setEnabled( false );
294+
mAtlasSortFeatureDirectionButton->setEnabled( false );
297295
mAtlasSortFeatureKeyComboBox->setEnabled( false );
298296
}
299297
atlasMap->setSortFeatures( state == Qt::Checked );
@@ -312,19 +310,6 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureKeyComboBox_currentIndexChan
312310
}
313311
}
314312

315-
void QgsAtlasCompositionWidget::on_mAtlasSortFeatureDirectionComboBox_currentIndexChanged( int index )
316-
{
317-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
318-
if ( !atlasMap )
319-
{
320-
return;
321-
}
322-
323-
if ( index != -1 ) {
324-
atlasMap->setSortAscending( index == 0 ? true : false );
325-
}
326-
}
327-
328313
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_textChanged( const QString& text )
329314
{
330315
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
@@ -357,6 +342,20 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()
357342
}
358343
}
359344

345+
void QgsAtlasCompositionWidget::on_mAtlasSortFeatureDirectionButton_clicked()
346+
{
347+
Qt::ArrowType at = mAtlasSortFeatureDirectionButton->arrowType();
348+
at = (at == Qt::UpArrow) ? Qt::DownArrow : Qt::UpArrow;
349+
mAtlasSortFeatureDirectionButton->setArrowType( at );
350+
351+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
352+
if ( !atlasMap ) {
353+
return;
354+
}
355+
356+
atlasMap->setSortAscending( at == Qt::UpArrow );
357+
}
358+
360359
void QgsAtlasCompositionWidget::fillSortColumns()
361360
{
362361
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
@@ -403,7 +402,7 @@ void QgsAtlasCompositionWidget::updateGuiElements()
403402
mAtlasSingleFileCheckBox->setCheckState( atlasMap->singleFile() ? Qt::Checked : Qt::Unchecked );
404403
mAtlasSortFeatureCheckBox->setCheckState( atlasMap->sortFeatures() ? Qt::Checked : Qt::Unchecked );
405404
mAtlasSortFeatureKeyComboBox->setCurrentIndex( atlasMap->sortKeyAttributeIndex() );
406-
mAtlasSortFeatureDirectionComboBox->setCurrentIndex( atlasMap->sortAscending() ? 0 : 1 );
405+
mAtlasSortFeatureDirectionButton->setArrowType( atlasMap->sortAscending() ? Qt::UpArrow : Qt::DownArrow );
407406
mAtlasFeatureFilterEdit->setText( atlasMap->featureFilter() );
408407
}
409408

‎src/app/composer/qgsatlascompositionwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class QgsAtlasCompositionWidget:
4545

4646
void on_mAtlasSortFeatureCheckBox_stateChanged( int state );
4747
void on_mAtlasSortFeatureKeyComboBox_currentIndexChanged( int index );
48-
void on_mAtlasSortFeatureDirectionComboBox_currentIndexChanged( int index );
48+
void on_mAtlasSortFeatureDirectionButton_clicked();
4949
void on_mAtlasFeatureFilterEdit_textChanged( const QString& text );
5050
void on_mAtlasFeatureFilterButton_clicked();
5151

‎src/ui/qgsatlascompositionwidgetbase.ui

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<number>0</number>
7676
</property>
7777
<item>
78-
<layout class="QGridLayout" name="gridLayout_7" rowstretch="0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0">
79-
<item row="5" column="0">
78+
<layout class="QGridLayout" name="gridLayout_7" rowstretch="0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0">
79+
<item row="4" column="0">
8080
<widget class="QLabel" name="mAtlasFeatureFilterLabel">
8181
<property name="text">
8282
<string>Feature filter</string>
@@ -93,21 +93,21 @@
9393
</property>
9494
</widget>
9595
</item>
96-
<item row="6" column="0">
96+
<item row="5" column="0">
9797
<widget class="QLabel" name="label">
9898
<property name="text">
9999
<string>Margin around coverage</string>
100100
</property>
101101
</widget>
102102
</item>
103-
<item row="9" column="0">
103+
<item row="8" column="0">
104104
<widget class="QLabel" name="label_5">
105105
<property name="text">
106106
<string>Output filename expression</string>
107107
</property>
108108
</widget>
109109
</item>
110-
<item row="6" column="1">
110+
<item row="5" column="1">
111111
<widget class="QSpinBox" name="mAtlasMarginSpinBox">
112112
<property name="suffix">
113113
<string> %</string>
@@ -120,14 +120,14 @@
120120
</property>
121121
</widget>
122122
</item>
123-
<item row="9" column="2">
123+
<item row="8" column="2">
124124
<widget class="QToolButton" name="mAtlasFilenameExpressionButton">
125125
<property name="text">
126126
<string>...</string>
127127
</property>
128128
</widget>
129129
</item>
130-
<item row="9" column="1">
130+
<item row="8" column="1">
131131
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
132132
</item>
133133
<item row="1" column="0">
@@ -144,14 +144,14 @@
144144
</property>
145145
</widget>
146146
</item>
147-
<item row="7" column="0" colspan="2">
147+
<item row="6" column="0" colspan="2">
148148
<widget class="QCheckBox" name="mAtlasFixedScaleCheckBox">
149149
<property name="text">
150150
<string>Fixed scale</string>
151151
</property>
152152
</widget>
153153
</item>
154-
<item row="10" column="0" colspan="2">
154+
<item row="9" column="0" colspan="2">
155155
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
156156
<property name="text">
157157
<string>Single file export when possible</string>
@@ -169,7 +169,18 @@
169169
</widget>
170170
</item>
171171
<item row="3" column="1">
172-
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
172+
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox">
173+
<property name="toolTip">
174+
<string>Sort key</string>
175+
</property>
176+
</widget>
177+
</item>
178+
<item row="4" column="1">
179+
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit">
180+
<property name="toolTip">
181+
<string>Feature filter</string>
182+
</property>
183+
</widget>
173184
</item>
174185
<item row="3" column="0">
175186
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
@@ -178,18 +189,28 @@
178189
</property>
179190
</widget>
180191
</item>
181-
<item row="5" column="2">
192+
<item row="4" column="2">
182193
<widget class="QToolButton" name="mAtlasFeatureFilterButton">
194+
<property name="toolTip">
195+
<string>Open expression builder</string>
196+
</property>
183197
<property name="text">
184198
<string>...</string>
185199
</property>
186200
</widget>
187201
</item>
188-
<item row="5" column="1">
189-
<widget class="QLineEdit" name="mAtlasFeatureFilterEdit"/>
190-
</item>
191-
<item row="4" column="1">
192-
<widget class="QComboBox" name="mAtlasSortFeatureDirectionComboBox"/>
202+
<item row="3" column="2">
203+
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
204+
<property name="toolTip">
205+
<string>Sort direction</string>
206+
</property>
207+
<property name="text">
208+
<string>...</string>
209+
</property>
210+
<property name="arrowType">
211+
<enum>Qt::UpArrow</enum>
212+
</property>
213+
</widget>
193214
</item>
194215
</layout>
195216
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.