Skip to content

Commit 3e86804

Browse files
authored
Merge pull request #6395 from lbartoletti/advanced_shape_digitize_toolbar
Make Regular Shape Digitizing Toolbar disabled by default / renamed Shape Digitizing Toolbar
2 parents af8ca3e + 5d5927a commit 3e86804

File tree

9 files changed

+59
-53
lines changed

9 files changed

+59
-53
lines changed

python/gui/qgisinterface.sip.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ Advanced digitizing dock widget
191191
virtual QToolBar *mapNavToolToolBar() = 0;
192192
virtual QToolBar *digitizeToolBar() = 0;
193193
virtual QToolBar *advancedDigitizeToolBar() = 0;
194+
virtual QToolBar *shapeDigitizeToolBar() = 0;
194195
virtual QToolBar *attributesToolBar() = 0;
195196
virtual QToolBar *pluginToolBar() = 0;
196197
virtual QToolBar *helpToolBar() = 0;

src/app/qgisapp.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,6 +2397,7 @@ void QgisApp::createToolBars()
23972397
<< mLayerToolBar
23982398
<< mDigitizeToolBar
23992399
<< mAdvancedDigitizeToolBar
2400+
<< mShapeDigitizeToolBar
24002401
<< mMapNavToolBar
24012402
<< mAttributesToolBar
24022403
<< mPluginToolBar
@@ -2683,16 +2684,16 @@ void QgisApp::createToolBars()
26832684
}
26842685

26852686
//circular string digitize tool button
2686-
QToolButton *tbAddCircularString = new QToolButton( mRegularShapeDigitizeToolBar );
2687+
QToolButton *tbAddCircularString = new QToolButton( mShapeDigitizeToolBar );
26872688
tbAddCircularString->setPopupMode( QToolButton::MenuButtonPopup );
26882689
tbAddCircularString->addAction( mActionCircularStringCurvePoint );
26892690
tbAddCircularString->addAction( mActionCircularStringRadius );
26902691
tbAddCircularString->setDefaultAction( mActionCircularStringCurvePoint );
26912692
connect( tbAddCircularString, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
2692-
mRegularShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddCircularString );
2693+
mShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddCircularString );
26932694

26942695
//circle digitize tool button
2695-
QToolButton *tbAddCircle = new QToolButton( mRegularShapeDigitizeToolBar );
2696+
QToolButton *tbAddCircle = new QToolButton( mShapeDigitizeToolBar );
26962697
tbAddCircle->setPopupMode( QToolButton::MenuButtonPopup );
26972698
tbAddCircle->addAction( mActionCircle2Points );
26982699
tbAddCircle->addAction( mActionCircle3Points );
@@ -2701,38 +2702,38 @@ void QgisApp::createToolBars()
27012702
tbAddCircle->addAction( mActionCircleCenterPoint );
27022703
tbAddCircle->setDefaultAction( mActionCircle2Points );
27032704
connect( tbAddCircle, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
2704-
mRegularShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddCircle );
2705+
mShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddCircle );
27052706

27062707
//ellipse digitize tool button
2707-
QToolButton *tbAddEllipse = new QToolButton( mRegularShapeDigitizeToolBar );
2708+
QToolButton *tbAddEllipse = new QToolButton( mShapeDigitizeToolBar );
27082709
tbAddEllipse->setPopupMode( QToolButton::MenuButtonPopup );
27092710
tbAddEllipse->addAction( mActionEllipseCenter2Points );
27102711
tbAddEllipse->addAction( mActionEllipseCenterPoint );
27112712
tbAddEllipse->addAction( mActionEllipseExtent );
27122713
tbAddEllipse->addAction( mActionEllipseFoci );
27132714
tbAddEllipse->setDefaultAction( mActionEllipseCenter2Points );
27142715
connect( tbAddEllipse, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
2715-
mRegularShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddEllipse );
2716+
mShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddEllipse );
27162717

