Merge pull request #5900 from m-kuhn/layerPropsStyleInTitle

Show style name in layer properties dialog title
qgis · Jan 11, 2018 · f76421d · f76421d
2 parents e137ea8 + bb40de3
commit f76421d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/python/core/qgsmaplayerstylemanager.sip b/python/core/qgsmaplayerstylemanager.sip
@@ -193,6 +193,13 @@ Each call must be paired with restoreOverrideStyle()
     bool restoreOverrideStyle();
 %Docstring
 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
 %End
 
   signals:

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -445,6 +445,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv
   mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUndo.svg" ) ) );
 
   QString title = QString( tr( "Layer Properties - %1" ) ).arg( lyr->name() );
+
+  if ( !mRasterLayer->styleManager()->isDefault( mRasterLayer->styleManager()->currentStyle() ) )
+    title += QStringLiteral( " (%1)" ).arg( mRasterLayer->styleManager()->currentStyle() );
   restoreOptionsBaseUi( title );
   optionsStackedWidget_CurrentChanged( mOptionsStackedWidget->currentIndex() );
 } // QgsRasterLayerProperties ctor

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -358,6 +358,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 );