Skip to content

Commit

Permalink
Group attribute table filter actions in a dedicated sub menu
Browse files Browse the repository at this point in the history 
to keep the Layer menu compact
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Jun 8, 2021
1 parent af7de9d commit d9382da
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
6 changes: 6 additions & 0 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -14822,6 +14822,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionSelectByForm->setEnabled( false );
mActionLabeling->setEnabled( false );
mActionOpenTable->setEnabled( false );
mMenuFilterTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
Expand Down Expand Up @@ -14975,6 +14976,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionSelectByExpression->setEnabled( true );
mActionSelectByForm->setEnabled( true );
mActionOpenTable->setEnabled( true );
mMenuFilterTable->setEnabled( true );
mActionOpenTableSelected->setEnabled( true );
mActionOpenTableVisible->setEnabled( true );
mActionOpenTableEdited->setEnabled( true );
Expand Down Expand Up @@ -15220,6 +15222,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionZoomActualSize->setEnabled( true );
mActionZoomToLayer->setEnabled( true );
mActionOpenTable->setEnabled( false );
mMenuFilterTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
Expand Down Expand Up @@ -15334,6 +15337,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionZoomActualSize->setEnabled( false );
mActionZoomToLayer->setEnabled( true );
mActionOpenTable->setEnabled( false );
mMenuFilterTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
Expand Down Expand Up @@ -15402,6 +15406,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionZoomActualSize->setEnabled( false );
mActionZoomToLayer->setEnabled( true );
mActionOpenTable->setEnabled( false );
mMenuFilterTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
Expand Down Expand Up @@ -15470,6 +15475,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionZoomActualSize->setEnabled( false );
mActionZoomToLayer->setEnabled( true );
mActionOpenTable->setEnabled( false );
mMenuFilterTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
Expand Down
12 changes: 9 additions & 3 deletions src/ui/qgisapp.ui
View file
Expand Up @@ -201,6 +201,14 @@
<addaction name="mActionAddVectorTileLayer"/>
<addaction name="mActionAddPointCloudLayer"/>
</widget>
<widget class="QMenu" name="mMenuFilterTable">
<property name="title">
<string>Filter Attribute Table</string>
</property>
<addaction name="mActionOpenTableSelected"/>
<addaction name="mActionOpenTableVisible"/>
<addaction name="mActionOpenTableEdited"/>
</widget>
<addaction name="mActionDataSourceManager"/>
<addaction name="mNewLayerMenu"/>
<addaction name="mAddLayerMenu"/>
Expand All @@ -214,9 +222,7 @@
<addaction name="mActionPasteLayer"/>
<addaction name="separator"/>
<addaction name="mActionOpenTable"/>
<addaction name="mActionOpenTableSelected"/>
<addaction name="mActionOpenTableVisible"/>
<addaction name="mActionOpenTableEdited"/>
<addaction name="mMenuFilterTable"/>
<addaction name="mActionToggleEditing"/>
<addaction name="mActionSaveLayerEdits"/>
<addaction name="mActionAllEdits"/>
Expand Down

0 comments on commit d9382da

Please sign in to comment.