use a dedicated button to show the table

qgis · Jan 20, 2018 · 280af20 · 280af20
1 parent b6ffac3
commit 280af20
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -111,18 +111,9 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
   modeMenu->addAction( mAdvancedModeAction );
   if ( mDisplayMode == ToolBar )
   {
-    QMenu *advConfigMenu = new QMenu( this );
-    QWidgetAction *advConfigWidgetAction = new QWidgetAction( advConfigMenu );
-    advConfigWidgetAction->setDefaultWidget( mLayerTreeView );
-    advConfigMenu->addAction( advConfigWidgetAction );
-    mEditAdvancedConfigAction = new QAction( tr( "Edit advanced configuration" ), modeMenu );
-    mEditAdvancedConfigAction->setMenu( advConfigMenu );
-
+    modeMenu->addSeparator();
     QAction *openDialogAction = new QAction( tr( "Open snapping options" ), modeMenu );
     connect( openDialogAction, &QAction::triggered, QgisApp::instance(), &QgisApp::snappingOptions );
-
-    modeMenu->addSeparator();
-    modeMenu->addAction( mEditAdvancedConfigAction );
     modeMenu->addAction( openDialogAction );
   }
   mModeButton->setMenu( modeMenu );
@@ -215,6 +206,21 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
     // hiding widget in a toolbar is not possible, actions are required
     tb->addAction( mEnabledAction );
     mModeAction = tb->addWidget( mModeButton );
+
+    // edit advanced config button
+    QToolButton *advConfigButton = new QToolButton( this );
+    advConfigButton->setPopupMode( QToolButton::InstantPopup );
+    QMenu *advConfigMenu = new QMenu( this );
+    QWidgetAction *advConfigWidgetAction = new QWidgetAction( advConfigMenu );
+    advConfigWidgetAction->setDefaultWidget( mLayerTreeView );
+    advConfigMenu->addAction( advConfigWidgetAction );
+    advConfigButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.svg" ) ) );
+    advConfigButton->setToolTip( tr( "Edit avdanced configuration" ) );
+    advConfigButton->setObjectName( QStringLiteral( "EditAdvancedConfigurationButton" ) );
+    advConfigButton->setMenu( advConfigMenu );
+    mEditAdvancedConfigAction = tb->addWidget( advConfigButton );
+
+    // other buttons / actions
     mTypeAction = tb->addWidget( mTypeButton );
     mToleranceAction = tb->addWidget( mToleranceSpinBox );
     mUnitAction = tb->addWidget( mUnitsComboBox );