Skip to content

Commit b625a1d

Browse files
nirvnnirvn
committedFeb 6, 2016
[gui] better toolbar placement for selection actions
·
ltr-3_40archive/master_2
1 parent 8cdd723 commit b625a1d

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,11 +1843,11 @@ void QgisApp::createToolBars()
18431843
QToolButton *bt = new QToolButton( mAttributesToolBar );
18441844
bt->setPopupMode( QToolButton::MenuButtonPopup );
18451845
QList<QAction*> selectActions;
1846-
selectActions << mActionDeselectAll << mActionSelectAll
1847-
<< mActionInvertSelection << mActionSelectByExpression;
1846+
selectActions << mActionSelectByExpression << mActionSelectAll
1847+
<< mActionInvertSelection;
18481848
bt->addActions( selectActions );
1849-
bt->setDefaultAction( mActionDeselectAll );
1850-
QAction* selectionAction = mAttributesToolBar->insertWidget( mActionOpenTable, bt );
1849+
bt->setDefaultAction( mActionSelectByExpression );
1850+
QAction* selectionAction = mAttributesToolBar->insertWidget( mActionDeselectAll, bt );
18511851

18521852
// select tool button
18531853

‎src/ui/qgisapp.ui

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
<bool>true</bool>
442442
</attribute>
443443
<addaction name="mActionIdentify"/>
444+
<addaction name="mActionDeselectAll"/>
444445
<addaction name="mActionOpenTable"/>
445446
<addaction name="mActionOpenFieldCalc"/>
446447
<addaction name="mActionStatisticalSummary"/>

‎src/ui/qgsattributetabledialog.ui

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@
216216
</widget>
217217
</item>
218218
<item>
219-
<widget class="QToolButton" name="mRemoveSelectionButton">
219+
<widget class="QToolButton" name="mSelectAllButton">
220220
<property name="toolTip">
221-
<string>Deselect all (Ctrl+Shift+A)</string>
221+
<string>Select all (Ctrl+A)</string>
222222
</property>
223223
<property name="text">
224224
<string/>
225225
</property>
226226
<property name="icon">
227227
<iconset resource="../../images/images.qrc">
228-
<normaloff>:/images/themes/default/mActionUnselectAttributes.png</normaloff>:/images/themes/default/mActionUnselectAttributes.png</iconset>
228+
<normaloff>:/images/themes/default/mActionSelectAll.png</normaloff>:/images/themes/default/mActionSelectAll.png</iconset>
229229
</property>
230230
<property name="iconSize">
231231
<size>
@@ -234,24 +234,24 @@
234234
</size>
235235
</property>
236236
<property name="shortcut">
237-
<string>Ctrl+Shift+A</string>
237+
<string>Ctrl+A</string>
238238
</property>
239239
<property name="autoRaise">
240240
<bool>true</bool>
241241
</property>
242242
</widget>
243243
</item>
244244
<item>
245-
<widget class="QToolButton" name="mSelectAllButton">
245+
<widget class="QToolButton" name="mInvertSelectionButton">
246246
<property name="toolTip">
247-
<string>Select all (Ctrl+A)</string>
247+
<string>Invert selection (Ctrl+R)</string>
248248
</property>
249249
<property name="text">
250250
<string/>
251251
</property>
252252
<property name="icon">
253253
<iconset resource="../../images/images.qrc">
254-
<normaloff>:/images/themes/default/mActionSelectAll.png</normaloff>:/images/themes/default/mActionSelectAll.png</iconset>
254+
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
255255
</property>
256256
<property name="iconSize">
257257
<size>
@@ -260,24 +260,24 @@
260260
</size>
261261
</property>
262262
<property name="shortcut">
263-
<string>Ctrl+A</string>
263+
<string>Ctrl+R</string>
264264
</property>
265265
<property name="autoRaise">
266266
<bool>true</bool>
267267
</property>
268268
</widget>
269269
</item>
270270
<item>
271-
<widget class="QToolButton" name="mSelectedToTopButton">
271+
<widget class="QToolButton" name="mRemoveSelectionButton">
272272
<property name="toolTip">
273-
<string>Move selection to top (Ctrl+T)</string>
273+
<string>Deselect all (Ctrl+Shift+A)</string>
274274
</property>
275275
<property name="text">
276276
<string/>
277277
</property>
278278
<property name="icon">
279279
<iconset resource="../../images/images.qrc">
280-
<normaloff>:/images/themes/default/mActionSelectedToTop.png</normaloff>:/images/themes/default/mActionSelectedToTop.png</iconset>
280+
<normaloff>:/images/themes/default/mActionUnselectAttributes.png</normaloff>:/images/themes/default/mActionUnselectAttributes.png</iconset>
281281
</property>
282282
<property name="iconSize">
283283
<size>
@@ -286,27 +286,24 @@
286286
</size>
287287
</property>
288288
<property name="shortcut">
289-
<string>Ctrl+T</string>
290-
</property>
291-
<property name="checkable">
292-
<bool>true</bool>
289+
<string>Ctrl+Shift+A</string>
293290
</property>
294291
<property name="autoRaise">
295292
<bool>true</bool>
296293
</property>
297294
</widget>
298295
</item>
299296
<item>
300-
<widget class="QToolButton" name="mInvertSelectionButton">
297+
<widget class="QToolButton" name="mSelectedToTopButton">
301298
<property name="toolTip">
302-
<string>Invert selection (Ctrl+R)</string>
299+
<string>Move selection to top (Ctrl+T)</string>
303300
</property>
304301
<property name="text">
305302
<string/>
306303
</property>
307304
<property name="icon">
308305
<iconset resource="../../images/images.qrc">
309-
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
306+
<normaloff>:/images/themes/default/mActionSelectedToTop.png</normaloff>:/images/themes/default/mActionSelectedToTop.png</iconset>
310307
</property>
311308
<property name="iconSize">
312309
<size>
@@ -315,7 +312,10 @@
315312
</size>
316313
</property>
317314
<property name="shortcut">
318-
<string>Ctrl+R</string>
315+
<string>Ctrl+T</string>
316+
</property>
317+
<property name="checkable">
318+
<bool>true</bool>
319319
</property>
320320
<property name="autoRaise">
321321
<bool>true</bool>

0 commit comments

Comments
 (0)
Please sign in to comment.