Fix #7134

NathanW2 · dakcarto · commit 87ca653e8987 · 2013-05-29T15:38:04.000-06:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8758,7 +8758,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
     QgsVectorLayerProperties *vlp = NULL; // See note above about reusing this
     if ( vlp )
     {
-      vlp->reset();
+      vlp->syncToLayer();
     }
     else
     {
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
@@ -40,6 +40,7 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
     void writeSettingsToLayer();
 
   public slots:
+    void init();
     void collapseSample( bool collapse );
     void apply();
     void changeTextColor( const QColor &color );
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -171,7 +171,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   connect( mFieldsPropertiesDialog, SIGNAL( toggleEditing() ), this, SLOT( toggleEditing() ) );
   connect( this, SIGNAL( toggleEditing( QgsMapLayer* ) ), QgisApp::instance(), SLOT( toggleEditing( QgsMapLayer* ) ) );
 
-  reset();
+  syncToLayer();
 
   if ( layer->dataProvider() )//enable spatial index button group if supported by provider
   {
@@ -337,7 +337,7 @@ void QgsVectorLayerProperties::setDisplayField( QString name )
 }
 
 //! @note in raster props, this method is called sync()
-void QgsVectorLayerProperties::reset( void )
+void QgsVectorLayerProperties::syncToLayer( void )
 {
   // populate the general information
   mLayerOrigNameLineEdit->setText( layer->originalName() );
@@ -393,6 +393,7 @@ void QgsVectorLayerProperties::reset( void )
   layer->label()->setFields( layer->pendingFields() );
 
   actionDialog->init();
+  labelingDialog->init();
 
   if ( layer->hasGeometryType() )
   {
@@ -605,7 +606,7 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
         }
         else
         {
-          reset();
+          syncToLayer();
         }
 
         return;
@@ -621,7 +622,7 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
   if ( defaultLoadedFlag )
   {
     // all worked ok so no need to inform user
-    reset();
+    syncToLayer();
   }
   else
   {
@@ -696,7 +697,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
   //reset if the default style was loaded ok only
   if ( defaultLoadedFlag )
   {
-    reset();
+    syncToLayer();
   }
   else
   {
@@ -813,7 +814,7 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
     //reset if the default style was loaded ok only
     if ( defaultLoadedFlag )
     {
-      reset();
+      syncToLayer();
     }
     else
     {
@@ -875,7 +876,7 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()
     }
     if ( layer->applyNamedStyle( qmlStyle, errorMsg ) )
     {
-      reset();
+      syncToLayer();
     }
     else
     {
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -81,7 +81,7 @@ class QgsVectorLayerProperties : public QgsOptionsDialogBase, private Ui::QgsVec
     void insertExpression();
 
     /** Reset to original (vector layer) values */
-    void reset();
+    void syncToLayer();
 
     /** Get metadata about the layer in nice formatted html */
     QString metadata();
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -942,7 +942,7 @@ QString QgsMapLayer::saveDefaultStyle( bool & theResultFlag )
   return saveNamedStyle( styleURI(), theResultFlag );
 }
 
-QString QgsMapLayer::saveNamedStyle( const QString theURI, bool & theResultFlag )
+QString QgsMapLayer:: saveNamedStyle( const QString theURI, bool & theResultFlag )
 {
   QString myErrorMessage;
   QDomDocument myDocument;
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3914,16 +3914,13 @@ QString QgsVectorLayer::loadNamedStyle( const QString theURI, bool &theResultFla
         if ( !qml.isEmpty() )
         {
           theResultFlag = this->applyNamedStyle( qml, errorMsg );
+          return QObject::tr( "Loaded from Provider" );
         }
       }
     }
-
-  }
-  if ( !theResultFlag )
-  {
-    return QgsMapLayer::loadNamedStyle( theURI, theResultFlag );
   }
-  return QObject::tr( "Loaded from Provider" );
+
+  return QgsMapLayer::loadNamedStyle( theURI, theResultFlag );
 }
 
 bool QgsVectorLayer::applyNamedStyle( QString namedStyle, QString errorMsg )

Original file line number	Diff line number	Diff line change
`@@ -8758,7 +8758,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`8758`	`8758`	`QgsVectorLayerProperties *vlp = NULL; // See note above about reusing this`
`8759`	`8759`	`if ( vlp )`
`8760`	`8760`	`{`
`8761`		`- vlp->reset();`
	`8761`	`+ vlp->syncToLayer();`
`8762`	`8762`	`}`
`8763`	`8763`	`else`
`8764`	`8764`	`{`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(`
`171`	`171`	`connect( mFieldsPropertiesDialog, SIGNAL( toggleEditing() ), this, SLOT( toggleEditing() ) );`
`172`	`172`	`connect( this, SIGNAL( toggleEditing( QgsMapLayer* ) ), QgisApp::instance(), SLOT( toggleEditing( QgsMapLayer* ) ) );`
`173`	`173`
`174`		`- reset();`
	`174`	`+ syncToLayer();`
`175`	`175`
`176`	`176`	`if ( layer->dataProvider() )//enable spatial index button group if supported by provider`
`177`	`177`	`{`
`@@ -337,7 +337,7 @@ void QgsVectorLayerProperties::setDisplayField( QString name )`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`//! @note in raster props, this method is called sync()`
`340`		`-void QgsVectorLayerProperties::reset( void )`
	`340`	`+void QgsVectorLayerProperties::syncToLayer( void )`
`341`	`341`	`{`
`342`	`342`	`// populate the general information`
`343`	`343`	`mLayerOrigNameLineEdit->setText( layer->originalName() );`
`@@ -393,6 +393,7 @@ void QgsVectorLayerProperties::reset( void )`
`393`	`393`	`layer->label()->setFields( layer->pendingFields() );`
`394`	`394`
`395`	`395`	`actionDialog->init();`
	`396`	`+ labelingDialog->init();`
`396`	`397`
`397`	`398`	`if ( layer->hasGeometryType() )`
`398`	`399`	`{`
`@@ -605,7 +606,7 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()`
`605`	`606`	`}`
`606`	`607`	`else`
`607`	`608`	`{`
`608`		`- reset();`
	`609`	`+ syncToLayer();`
`609`	`610`	`}`
`610`	`611`
`611`	`612`	`return;`
`@@ -621,7 +622,7 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()`
`621`	`622`	`if ( defaultLoadedFlag )`
`622`	`623`	`{`
`623`	`624`	`// all worked ok so no need to inform user`
`624`		`- reset();`
	`625`	`+ syncToLayer();`
`625`	`626`	`}`
`626`	`627`	`else`
`627`	`628`	`{`
`@@ -696,7 +697,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()`
`696`	`697`	`//reset if the default style was loaded ok only`
`697`	`698`	`if ( defaultLoadedFlag )`
`698`	`699`	`{`
`699`		`- reset();`
	`700`	`+ syncToLayer();`
`700`	`701`	`}`
`701`	`702`	`else`
`702`	`703`	`{`
`@@ -813,7 +814,7 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )`
`813`	`814`	`//reset if the default style was loaded ok only`
`814`	`815`	`if ( defaultLoadedFlag )`
`815`	`816`	`{`
`816`		`- reset();`
	`817`	`+ syncToLayer();`
`817`	`818`	`}`
`818`	`819`	`else`
`819`	`820`	`{`
`@@ -875,7 +876,7 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()`
`875`	`876`	`}`
`876`	`877`	`if ( layer->applyNamedStyle( qmlStyle, errorMsg ) )`
`877`	`878`	`{`
`878`		`- reset();`
	`879`	`+ syncToLayer();`
`879`	`880`	`}`
`880`	`881`	`else`
`881`	`882`	`{`
Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,7 @@ QString QgsMapLayer::saveDefaultStyle( bool & theResultFlag )`
`942`	`942`	`return saveNamedStyle( styleURI(), theResultFlag );`
`943`	`943`	`}`
`944`	`944`
`945`		`-QString QgsMapLayer::saveNamedStyle( const QString theURI, bool & theResultFlag )`
	`945`	`+QString QgsMapLayer:: saveNamedStyle( const QString theURI, bool & theResultFlag )`
`946`	`946`	`{`
`947`	`947`	`QString myErrorMessage;`
`948`	`948`	`QDomDocument myDocument;`
Original file line number	Diff line number	Diff line change
`@@ -3914,16 +3914,13 @@ QString QgsVectorLayer::loadNamedStyle( const QString theURI, bool &theResultFla`
`3914`	`3914`	`if ( !qml.isEmpty() )`
`3915`	`3915`	`{`
`3916`	`3916`	`theResultFlag = this->applyNamedStyle( qml, errorMsg );`
	`3917`	`+ return QObject::tr( "Loaded from Provider" );`
`3917`	`3918`	`}`
`3918`	`3919`	`}`
`3919`	`3920`	`}`
`3920`		`-`
`3921`		`- }`
`3922`		`- if ( !theResultFlag )`
`3923`		`- {`
`3924`		`- return QgsMapLayer::loadNamedStyle( theURI, theResultFlag );`
`3925`	`3921`	`}`
`3926`		`- return QObject::tr( "Loaded from Provider" );`
	`3922`	`+`
	`3923`	`+ return QgsMapLayer::loadNamedStyle( theURI, theResultFlag );`
`3927`	`3924`	`}`
`3928`	`3925`
`3929`	`3926`	`bool QgsVectorLayer::applyNamedStyle( QString namedStyle, QString errorMsg )`