apply changes to layer before saving qml

jef · jef · commit d54861a63fb5 · 2008-06-04T16:55:36.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8589 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -154,7 +154,7 @@ void QgsVectorLayerProperties::setDisplayField(QString name)
   displayFieldComboBox->setCurrentText(name);
 }
 
-//! @note in raster props, this metho d is called sync()
+//! @note in raster props, this method is called sync()
 void QgsVectorLayerProperties::reset( void )
 {
   // populate the general information
@@ -639,6 +639,8 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
 
 void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
 {
+  apply(); // make sure the qml to save is uptodate
+
   // a flag passed by reference
   bool defaultSavedFlag = false;
   // after calling this the above flag will be set true for success
@@ -685,7 +687,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
     if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )
     {
       //ensure the user never ommitted the extension from the filename
-      if ( !myFileName.toUpper().endsWith ( ".QML" ) )
+      if ( !myFileName.endsWith( ".qml", Qt::CaseInsensitive ) )
       {
         myFileName += ".qml";
       }
@@ -714,7 +716,6 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
 
 void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
 {
-
   QSettings myQSettings;  // where we keep last used filter in persistant state
   QString myLastUsedDir = myQSettings.value ( "style/lastStyleDir", "." ).toString();
 
@@ -746,11 +747,14 @@ void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
   {
     if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )
     {
+      apply(); // make sure the qml to save is uptodate
+
       //ensure the user never ommitted the extension from the filename
-      if ( !myOutputFileName.toUpper().endsWith ( ".QML" ) )
+      if ( !myOutputFileName.endsWith ( ".qml", Qt::CaseInsensitive ) )
       {
         myOutputFileName += ".qml";
       }
+
       bool defaultLoadedFlag = false;
       QString myMessage = layer->saveNamedStyle( myOutputFileName, defaultLoadedFlag );
       //reset if the default style was loaded ok only

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void QgsVectorLayerProperties::setDisplayField(QString name)`
`154`	`154`	`displayFieldComboBox->setCurrentText(name);`
`155`	`155`	`}`
`156`	`156`
`157`		`-//! @note in raster props, this metho d is called sync()`
	`157`	`+//! @note in raster props, this method is called sync()`
`158`	`158`	`void QgsVectorLayerProperties::reset( void )`
`159`	`159`	`{`
`160`	`160`	`// populate the general information`
`@@ -639,6 +639,8 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()`
`639`	`639`
`640`	`640`	`void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()`
`641`	`641`	`{`
	`642`	`+ apply(); // make sure the qml to save is uptodate`
	`643`	`+`
`642`	`644`	`// a flag passed by reference`
`643`	`645`	`bool defaultSavedFlag = false;`
`644`	`646`	`// after calling this the above flag will be set true for success`
`@@ -685,7 +687,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()`
`685`	`687`	`if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )`
`686`	`688`	`{`
`687`	`689`	`//ensure the user never ommitted the extension from the filename`
`688`		`- if ( !myFileName.toUpper().endsWith ( ".QML" ) )`
	`690`	`+ if ( !myFileName.endsWith( ".qml", Qt::CaseInsensitive ) )`
`689`	`691`	`{`
`690`	`692`	`myFileName += ".qml";`
`691`	`693`	`}`
`@@ -714,7 +716,6 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()`
`714`	`716`
`715`	`717`	`void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()`
`716`	`718`	`{`
`717`		`-`
`718`	`719`	`QSettings myQSettings; // where we keep last used filter in persistant state`
`719`	`720`	`QString myLastUsedDir = myQSettings.value ( "style/lastStyleDir", "." ).toString();`
`720`	`721`
`@@ -746,11 +747,14 @@ void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()`
`746`	`747`	`{`
`747`	`748`	`if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )`
`748`	`749`	`{`
	`750`	`+ apply(); // make sure the qml to save is uptodate`
	`751`	`+`
`749`	`752`	`//ensure the user never ommitted the extension from the filename`
`750`		`- if ( !myOutputFileName.toUpper().endsWith ( ".QML" ) )`
	`753`	`+ if ( !myOutputFileName.endsWith ( ".qml", Qt::CaseInsensitive ) )`
`751`	`754`	`{`
`752`	`755`	`myOutputFileName += ".qml";`
`753`	`756`	`}`
	`757`	`+`
`754`	`758`	`bool defaultLoadedFlag = false;`
`755`	`759`	`QString myMessage = layer->saveNamedStyle( myOutputFileName, defaultLoadedFlag );`
`756`	`760`	`//reset if the default style was loaded ok only`