show selected selection or measure tool in toolbutton

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14102 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 17, 2010 · ac48389 · ac48389
1 parent 9b464cc
commit ac48389
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1720,6 +1720,7 @@ void QgisApp::createToolBars()
   menu->addAction( mActionSelectRadius );
   bt->setDefaultAction( mActionSelect );
   mAttributesToolBar->addWidget( bt );
+  connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
 
   mAttributesToolBar->addAction( mActionDeselectAll );
   mAttributesToolBar->addAction( mActionOpenTable );
@@ -1733,6 +1734,7 @@ void QgisApp::createToolBars()
   menu->addAction( mActionMeasureAngle );
   bt->setDefaultAction( mActionMeasure );
   mAttributesToolBar->addWidget( bt );
+  connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
 
   mAttributesToolBar->addAction( mActionMapTips );
   mAttributesToolBar->addAction( mActionShowBookmarks );
@@ -7026,3 +7028,12 @@ void QgisApp::completeInitialization()
 {
   emit initializationCompleted();
 }
+
+void QgisApp::toolButtonActionTriggered( QAction *action )
+{
+  QToolButton *bt = qobject_cast<QToolButton *>( sender() );
+  if ( !bt )
+    return;
+
+  bt->setDefaultAction( action );
+}
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -437,6 +437,9 @@ class QgisApp : public QMainWindow
     void namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
 #endif
 
+    //! update default action of toolbutton
+    void toolButtonActionTriggered( QAction * );
+
   protected:
 
     //! Handle state changes (WindowTitleChange)