Merge pull request #2629 from SebDieBln/FixStyleManagerGroupingMode

nyalldawson · nyalldawson · commit 90eaba9f4f78 · 2016-01-05T13:26:08.000+11:00
[StyleManager] Keep group actions enabled while in grouping mode (fixes #14049)
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -1252,7 +1252,7 @@ void QgsStyleV2ManagerDialog::enableSymbolInputs( bool enable )
   groupTree->setEnabled( enable );
   btnAddGroup->setEnabled( enable );
   btnRemoveGroup->setEnabled( enable );
-  btnManageGroups->setEnabled( enable );
+  btnManageGroups->setEnabled( enable || mGrouppingMode ); // always enabled in grouping mode, as it is the only way to leave grouping mode
   searchBox->setEnabled( enable );
   tagsLineEdit->setEnabled( enable );
 }
@@ -1261,7 +1261,7 @@ void QgsStyleV2ManagerDialog::enableGroupInputs( bool enable )
 {
   btnAddGroup->setEnabled( enable );
   btnRemoveGroup->setEnabled( enable );
-  btnManageGroups->setEnabled( enable );
+  btnManageGroups->setEnabled( enable || mGrouppingMode ); // always enabled in grouping mode, as it is the only way to leave grouping mode
 }
 
 void QgsStyleV2ManagerDialog::enableItemsForGroupingMode( bool enable )

Original file line number	Diff line number	Diff line change
`@@ -1252,7 +1252,7 @@ void QgsStyleV2ManagerDialog::enableSymbolInputs( bool enable )`
`1252`	`1252`	`groupTree->setEnabled( enable );`
`1253`	`1253`	`btnAddGroup->setEnabled( enable );`
`1254`	`1254`	`btnRemoveGroup->setEnabled( enable );`
`1255`		`- btnManageGroups->setEnabled( enable );`
	`1255`	`+ btnManageGroups->setEnabled( enable \|\| mGrouppingMode ); // always enabled in grouping mode, as it is the only way to leave grouping mode`
`1256`	`1256`	`searchBox->setEnabled( enable );`
`1257`	`1257`	`tagsLineEdit->setEnabled( enable );`
`1258`	`1258`	`}`
`@@ -1261,7 +1261,7 @@ void QgsStyleV2ManagerDialog::enableGroupInputs( bool enable )`
`1261`	`1261`	`{`
`1262`	`1262`	`btnAddGroup->setEnabled( enable );`
`1263`	`1263`	`btnRemoveGroup->setEnabled( enable );`
`1264`		`- btnManageGroups->setEnabled( enable );`
	`1264`	`+ btnManageGroups->setEnabled( enable \|\| mGrouppingMode ); // always enabled in grouping mode, as it is the only way to leave grouping mode`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`	`1267`	`void QgsStyleV2ManagerDialog::enableItemsForGroupingMode( bool enable )`