@@ -2397,6 +2397,7 @@ void QgisApp::createToolBars()
2397
2397
<< mLayerToolBar
2398
2398
<< mDigitizeToolBar
2399
2399
<< mAdvancedDigitizeToolBar
2400
+ << mShapeDigitizeToolBar
2400
2401
<< mMapNavToolBar
2401
2402
<< mAttributesToolBar
2402
2403
<< mPluginToolBar
@@ -2683,16 +2684,16 @@ void QgisApp::createToolBars()
2683
2684
}
2684
2685
2685
2686
// circular string digitize tool button
2686
- QToolButton *tbAddCircularString = new QToolButton ( mRegularShapeDigitizeToolBar );
2687
+ QToolButton *tbAddCircularString = new QToolButton ( mShapeDigitizeToolBar );
2687
2688
tbAddCircularString->setPopupMode ( QToolButton::MenuButtonPopup );
2688
2689
tbAddCircularString->addAction ( mActionCircularStringCurvePoint );
2689
2690
tbAddCircularString->addAction ( mActionCircularStringRadius );
2690
2691
tbAddCircularString->setDefaultAction ( mActionCircularStringCurvePoint );
2691
2692
connect ( tbAddCircularString, &QToolButton::triggered, this , &QgisApp::toolButtonActionTriggered );
2692
- mRegularShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddCircularString );
2693
+ mShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddCircularString );
2693
2694
2694
2695
// circle digitize tool button
2695
- QToolButton *tbAddCircle = new QToolButton ( mRegularShapeDigitizeToolBar );
2696
+ QToolButton *tbAddCircle = new QToolButton ( mShapeDigitizeToolBar );
2696
2697
tbAddCircle->setPopupMode ( QToolButton::MenuButtonPopup );
2697
2698
tbAddCircle->addAction ( mActionCircle2Points );
2698
2699
tbAddCircle->addAction ( mActionCircle3Points );
@@ -2701,38 +2702,38 @@ void QgisApp::createToolBars()
2701
2702
tbAddCircle->addAction ( mActionCircleCenterPoint );
2702
2703
tbAddCircle->setDefaultAction ( mActionCircle2Points );
2703
2704
connect ( tbAddCircle, &QToolButton::triggered, this , &QgisApp::toolButtonActionTriggered );
2704
- mRegularShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddCircle );
2705
+ mShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddCircle );
2705
2706
2706
2707
// ellipse digitize tool button
2707
- QToolButton *tbAddEllipse = new QToolButton ( mRegularShapeDigitizeToolBar );
2708
+ QToolButton *tbAddEllipse = new QToolButton ( mShapeDigitizeToolBar );
2708
2709
tbAddEllipse->setPopupMode ( QToolButton::MenuButtonPopup );
2709
2710
tbAddEllipse->addAction ( mActionEllipseCenter2Points );
2710
2711
tbAddEllipse->addAction ( mActionEllipseCenterPoint );
2711
2712
tbAddEllipse->addAction ( mActionEllipseExtent );
2712
2713
tbAddEllipse->addAction ( mActionEllipseFoci );
2713
2714
tbAddEllipse->setDefaultAction ( mActionEllipseCenter2Points );
2714
2715
connect ( tbAddEllipse, &QToolButton::triggered, this , &QgisApp::toolButtonActionTriggered );
2715
- mRegularShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddEllipse );
2716
+ mShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddEllipse );
2716
2717
2717
2718
// Rectangle digitize tool button
2718
- QToolButton *tbAddRectangle = new QToolButton ( mRegularShapeDigitizeToolBar );
2719
+ QToolButton *tbAddRectangle = new QToolButton ( mShapeDigitizeToolBar );
2719
2720
tbAddRectangle->setPopupMode ( QToolButton::MenuButtonPopup );
2720
2721
tbAddRectangle->addAction ( mActionRectangleCenterPoint );
2721
2722
tbAddRectangle->addAction ( mActionRectangleExtent );
2722
2723
tbAddRectangle->addAction ( mActionRectangle3Points );
2723
2724
tbAddRectangle->setDefaultAction ( mActionRectangleCenterPoint );
2724
2725
connect ( tbAddRectangle, &QToolButton::triggered, this , &QgisApp::toolButtonActionTriggered );
2725
- mRegularShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddRectangle );
2726
+ mShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddRectangle );
2726
2727
2727
2728
// Regular polygon digitize tool button
2728
- QToolButton *tbAddRegularPolygon = new QToolButton ( mRegularShapeDigitizeToolBar );
2729
+ QToolButton *tbAddRegularPolygon = new QToolButton ( mShapeDigitizeToolBar );
2729
2730
tbAddRegularPolygon->setPopupMode ( QToolButton::MenuButtonPopup );
2730
2731
tbAddRegularPolygon->addAction ( mActionRegularPolygon2Points );
2731
2732
tbAddRegularPolygon->addAction ( mActionRegularPolygonCenterPoint );
2732
2733
tbAddRegularPolygon->addAction ( mActionRegularPolygonCenterCorner );
2733
2734
tbAddRegularPolygon->setDefaultAction ( mActionRegularPolygon2Points );
2734
2735
connect ( tbAddRegularPolygon, &QToolButton::triggered, this , &QgisApp::toolButtonActionTriggered );
2735
- mRegularShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddRegularPolygon );
2736
+ mShapeDigitizeToolBar ->insertWidget ( mActionVertexTool , tbAddRegularPolygon );
2736
2737
2737
2738
// move feature tool button
2738
2739
QToolButton *moveFeatureButton = new QToolButton ( mDigitizeToolBar );
@@ -2917,6 +2918,7 @@ void QgisApp::createStatusBar()
2917
2918
QList< QWidget *> actionObjects;
2918
2919
actionObjects << menuBar ()
2919
2920
<< mAdvancedDigitizeToolBar
2921
+ << mShapeDigitizeToolBar
2920
2922
<< mFileToolBar
2921
2923
<< mDataSourceManagerToolBar
2922
2924
<< mLayerToolBar
0 commit comments