Skip to content

Commit 6211960

Browse files
author
jef
committed
select and measure toolbar flyouts and submenus (followup #2938)
git-svn-id: http://svn.osgeo.org/qgis/trunk@14101 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8f46f35 commit 6211960

File tree

2 files changed

+43
-28
lines changed

2 files changed

+43
-28
lines changed

src/app/qgisapp.cpp

+43-27
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ void QgisApp::createActions()
879879
mActionZoomOut->setStatusTip( tr( "Zoom Out" ) );
880880
connect( mActionZoomOut, SIGNAL( triggered() ), this, SLOT( zoomOut() ) );
881881

882-
mActionSelect = new QAction( getThemeIcon( "mActionSelect.png" ), tr( "Select Features" ), this );
882+
mActionSelect = new QAction( getThemeIcon( "mActionSelect.png" ), tr( "Select Features" ) , this );
883883
shortcuts->registerAction( mActionSelect );
884884
mActionSelect->setStatusTip( tr( "Select Features" ) );
885885
connect( mActionSelect, SIGNAL( triggered() ), this, SLOT( select() ) );
@@ -1460,17 +1460,22 @@ void QgisApp::createMenus()
14601460
mViewMenu->addAction( mActionZoomIn );
14611461
mViewMenu->addAction( mActionZoomOut );
14621462
mActionViewSeparator1 = mViewMenu->addSeparator();
1463-
mViewMenu->addAction( mActionSelect );
1464-
mViewMenu->addAction( mActionSelectRectangle );
1465-
mViewMenu->addAction( mActionSelectPolygon );
1466-
mViewMenu->addAction( mActionSelectFreehand );
1467-
mViewMenu->addAction( mActionSelectRadius );
1468-
mViewMenu->addAction( mActionDeselectAll );
1469-
mActionViewSeparator2 = mViewMenu->addSeparator();
1463+
1464+
QMenu *menu = mViewMenu->addMenu( tr( "Select" ) );
1465+
menu->addAction( mActionSelect );
1466+
menu->addAction( mActionSelectRectangle );
1467+
menu->addAction( mActionSelectPolygon );
1468+
menu->addAction( mActionSelectFreehand );
1469+
menu->addAction( mActionSelectRadius );
1470+
menu->addAction( mActionDeselectAll );
1471+
14701472
mViewMenu->addAction( mActionIdentify );
1471-
mViewMenu->addAction( mActionMeasure );
1472-
mViewMenu->addAction( mActionMeasureArea );
1473-
mViewMenu->addAction( mActionMeasureAngle );
1473+
1474+
menu = mViewMenu->addMenu( tr( "Measure" ) );
1475+
menu->addAction( mActionMeasure );
1476+
menu->addAction( mActionMeasureArea );
1477+
menu->addAction( mActionMeasureAngle );
1478+
14741479
mActionViewSeparator3 = mViewMenu->addSeparator();
14751480

14761481
mViewMenu->addAction( mActionZoomFullExtent );
@@ -1697,32 +1702,43 @@ void QgisApp::createToolBars()
16971702
mMapNavToolBar->addAction( mActionDraw );
16981703
mToolbarMenu->addAction( mMapNavToolBar->toggleViewAction() );
16991704

1700-
//
1701-
// Feature Select Toolbar
1702-
mFeatureSelectToolBar = addToolBar( tr( "Select Tools" ) );
1703-
mFeatureSelectToolBar->setIconSize( myIconSize );
1704-
mFeatureSelectToolBar->setObjectName( "Select Tools" );
1705-
mFeatureSelectToolBar->addAction( mActionIdentify );
1706-
mFeatureSelectToolBar->addAction( mActionSelect );
1707-
mFeatureSelectToolBar->addAction( mActionSelectRectangle );
1708-
mFeatureSelectToolBar->addAction( mActionSelectPolygon );
1709-
mFeatureSelectToolBar->addAction( mActionSelectFreehand );
1710-
mFeatureSelectToolBar->addAction( mActionSelectRadius );
1711-
mFeatureSelectToolBar->addAction( mActionDeselectAll );
1712-
17131705
//
17141706
// Attributes Toolbar
17151707
mAttributesToolBar = addToolBar( tr( "Attributes" ) );
17161708
mAttributesToolBar->setIconSize( myIconSize );
17171709
mAttributesToolBar->setObjectName( "Attributes" );
1710+
mAttributesToolBar->addAction( mActionIdentify );
1711+
1712+
QToolButton *bt = new QToolButton( mAttributesToolBar );
1713+
QMenu *menu = new QMenu( bt );
1714+
bt->setMenu( menu );
1715+
bt->setPopupMode( QToolButton::InstantPopup );
1716+
menu->addAction( mActionSelect );
1717+
menu->addAction( mActionSelectRectangle );
1718+
menu->addAction( mActionSelectPolygon );
1719+
menu->addAction( mActionSelectFreehand );
1720+
menu->addAction( mActionSelectRadius );
1721+
bt->setDefaultAction( mActionSelect );
1722+
mAttributesToolBar->addWidget( bt );
1723+
1724+
mAttributesToolBar->addAction( mActionDeselectAll );
17181725
mAttributesToolBar->addAction( mActionOpenTable );
1719-
mAttributesToolBar->addAction( mActionMeasure );
1720-
mAttributesToolBar->addAction( mActionMeasureArea );
1721-
mAttributesToolBar->addAction( mActionMeasureAngle );
1726+
1727+
bt = new QToolButton( mAttributesToolBar );
1728+
menu = new QMenu( bt );
1729+
bt->setMenu( menu );
1730+
bt->setPopupMode( QToolButton::InstantPopup );
1731+
menu->addAction( mActionMeasure );
1732+
menu->addAction( mActionMeasureArea );
1733+
menu->addAction( mActionMeasureAngle );
1734+
bt->setDefaultAction( mActionMeasure );
1735+
mAttributesToolBar->addWidget( bt );
1736+
17221737
mAttributesToolBar->addAction( mActionMapTips );
17231738
mAttributesToolBar->addAction( mActionShowBookmarks );
17241739
mAttributesToolBar->addAction( mActionNewBookmark );
17251740
mAttributesToolBar->addAction( mActionLabeling );
1741+
17261742
// Annotation tools
17271743
QToolButton *annotationToolButton = new QToolButton();
17281744
annotationToolButton->setPopupMode( QToolButton::InstantPopup );

src/app/qgisapp.h

-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,6 @@ class QgisApp : public QMainWindow
844844
QToolBar *mDigitizeToolBar;
845845
QToolBar *mAdvancedDigitizeToolBar;
846846
QToolBar *mAttributesToolBar;
847-
QToolBar *mFeatureSelectToolBar;
848847
QToolBar *mPluginToolBar;
849848
QToolBar *mHelpToolBar;
850849

0 commit comments

Comments
 (0)