fix #17652 Impossible to rename a layer style from the Styling Panel (#9041)

PeterPetrik · web-flow · commit ef97dba155c3 · 2019-01-31T09:36:46.000+01:00
fix #17652 Impossible to rename a layer style from the Styling Panel
diff --git a/src/gui/qgsmaplayerstylemanagerwidget.cpp b/src/gui/qgsmaplayerstylemanagerwidget.cpp
@@ -78,15 +78,18 @@ QgsMapLayerStyleManagerWidget::QgsMapLayerStyleManagerWidget( QgsMapLayer *layer
 
   mModel->clear();
 
-  Q_FOREACH ( const QString name, mLayer->styleManager()->styles() )
+  const QStringList styles = mLayer->styleManager()->styles();
+  for ( const QString &styleName : styles )
   {
-    QString stylename = name;
-    QStandardItem *item = new QStandardItem( stylename );
+    QStandardItem *item = new QStandardItem( styleName );
+    item->setData( styleName );
     mModel->appendRow( item );
   }
 
   QString active = mLayer->styleManager()->currentStyle();
   currentStyleChanged( active );
+
+  connect( mModel, &QStandardItemModel::itemChanged, this, &QgsMapLayerStyleManagerWidget::renameStyle );
 }
 
 void QgsMapLayerStyleManagerWidget::styleClicked( const QModelIndex &index )
@@ -113,6 +116,7 @@ void QgsMapLayerStyleManagerWidget::styleAdded( const QString &name )
 {
   QgsDebugMsg( QStringLiteral( "Style added" ) );
   QStandardItem *item = new QStandardItem( name );
+  item->setData( name );
   mModel->appendRow( item );
 }
 
@@ -134,6 +138,7 @@ void QgsMapLayerStyleManagerWidget::styleRenamed( const QString &oldname, const
 
   QStandardItem *item = items.at( 0 );
   item->setText( newname );
+  item->setData( newname );
 }
 
 void QgsMapLayerStyleManagerWidget::addStyle()
@@ -176,6 +181,14 @@ void QgsMapLayerStyleManagerWidget::removeStyle()
 
 }
 
+void QgsMapLayerStyleManagerWidget::renameStyle( QStandardItem *item )
+{
+  const QString oldName = item->data().toString();
+  const QString newName = item->text();
+  item->setData( newName );
+  whileBlocking( this )->mLayer->styleManager()->renameStyle( oldName, newName );
+}
+
 void QgsMapLayerStyleManagerWidget::saveAsDefault()
 {
   QString errorMsg;
diff --git a/src/gui/qgsmaplayerstylemanagerwidget.h b/src/gui/qgsmaplayerstylemanagerwidget.h
@@ -55,6 +55,7 @@ class GUI_EXPORT QgsMapLayerStyleManagerWidget : public QgsMapLayerConfigWidget
     void styleRenamed( const QString &oldname, const QString &newname );
     void addStyle();
     void removeStyle();
+    void renameStyle( QStandardItem *item );
     void saveAsDefault();
     void loadDefault();
     void saveStyle();

Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,18 @@ QgsMapLayerStyleManagerWidget::QgsMapLayerStyleManagerWidget( QgsMapLayer *layer`
`78`	`78`
`79`	`79`	`mModel->clear();`
`80`	`80`
`81`		`- Q_FOREACH ( const QString name, mLayer->styleManager()->styles() )`
	`81`	`+ const QStringList styles = mLayer->styleManager()->styles();`
	`82`	`+ for ( const QString &styleName : styles )`
`82`	`83`	`{`
`83`		`- QString stylename = name;`
`84`		`- QStandardItem *item = new QStandardItem( stylename );`
	`84`	`+ QStandardItem *item = new QStandardItem( styleName );`
	`85`	`+ item->setData( styleName );`
`85`	`86`	`mModel->appendRow( item );`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`QString active = mLayer->styleManager()->currentStyle();`
`89`	`90`	`currentStyleChanged( active );`
	`91`	`+`
	`92`	`+ connect( mModel, &QStandardItemModel::itemChanged, this, &QgsMapLayerStyleManagerWidget::renameStyle );`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`void QgsMapLayerStyleManagerWidget::styleClicked( const QModelIndex &index )`
`@@ -113,6 +116,7 @@ void QgsMapLayerStyleManagerWidget::styleAdded( const QString &name )`
`113`	`116`	`{`
`114`	`117`	`QgsDebugMsg( QStringLiteral( "Style added" ) );`
`115`	`118`	`QStandardItem *item = new QStandardItem( name );`
	`119`	`+ item->setData( name );`
`116`	`120`	`mModel->appendRow( item );`
`117`	`121`	`}`
`118`	`122`
`@@ -134,6 +138,7 @@ void QgsMapLayerStyleManagerWidget::styleRenamed( const QString &oldname, const`
`134`	`138`
`135`	`139`	`QStandardItem *item = items.at( 0 );`
`136`	`140`	`item->setText( newname );`
	`141`	`+ item->setData( newname );`
`137`	`142`	`}`
`138`	`143`
`139`	`144`	`void QgsMapLayerStyleManagerWidget::addStyle()`
`@@ -176,6 +181,14 @@ void QgsMapLayerStyleManagerWidget::removeStyle()`
`176`	`181`
`177`	`182`	`}`
`178`	`183`
	`184`	`+void QgsMapLayerStyleManagerWidget::renameStyle( QStandardItem *item )`
	`185`	`+{`
	`186`	`+ const QString oldName = item->data().toString();`
	`187`	`+ const QString newName = item->text();`
	`188`	`+ item->setData( newName );`
	`189`	`+ whileBlocking( this )->mLayer->styleManager()->renameStyle( oldName, newName );`
	`190`	`+}`
	`191`	`+`
`179`	`192`	`void QgsMapLayerStyleManagerWidget::saveAsDefault()`
`180`	`193`	`{`
`181`	`194`	`QString errorMsg;`