Show style name in layer properties dialog title

m-kuhn · m-kuhn · commit 944b587eee0a · 2017-12-18T15:42:24.000+01:00
diff --git a/python/core/qgsmaplayerstylemanager.sip b/python/core/qgsmaplayerstylemanager.sip
@@ -195,6 +195,14 @@ Each call must be paired with restoreOverrideStyle()
 Restore the original store after a call to setOverrideStyle()
 %End
 
+    bool isDefault( const QString &styleName ) const;
+%Docstring
+ Returns true if this is the default style
+
+.. versionadded:: 3.0
+ :rtype: bool
+%End
+
   signals:
     void styleAdded( const QString &name );
 %Docstring
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -347,6 +347,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   }
 
   QString title = QString( tr( "Layer Properties - %1" ) ).arg( mLayer->name() );
+  if ( !mLayer->styleManager()->isDefault( mLayer->styleManager()->currentStyle() ) )
+    title += QStringLiteral( " (%1)" ).arg( mLayer->styleManager()->currentStyle() );
   restoreOptionsBaseUi( title );
 
   mLayersDependenciesTreeGroup.reset( QgsProject::instance()->layerTreeRoot()->clone() );
diff --git a/src/core/qgsmaplayerstylemanager.cpp b/src/core/qgsmaplayerstylemanager.cpp
@@ -224,6 +224,11 @@ bool QgsMapLayerStyleManager::restoreOverrideStyle()
   return true;
 }
 
+bool QgsMapLayerStyleManager::isDefault( const QString &styleName ) const
+{
+  return styleName == defaultStyleName();
+}
+
 
 // -----
 
diff --git a/src/core/qgsmaplayerstylemanager.h b/src/core/qgsmaplayerstylemanager.h
@@ -165,6 +165,13 @@ class CORE_EXPORT QgsMapLayerStyleManager : public QObject
     //! Restore the original store after a call to setOverrideStyle()
     bool restoreOverrideStyle();
 
+    /**
+     * Returns true if this is the default style
+     *
+     * \since QGIS 3.0
+     */
+    bool isDefault( const QString &styleName ) const;
+
   signals:
     //! Emitted when a new style has been added
     void styleAdded( const QString &name );

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`QString title = QString( tr( "Layer Properties - %1" ) ).arg( mLayer->name() );`
	`350`	`+ if ( !mLayer->styleManager()->isDefault( mLayer->styleManager()->currentStyle() ) )`
	`351`	`+ title += QStringLiteral( " (%1)" ).arg( mLayer->styleManager()->currentStyle() );`
`350`	`352`	`restoreOptionsBaseUi( title );`
`351`	`353`
`352`	`354`	`mLayersDependenciesTreeGroup.reset( QgsProject::instance()->layerTreeRoot()->clone() );`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,11 @@ bool QgsMapLayerStyleManager::restoreOverrideStyle()`
`224`	`224`	`return true;`
`225`	`225`	`}`
`226`	`226`
	`227`	`+bool QgsMapLayerStyleManager::isDefault( const QString &styleName ) const`
	`228`	`+{`
	`229`	`+ return styleName == defaultStyleName();`
	`230`	`+}`
	`231`	`+`
`227`	`232`
`228`	`233`	`// -----`
`229`	`234`