@@ -879,7 +879,7 @@ void QgisApp::createActions()
879
879
mActionZoomOut ->setStatusTip ( tr ( " Zoom Out" ) );
880
880
connect ( mActionZoomOut , SIGNAL ( triggered () ), this , SLOT ( zoomOut () ) );
881
881
882
- mActionSelect = new QAction ( getThemeIcon ( " mActionSelect.png" ), tr ( " Select Features" ), this );
882
+ mActionSelect = new QAction ( getThemeIcon ( " mActionSelect.png" ), tr ( " Select Features" ) , this );
883
883
shortcuts->registerAction ( mActionSelect );
884
884
mActionSelect ->setStatusTip ( tr ( " Select Features" ) );
885
885
connect ( mActionSelect , SIGNAL ( triggered () ), this , SLOT ( select () ) );
@@ -1460,17 +1460,22 @@ void QgisApp::createMenus()
1460
1460
mViewMenu ->addAction ( mActionZoomIn );
1461
1461
mViewMenu ->addAction ( mActionZoomOut );
1462
1462
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
+
1470
1472
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
+
1474
1479
mActionViewSeparator3 = mViewMenu ->addSeparator ();
1475
1480
1476
1481
mViewMenu ->addAction ( mActionZoomFullExtent );
@@ -1697,32 +1702,43 @@ void QgisApp::createToolBars()
1697
1702
mMapNavToolBar ->addAction ( mActionDraw );
1698
1703
mToolbarMenu ->addAction ( mMapNavToolBar ->toggleViewAction () );
1699
1704
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
-
1713
1705
//
1714
1706
// Attributes Toolbar
1715
1707
mAttributesToolBar = addToolBar ( tr ( " Attributes" ) );
1716
1708
mAttributesToolBar ->setIconSize ( myIconSize );
1717
1709
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 );
1718
1725
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
+
1722
1737
mAttributesToolBar ->addAction ( mActionMapTips );
1723
1738
mAttributesToolBar ->addAction ( mActionShowBookmarks );
1724
1739
mAttributesToolBar ->addAction ( mActionNewBookmark );
1725
1740
mAttributesToolBar ->addAction ( mActionLabeling );
1741
+
1726
1742
// Annotation tools
1727
1743
QToolButton *annotationToolButton = new QToolButton ();
1728
1744
annotationToolButton->setPopupMode ( QToolButton::InstantPopup );
0 commit comments