Add 'Copy to default' action as a dedicated button when browsing non-default style

nyalldawson · nyalldawson · commit 1a45c8c0391e · 2019-01-16T12:04:34.000+11:00
diff --git a/src/gui/symbology/qgsstylemanagerdialog.cpp b/src/gui/symbology/qgsstylemanagerdialog.cpp
@@ -205,9 +205,14 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle *style, QWidget *parent,
   }
   if ( mStyle != QgsStyle::defaultStyle() )
   {
-    mActionCopyToDefault = new QAction( tr( "Copy Selection to Default Style" ), this );
+    mActionCopyToDefault = new QAction( tr( "Copy Selection to Default Style…" ), this );
     shareMenu->addAction( mActionCopyToDefault );
     connect( mActionCopyToDefault, &QAction::triggered, this, &QgsStyleManagerDialog::copyItemsToDefault );
+    connect( mCopyToDefaultButton, &QPushButton::clicked, this, &QgsStyleManagerDialog::copyItemsToDefault );
+  }
+  else
+  {
+    mCopyToDefaultButton->hide();
   }
 
   shareMenu->addSeparator();
@@ -386,6 +391,9 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle *style, QWidget *parent,
     // note -- we have to save state here and not in destructor, as new symbol list widgets are created before the previous ones are destroyed
     QgsSettings().setValue( QStringLiteral( "Windows/StyleV2Manager/treeState" ), mSymbolTreeView->header()->saveState(), QgsSettings::Gui );
   } );
+
+  // set initial disabled state for actions requiring a selection
+  selectedSymbolsChanged( QItemSelection(), QItemSelection() );
 }
 
 void QgsStyleManagerDialog::onFinished()
@@ -1596,6 +1604,7 @@ void QgsStyleManagerDialog::selectedSymbolsChanged( const QItemSelection &select
   actnExportAsSVG->setDisabled( nothingSelected );
   if ( mActionCopyToDefault )
     mActionCopyToDefault->setDisabled( nothingSelected );
+  mCopyToDefaultButton->setDisabled( nothingSelected );
   actnEditItem->setDisabled( nothingSelected || mReadOnly );
 }
 
diff --git a/src/ui/qgsstylemanagerdialogbase.ui b/src/ui/qgsstylemanagerdialogbase.ui
@@ -189,6 +189,16 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="mCopyToDefaultButton">
+           <property name="toolTip">
+            <string>Copies the selected items to the default style library</string>
+           </property>
+           <property name="text">
+            <string>Copy to Default Style…</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@@ -625,6 +635,7 @@
   <tabstop>btnAddItem</tabstop>
   <tabstop>btnRemoveItem</tabstop>
   <tabstop>btnEditItem</tabstop>
+  <tabstop>mCopyToDefaultButton</tabstop>
   <tabstop>mButtonIconView</tabstop>
   <tabstop>mButtonListView</tabstop>
   <tabstop>searchBox</tabstop>

Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,14 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle style, QWidget parent,`
`205`	`205`	`}`
`206`	`206`	`if ( mStyle != QgsStyle::defaultStyle() )`
`207`	`207`	`{`
`208`		`- mActionCopyToDefault = new QAction( tr( "Copy Selection to Default Style" ), this );`
	`208`	`+ mActionCopyToDefault = new QAction( tr( "Copy Selection to Default Style…" ), this );`
`209`	`209`	`shareMenu->addAction( mActionCopyToDefault );`
`210`	`210`	`connect( mActionCopyToDefault, &QAction::triggered, this, &QgsStyleManagerDialog::copyItemsToDefault );`
	`211`	`+ connect( mCopyToDefaultButton, &QPushButton::clicked, this, &QgsStyleManagerDialog::copyItemsToDefault );`
	`212`	`+ }`
	`213`	`+ else`
	`214`	`+ {`
	`215`	`+ mCopyToDefaultButton->hide();`
`211`	`216`	`}`
`212`	`217`
`213`	`218`	`shareMenu->addSeparator();`
`@@ -386,6 +391,9 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle style, QWidget parent,`
`386`	`391`	`// note -- we have to save state here and not in destructor, as new symbol list widgets are created before the previous ones are destroyed`
`387`	`392`	`QgsSettings().setValue( QStringLiteral( "Windows/StyleV2Manager/treeState" ), mSymbolTreeView->header()->saveState(), QgsSettings::Gui );`
`388`	`393`	`} );`
	`394`	`+`
	`395`	`+ // set initial disabled state for actions requiring a selection`
	`396`	`+ selectedSymbolsChanged( QItemSelection(), QItemSelection() );`
`389`	`397`	`}`
`390`	`398`
`391`	`399`	`void QgsStyleManagerDialog::onFinished()`
`@@ -1596,6 +1604,7 @@ void QgsStyleManagerDialog::selectedSymbolsChanged( const QItemSelection &select`
`1596`	`1604`	`actnExportAsSVG->setDisabled( nothingSelected );`
`1597`	`1605`	`if ( mActionCopyToDefault )`
`1598`	`1606`	`mActionCopyToDefault->setDisabled( nothingSelected );`
	`1607`	`+ mCopyToDefaultButton->setDisabled( nothingSelected );`
`1599`	`1608`	`actnEditItem->setDisabled( nothingSelected \|\| mReadOnly );`
`1600`	`1609`	`}`
`1601`	`1610`