27172718
//Rectangle digitize tool button
2718-
QToolButton *tbAddRectangle = new QToolButton( mRegularShapeDigitizeToolBar );
2719+
QToolButton *tbAddRectangle = new QToolButton( mShapeDigitizeToolBar );
27192720
tbAddRectangle->setPopupMode( QToolButton::MenuButtonPopup );
27202721
tbAddRectangle->addAction( mActionRectangleCenterPoint );
27212722
tbAddRectangle->addAction( mActionRectangleExtent );
27222723
tbAddRectangle->addAction( mActionRectangle3Points );
27232724
tbAddRectangle->setDefaultAction( mActionRectangleCenterPoint );
27242725
connect( tbAddRectangle, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
2725-
mRegularShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddRectangle );
2726+
mShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddRectangle );
27262727

27272728
//Regular polygon digitize tool button
2728-
QToolButton *tbAddRegularPolygon = new QToolButton( mRegularShapeDigitizeToolBar );
2729+
QToolButton *tbAddRegularPolygon = new QToolButton( mShapeDigitizeToolBar );
27292730
tbAddRegularPolygon->setPopupMode( QToolButton::MenuButtonPopup );
27302731
tbAddRegularPolygon->addAction( mActionRegularPolygon2Points );
27312732
tbAddRegularPolygon->addAction( mActionRegularPolygonCenterPoint );
27322733
tbAddRegularPolygon->addAction( mActionRegularPolygonCenterCorner );
27332734
tbAddRegularPolygon->setDefaultAction( mActionRegularPolygon2Points );
27342735
connect( tbAddRegularPolygon, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
2735-
mRegularShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddRegularPolygon );
2736+
mShapeDigitizeToolBar->insertWidget( mActionVertexTool, tbAddRegularPolygon );
27362737

27372738
// move feature tool button
27382739
QToolButton *moveFeatureButton = new QToolButton( mDigitizeToolBar );
@@ -2917,6 +2918,7 @@ void QgisApp::createStatusBar()
29172918
QList< QWidget *> actionObjects;
29182919
actionObjects << menuBar()
29192920
<< mAdvancedDigitizeToolBar
2921+
<< mShapeDigitizeToolBar
29202922
<< mFileToolBar
29212923
<< mDataSourceManagerToolBar
29222924
<< mLayerToolBar

src/app/qgisapp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
584584
QToolBar *mapNavToolToolBar() { return mMapNavToolBar; }
585585
QToolBar *digitizeToolBar() { return mDigitizeToolBar; }
586586
QToolBar *advancedDigitizeToolBar() { return mAdvancedDigitizeToolBar; }
587+
QToolBar *shapeDigitizeToolBar() { return mShapeDigitizeToolBar; }
587588
QToolBar *attributesToolBar() { return mAttributesToolBar; }
588589
QToolBar *pluginToolBar() { return mPluginToolBar; }
589590
QToolBar *helpToolBar() { return mHelpToolBar; }

src/app/qgisappinterface.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ QToolBar *QgisAppInterface::layerToolBar() { return qgis->layerToolBar(); }
572572
QToolBar *QgisAppInterface::mapNavToolToolBar() { return qgis->mapNavToolToolBar(); }
573573
QToolBar *QgisAppInterface::digitizeToolBar() { return qgis->digitizeToolBar(); }
574574
QToolBar *QgisAppInterface::advancedDigitizeToolBar() { return qgis->advancedDigitizeToolBar(); }
575+
QToolBar *QgisAppInterface::shapeDigitizeToolBar() { return qgis->shapeDigitizeToolBar(); }
575576
QToolBar *QgisAppInterface::attributesToolBar() { return qgis->attributesToolBar(); }
576577
QToolBar *QgisAppInterface::pluginToolBar() { return qgis->pluginToolBar(); }
577578
QToolBar *QgisAppInterface::helpToolBar() { return qgis->helpToolBar(); }

src/app/qgisappinterface.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
371371
QToolBar *mapNavToolToolBar() override;
372372
QToolBar *digitizeToolBar() override;
373373
QToolBar *advancedDigitizeToolBar() override;
374+
QToolBar *shapeDigitizeToolBar() override;
374375
QToolBar *attributesToolBar() override;
375376
QToolBar *pluginToolBar() override;
376377
QToolBar *helpToolBar() override;

0 commit comments

Comments
 (0)