Skip to content

Commit

Permalink
Only show Select and digitizing-based menus in the Edit menu
Browse files Browse the repository at this point in the history 
when appropriate (if not empty project and/or a compatible layer)

fixes #38470
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Sep 20, 2020
1 parent 9305e22 commit d5f2711
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -14288,6 +14288,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )

if ( !layer )
{
menuSelect->setEnabled( false );
mActionSelectFeatures->setEnabled( false );
mActionSelectPolygon->setEnabled( false );
mActionSelectFreehand->setEnabled( false );
Expand All @@ -14313,19 +14314,23 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionAddFeature->setEnabled( false );
mActionCircularStringCurvePoint->setEnabled( false );
mActionCircularStringRadius->setEnabled( false );
mMenuCircle->setEnabled( false );
mActionCircle2Points->setEnabled( false );
mActionCircle3Points->setEnabled( false );
mActionCircle3Tangents->setEnabled( false );
mActionCircle2TangentsPoint->setEnabled( false );
mActionCircleCenterPoint->setEnabled( false );
mMenuEllipse->setEnabled( false );
mActionEllipseCenter2Points->setEnabled( false );
mActionEllipseCenterPoint->setEnabled( false );
mActionEllipseExtent->setEnabled( false );
mActionEllipseFoci->setEnabled( false );
mMenuRectangle->setEnabled( false );
mActionRectangleCenterPoint->setEnabled( false );
mActionRectangleExtent->setEnabled( false );
mActionRectangle3PointsDistance->setEnabled( false );
mActionRectangle3PointsProjected->setEnabled( false );
mMenuRegularPolygon->setEnabled( false );
mActionRegularPolygon2Points->setEnabled( false );
mActionRegularPolygonCenterPoint->setEnabled( false );
mActionRegularPolygonCenterCorner->setEnabled( false );
Expand Down Expand Up @@ -14391,6 +14396,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
return;
}

menuSelect->setEnabled( true );

mActionLayerProperties->setEnabled( QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() );
mActionAddToOverview->setEnabled( true );
mActionZoomToLayer->setEnabled( true );
Expand Down Expand Up @@ -14487,19 +14494,23 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
enableShapeTools = enableCircularTools;
mActionCircularStringCurvePoint->setEnabled( enableCircularTools );
mActionCircularStringRadius->setEnabled( enableCircularTools );
mMenuCircle->setEnabled( enableShapeTools );
mActionCircle2Points->setEnabled( enableShapeTools );
mActionCircle3Points->setEnabled( enableShapeTools );
mActionCircle3Tangents->setEnabled( enableShapeTools );
mActionCircle2TangentsPoint->setEnabled( enableShapeTools );
mActionCircleCenterPoint->setEnabled( enableShapeTools );
mMenuEllipse->setEnabled( enableShapeTools );
mActionEllipseCenter2Points->setEnabled( enableShapeTools );
mActionEllipseCenterPoint->setEnabled( enableShapeTools );
mActionEllipseExtent->setEnabled( enableShapeTools );
mActionEllipseFoci->setEnabled( enableShapeTools );
mMenuRectangle->setEnabled( enableShapeTools );
mActionRectangleCenterPoint->setEnabled( enableShapeTools );
mActionRectangleExtent->setEnabled( enableShapeTools );
mActionRectangle3PointsDistance->setEnabled( enableShapeTools );
mActionRectangle3PointsProjected->setEnabled( enableShapeTools );
mMenuRegularPolygon->setEnabled( enableShapeTools );
mActionRegularPolygon2Points->setEnabled( enableShapeTools );
mActionRegularPolygonCenterPoint->setEnabled( enableShapeTools );
mActionRegularPolygonCenterCorner->setEnabled( enableShapeTools );
Expand Down Expand Up @@ -14694,19 +14705,23 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionAddFeature->setEnabled( false );
mActionCircularStringCurvePoint->setEnabled( false );
mActionCircularStringRadius->setEnabled( false );
mMenuCircle->setEnabled( false );
mActionCircle2Points->setEnabled( false );
mActionCircle3Points->setEnabled( false );
mActionCircle3Tangents->setEnabled( false );
mActionCircle2TangentsPoint->setEnabled( false );
mActionCircleCenterPoint->setEnabled( false );
mMenuEllipse->setEnabled( false );
mActionEllipseCenter2Points->setEnabled( false );
mActionEllipseCenterPoint->setEnabled( false );
mActionEllipseExtent->setEnabled( false );
mActionEllipseFoci->setEnabled( false );
mMenuRectangle->setEnabled( false );
mActionRectangleCenterPoint->setEnabled( false );
mActionRectangleExtent->setEnabled( false );
mActionRectangle3PointsDistance->setEnabled( false );
mActionRectangle3PointsProjected->setEnabled( false );
mMenuRegularPolygon->setEnabled( false );
mActionRegularPolygon2Points->setEnabled( false );
mActionRegularPolygonCenterPoint->setEnabled( false );
mActionRegularPolygonCenterCorner->setEnabled( false );
Expand Down

0 comments on commit d5f2711

Please sign in to comment.