Show actions menu in feature form

m-kuhn · m-kuhn · commit 11eb9cfe57e9 · 2017-10-02T09:44:50.000+02:00
Fix #16889
diff --git a/src/app/qgsattributeactionpropertiesdialog.cpp b/src/app/qgsattributeactionpropertiesdialog.cpp
@@ -58,7 +58,7 @@ QgsAttributeActionPropertiesDialog::QgsAttributeActionPropertiesDialog( QgsVecto
   QSet<QString> defaultActionScopes;
   defaultActionScopes << QStringLiteral( "Canvas" )
                       << QStringLiteral( "FieldSpecific" )
-                      << QStringLiteral( "AttributeTableRow" )
+                      << QStringLiteral( "Feature" )
                       << QStringLiteral( "FeatureForm" );
 
   init( defaultActionScopes );
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -185,7 +185,7 @@ QWidget *QgsAttributeTableView::createActionWidget( QgsFeatureId fid )
     connect( act, &QAction::triggered, this, &QgsAttributeTableView::actionTriggered );
     actionList << act;
 
-    if ( mFilterModel->layer()->actions()->defaultAction( QStringLiteral( "AttributeTableRow" ) ).id() == action.id() )
+    if ( mFilterModel->layer()->actions()->defaultAction( QStringLiteral( "Feature" ) ).id() == action.id() )
       defaultAction = act;
   }
 
diff --git a/src/gui/attributetable/qgsfeaturelistview.cpp b/src/gui/attributetable/qgsfeaturelistview.cpp
@@ -297,7 +297,7 @@ void QgsFeatureListView::contextMenuEvent( QContextMenuEvent *event )
   {
     QgsFeature feature = mModel->data( index, QgsFeatureListModel::FeatureRole ).value<QgsFeature>();
 
-    QgsActionMenu *menu = new QgsActionMenu( mModel->layerCache()->layer(), feature, QStringLiteral( "AttributeTableRow" ), this );
+    QgsActionMenu *menu = new QgsActionMenu( mModel->layerCache()->layer(), feature, QStringLiteral( "Feature" ), this );
     menu->exec( event->globalPos() );
   }
 }
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -102,7 +102,7 @@ void QgsAttributeDialog::init( QgsVectorLayer *layer, QgsFeature *feature, const
   connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsAttributeDialog::accept );
   connect( layer, &QObject::destroyed, this, &QWidget::close );
 
-  QgsActionMenu *menu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "AttributeTableRow" ), this );
+  QgsActionMenu *menu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "Feature" ), this );
   if ( !menu->actions().isEmpty() )
   {
     QMenuBar *menuBar = new QMenuBar( this );
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -259,7 +259,7 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer *layer, const QList<QgsMapT
     createMenu = !mCustomActionRegistry.mapLayerActions( layer, QgsMapLayerAction::SingleFeature ).isEmpty();
     if ( !createMenu && mShowFeatureActions )
     {
-      QgsActionMenu *featureActionMenu = new QgsActionMenu( layer, results[0].mFeature, QStringLiteral( "AttributeTableRow" ), this );
+      QgsActionMenu *featureActionMenu = new QgsActionMenu( layer, results[0].mFeature, QStringLiteral( "Feature" ), this );
       createMenu  = !featureActionMenu->actions().isEmpty();
       delete featureActionMenu;
     }
@@ -344,7 +344,7 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer *layer, const QList<QgsMapT
     QList<QgsMapLayerAction *> customFeatureActions = mCustomActionRegistry.mapLayerActions( layer, QgsMapLayerAction::SingleFeature );
     if ( mShowFeatureActions )
     {
-      featureActionMenu = new QgsActionMenu( layer, result.mFeature, QStringLiteral( "AttributeTableRow" ), layerMenu );
+      featureActionMenu = new QgsActionMenu( layer, result.mFeature, QStringLiteral( "Feature" ), layerMenu );
     }
 
     // feature title

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ QWidget *QgsAttributeTableView::createActionWidget( QgsFeatureId fid )`
`185`	`185`	`connect( act, &QAction::triggered, this, &QgsAttributeTableView::actionTriggered );`
`186`	`186`	`actionList << act;`
`187`	`187`
`188`		`- if ( mFilterModel->layer()->actions()->defaultAction( QStringLiteral( "AttributeTableRow" ) ).id() == action.id() )`
	`188`	`+ if ( mFilterModel->layer()->actions()->defaultAction( QStringLiteral( "Feature" ) ).id() == action.id() )`
`189`	`189`	`defaultAction = act;`
`190`	`190`	`}`
`191`	`191`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ void QgsFeatureListView::contextMenuEvent( QContextMenuEvent *event )`
`297`	`297`	`{`
`298`	`298`	`QgsFeature feature = mModel->data( index, QgsFeatureListModel::FeatureRole ).value<QgsFeature>();`
`299`	`299`
`300`		`- QgsActionMenu *menu = new QgsActionMenu( mModel->layerCache()->layer(), feature, QStringLiteral( "AttributeTableRow" ), this );`
	`300`	`+ QgsActionMenu *menu = new QgsActionMenu( mModel->layerCache()->layer(), feature, QStringLiteral( "Feature" ), this );`
`301`	`301`	`menu->exec( event->globalPos() );`
`302`	`302`	`}`
`303`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void QgsAttributeDialog::init( QgsVectorLayer layer, QgsFeature feature, const`
`102`	`102`	`connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsAttributeDialog::accept );`
`103`	`103`	`connect( layer, &QObject::destroyed, this, &QWidget::close );`
`104`	`104`
`105`		`- QgsActionMenu *menu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "AttributeTableRow" ), this );`
	`105`	`+ QgsActionMenu *menu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "Feature" ), this );`
`106`	`106`	`if ( !menu->actions().isEmpty() )`
`107`	`107`	`{`
`108`	`108`	`QMenuBar *menuBar = new QMenuBar( this );`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer *layer, const QList<QgsMapT`
`259`	`259`	`createMenu = !mCustomActionRegistry.mapLayerActions( layer, QgsMapLayerAction::SingleFeature ).isEmpty();`
`260`	`260`	`if ( !createMenu && mShowFeatureActions )`
`261`	`261`	`{`
`262`		`- QgsActionMenu *featureActionMenu = new QgsActionMenu( layer, results[0].mFeature, QStringLiteral( "AttributeTableRow" ), this );`
	`262`	`+ QgsActionMenu *featureActionMenu = new QgsActionMenu( layer, results[0].mFeature, QStringLiteral( "Feature" ), this );`
`263`	`263`	`createMenu = !featureActionMenu->actions().isEmpty();`
`264`	`264`	`delete featureActionMenu;`
`265`	`265`	`}`
`@@ -344,7 +344,7 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer *layer, const QList<QgsMapT`
`344`	`344`	`QList<QgsMapLayerAction *> customFeatureActions = mCustomActionRegistry.mapLayerActions( layer, QgsMapLayerAction::SingleFeature );`
`345`	`345`	`if ( mShowFeatureActions )`
`346`	`346`	`{`
`347`		`- featureActionMenu = new QgsActionMenu( layer, result.mFeature, QStringLiteral( "AttributeTableRow" ), layerMenu );`
	`347`	`+ featureActionMenu = new QgsActionMenu( layer, result.mFeature, QStringLiteral( "Feature" ), layerMenu );`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`// feature title`