Persist default attribute action between sessions

Refs #15027
qgis · Jun 14, 2016 · 717e8c9 · 717e8c9
1 parent 0db9556
commit 717e8c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2035,6 +2035,7 @@ void QgisApp::createToolBars()
   bt->setDefaultAction( mActionFeatureAction );
   mFeatureActionMenu = new QMenu( bt );
   connect( mFeatureActionMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( updateDefaultFeatureAction( QAction * ) ) );
+  connect( mFeatureActionMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( doFeatureAction() ) );
   connect( mFeatureActionMenu, SIGNAL( aboutToShow() ), this, SLOT( refreshFeatureActions() ) );
   bt->setMenu( mFeatureActionMenu );
   QAction* featureActionAction = mAttributesToolBar->insertWidget( selectAction, bt );
@@ -5599,8 +5600,6 @@ void QgisApp::updateDefaultFeatureAction( QAction *action )
       QgsMapLayerActionRegistry::instance()->setDefaultActionForLayer( vlayer, nullptr );
     }
   }
-
-  doFeatureAction();
 }
 
 void QgisApp::refreshFeatureActions()
@@ -10588,17 +10587,14 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       }
 
       mActionOpenFieldCalc->setEnabled( true );
-
-      return;
     }
     else
     {
       mUndoDock->widget()->setEnabled( false );
       mActionUndo->setEnabled( false );
       mActionRedo->setEnabled( false );
+      mActionLayerSubsetString->setEnabled( false );
     }
-
-    mActionLayerSubsetString->setEnabled( false );
   } //end vector layer block
   /*************Raster layers*************/
   else if ( layer->type() == QgsMapLayer::RasterLayer )

diff --git a/src/core/qgsactionmanager.cpp b/src/core/qgsactionmanager.cpp
@@ -293,6 +293,7 @@ QString QgsActionManager::expandAction( const QString& action, QgsFeature &feat,
 bool QgsActionManager::writeXML( QDomNode& layer_node, QDomDocument& doc ) const
 {
   QDomElement aActions = doc.createElement( "attributeactions" );
+  aActions.setAttribute( "default", mDefaultAction );
 
   Q_FOREACH ( const QgsAction& action, mActions )
   {
@@ -319,6 +320,8 @@ bool QgsActionManager::readXML( const QDomNode& layer_node )
 
   if ( !aaNode.isNull() )
   {
+    mDefaultAction = aaNode.toElement().attribute( "default", 0 ).toInt();
+
     QDomNodeList actionsettings = aaNode.childNodes();
     for ( int i = 0; i < actionsettings.size(); ++i )
     {