Fix missing actions menu when only internal actions are present

Follow up bcf0e48
qgis · Dec 20, 2022 · f567046 · f567046
1 parent fa2edbb
commit f567046
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 10 deletions.
diff --git a/python/gui/auto_generated/qgsactionmenu.sip.in b/python/gui/auto_generated/qgsactionmenu.sip.in
@@ -99,6 +99,13 @@ Returns an expression context scope used to resolve underlying actions.
 Returns menu actions
 
 .. versionadded:: 3.12
+%End
+
+    bool isEmpty() const;
+%Docstring
+Returns ``True`` if the menu has no valid actions.
+
+.. versionadded:: 3.30
 %End
 
   signals:

diff --git a/src/gui/qgsactionmenu.cpp b/src/gui/qgsactionmenu.cpp
@@ -113,6 +113,8 @@ void QgsActionMenu::reloadActions()
 {
   clear();
 
+  mVisibleActionCount = 0;
+
   mActions = mLayer->actions()->actions( mActionScope );
 
   const auto constMActions = mActions;
@@ -143,26 +145,30 @@ void QgsActionMenu::reloadActions()
     }
     connect( qAction, &QAction::triggered, this, &QgsActionMenu::triggerAction );
     addAction( qAction );
+
+    mVisibleActionCount++;
   }
 
   const QList<QgsMapLayerAction *> mapLayerActions = QgsGui::mapLayerActionRegistry()->mapLayerActions( mLayer, QgsMapLayerAction::SingleFeature );
 
   if ( !mapLayerActions.isEmpty() )
   {
     //add a separator between user defined and standard actions
-    addSeparator();
+    if ( mVisibleActionCount > 0 )
+      addSeparator();
 
     for ( int i = 0; i < mapLayerActions.size(); ++i )
     {
-      QgsMapLayerAction *qaction = mapLayerActions.at( i );
+      QgsMapLayerAction *mapLayerAction = mapLayerActions.at( i );
 
-      if ( qaction->isEnabledOnlyWhenEditable() && ( mMode == QgsAttributeEditorContext::AddFeatureMode || mMode == QgsAttributeEditorContext::IdentifyMode ) )
+      if ( mapLayerAction->isEnabledOnlyWhenEditable() && ( mMode == QgsAttributeEditorContext::AddFeatureMode || mMode == QgsAttributeEditorContext::IdentifyMode ) )
         continue;
 
-      QAction *qAction = new QAction( qaction->icon(), qaction->text(), this );
-      qAction->setData( QVariant::fromValue<ActionData>( ActionData( qaction, mFeatureId, mLayer ) ) );
+      QAction *qAction = new QAction( mapLayerAction->icon(), mapLayerAction->text(), this );
+      qAction->setData( QVariant::fromValue<ActionData>( ActionData( mapLayerAction, mFeatureId, mLayer ) ) );
       addAction( qAction );
       connect( qAction, &QAction::triggered, this, &QgsActionMenu::triggerAction );
+      mVisibleActionCount++;
     }
   }
 
@@ -210,3 +216,8 @@ QList<QgsAction> QgsActionMenu::menuActions()
 {
   return mActions;
 }
+
+bool QgsActionMenu::isEmpty() const
+{
+  return mVisibleActionCount == 0;
+}
diff --git a/src/gui/qgsactionmenu.h b/src/gui/qgsactionmenu.h
@@ -119,6 +119,13 @@ class GUI_EXPORT QgsActionMenu : public QMenu
      */
     QList<QgsAction> menuActions();
 
+    /**
+     * Returns TRUE if the menu has no valid actions.
+     *
+     * \since QGIS 3.30
+     */
+    bool isEmpty() const;
+
   signals:
     void reinit();
 
@@ -132,12 +139,13 @@ class GUI_EXPORT QgsActionMenu : public QMenu
     QgsFeature feature();
 
     QgsVectorLayer *mLayer = nullptr;
+    int mVisibleActionCount = 0;
     QList<QgsAction> mActions;
     QgsFeature mFeature;
     QgsFeatureId mFeatureId;
     QString mActionScope;
     QgsExpressionContextScope mExpressionContextScope;
-    QgsAttributeEditorContext::Mode mMode;
+    QgsAttributeEditorContext::Mode mMode = QgsAttributeEditorContext::SingleEditMode;
 };
 
 

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -125,11 +125,11 @@ void QgsAttributeDialog::init( QgsVectorLayer *layer, QgsFeature *feature, const
   connect( layer, &QObject::destroyed, this, &QWidget::close );
 
   mMenu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "Feature" ), this );
-  if ( !mMenu->menuActions().isEmpty() )
+  if ( !mMenu->isEmpty() )
   {
-    QMenuBar *menuBar = new QMenuBar( this );
-    menuBar->addMenu( mMenu );
-    layout()->setMenuBar( menuBar );
+    mMenuBar = new QMenuBar( this );
+    mMenuBar->addMenu( mMenu );
+    layout()->setMenuBar( mMenuBar );
   }
 
   restoreGeometry();
@@ -140,6 +140,19 @@ void QgsAttributeDialog::setMode( QgsAttributeEditorContext::Mode mode )
 {
   mAttributeForm->setMode( mode );
   mMenu->setMode( mode );
+
+  if ( !mMenu->isEmpty() && !mMenuBar )
+  {
+    mMenuBar = new QMenuBar( this );
+    mMenuBar->addMenu( mMenu );
+    layout()->setMenuBar( mMenuBar );
+  }
+  else if ( mMenu->isEmpty() && mMenuBar )
+  {
+    layout()->setMenuBar( nullptr );
+    delete mMenuBar;
+    mMenuBar = nullptr;
+  }
 }
 
 bool QgsAttributeDialog::event( QEvent *e )

diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -129,6 +129,7 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog
     bool mEditable;
 
     QgsActionMenu *mMenu;
+    QMenuBar *mMenuBar = nullptr;
 
     static int sFormCounter;