Save style file name inside the style.

wonder · wonder · commit adb8ab92fd6a · 2009-11-17T11:23:36.000Z
Fixed saving of symbols added in symbol selector git-svn-id: http://svn.osgeo.org/qgis/trunk@12161 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/symbology-ng-core.sip b/python/core/symbology-ng-core.sip
@@ -670,11 +670,15 @@ public:
   //! load a file into the style
   bool load(QString filename);
   
-  //! save style into a file
-  bool save(QString filename);
+  //! save style into a file (will use current filename if empty string is passed)
+  bool save(QString filename = QString());
   
   //! return last error from load/save operation
   QString errorString();
+
+  //! return current file name of the style
+  QString fileName();
+
 };
 
 //////////
diff --git a/python/gui/symbology-ng-gui.sip b/python/gui/symbology-ng-gui.sip
@@ -59,7 +59,7 @@ class QgsStyleV2ManagerDialog : QDialog //, private Ui::QgsStyleV2ManagerDialogB
 %End
   
 public:
-  QgsStyleV2ManagerDialog(QgsStyleV2* style, QString styleFilename, QWidget* parent = NULL);
+  QgsStyleV2ManagerDialog(QgsStyleV2* style, QWidget* parent = NULL);
   
 public slots:
   void addItem();
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1068,7 +1068,7 @@ void QgisApp::createActions()
 
 void QgisApp::showStyleManagerV2()
 {
-  QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), QgsApplication::userStyleV2Path(), this );
+  QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), this );
   dlg.exec();
 }
 
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
@@ -216,6 +216,7 @@ bool QgsStyleV2::load(QString filename)
     e = e.nextSiblingElement();
   }
 
+  mFileName = filename;
   return true;
 }
 
@@ -224,8 +225,8 @@ bool QgsStyleV2::load(QString filename)
 bool QgsStyleV2::save(QString filename)
 {
   mErrorString = QString();
-  //if (filename.isEmpty())
-  //  filename = mFilename;
+  if (filename.isEmpty())
+    filename = mFileName;
   
   QDomDocument doc("qgis_style");
   QDomElement root = doc.createElement("qgis_style");
@@ -257,5 +258,6 @@ bool QgsStyleV2::save(QString filename)
   doc.save(ts, 2);
   f.close();
   
+  mFileName = filename;
   return true;
 }
diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstylev2.h
@@ -70,18 +70,22 @@ class CORE_EXPORT QgsStyleV2
     //! load a file into the style
     bool load( QString filename );
 
-    //! save style into a file
-    bool save( QString filename );
+    //! save style into a file (will use current filename if empty string is passed)
+    bool save( QString filename = QString() );
 
     //! return last error from load/save operation
     QString errorString() { return mErrorString; }
 
+    //! return current file name of the style
+    QString fileName() { return mFileName; }
+
   protected:
 
     QgsSymbolV2Map mSymbols;
     QgsVectorColorRampV2Map mColorRamps;
 
     QString mErrorString;
+    QString mFileName;
 
     static QgsStyleV2* mDefaultStyle;
 };
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -32,8 +32,8 @@ static QString iconPath( QString iconFile )
 
 ///////
 
-QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QString styleFilename, QWidget* parent )
-    : QDialog( parent ), mStyle( style ), mStyleFilename( styleFilename )
+QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent )
+    : QDialog( parent ), mStyle( style )
 {
 
   setupUi( this );
@@ -65,8 +65,7 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QString sty
 void QgsStyleV2ManagerDialog::onFinished()
 {
   // TODO: save only when modified
-  if ( !mStyleFilename.isEmpty() )
-    mStyle->save( mStyleFilename );
+  mStyle->save();
 }
 
 void QgsStyleV2ManagerDialog::populateTypes()
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.h b/src/gui/symbology-ng/qgsstylev2managerdialog.h
@@ -13,7 +13,7 @@ class GUI_EXPORT QgsStyleV2ManagerDialog : public QDialog, private Ui::QgsStyleV
     Q_OBJECT
 
   public:
-    QgsStyleV2ManagerDialog( QgsStyleV2* style, QString styleFilename, QWidget* parent = NULL );
+    QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent = NULL );
 
   public slots:
     void addItem();
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -206,6 +206,9 @@ void QgsSymbolV2SelectorDialog::addSymbolToStyle()
   // add new symbol to style and re-populate the list
   mStyle->addSymbol(name, mSymbol->clone());
 
+  // make sure the symbol is stored
+  mStyle->save();
+
   populateSymbolView();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ void QgisApp::createActions()`
`1068`	`1068`
`1069`	`1069`	`void QgisApp::showStyleManagerV2()`
`1070`	`1070`	`{`
`1071`		`- QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), QgsApplication::userStyleV2Path(), this );`
	`1071`	`+ QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), this );`
`1072`	`1072`	`dlg.exec();`
`1073`	`1073`	`}`
`1074`	`1074`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ bool QgsStyleV2::load(QString filename)`
`216`	`216`	`e = e.nextSiblingElement();`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ mFileName = filename;`
`219`	`220`	`return true;`
`220`	`221`	`}`
`221`	`222`
`@@ -224,8 +225,8 @@ bool QgsStyleV2::load(QString filename)`
`224`	`225`	`bool QgsStyleV2::save(QString filename)`
`225`	`226`	`{`
`226`	`227`	`mErrorString = QString();`
`227`		`- //if (filename.isEmpty())`
`228`		`- // filename = mFilename;`
	`228`	`+ if (filename.isEmpty())`
	`229`	`+ filename = mFileName;`
`229`	`230`
`230`	`231`	`QDomDocument doc("qgis_style");`
`231`	`232`	`QDomElement root = doc.createElement("qgis_style");`
`@@ -257,5 +258,6 @@ bool QgsStyleV2::save(QString filename)`
`257`	`258`	`doc.save(ts, 2);`
`258`	`259`	`f.close();`
`259`	`260`
	`261`	`+ mFileName = filename;`
`260`	`262`	`return true;`
`261`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ static QString iconPath( QString iconFile )`
`32`	`32`
`33`	`33`	`///////`
`34`	`34`
`35`		`-QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QString styleFilename, QWidget* parent )`
`36`		`- : QDialog( parent ), mStyle( style ), mStyleFilename( styleFilename )`
	`35`	`+QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent )`
	`36`	`+ : QDialog( parent ), mStyle( style )`
`37`	`37`	`{`
`38`	`38`
`39`	`39`	`setupUi( this );`
`@@ -65,8 +65,7 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QString sty`
`65`	`65`	`void QgsStyleV2ManagerDialog::onFinished()`
`66`	`66`	`{`
`67`	`67`	`// TODO: save only when modified`
`68`		`- if ( !mStyleFilename.isEmpty() )`
`69`		`- mStyle->save( mStyleFilename );`
	`68`	`+ mStyle->save();`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`void QgsStyleV2ManagerDialog::populateTypes()`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,9 @@ void QgsSymbolV2SelectorDialog::addSymbolToStyle()`
`206`	`206`	`// add new symbol to style and re-populate the list`
`207`	`207`	`mStyle->addSymbol(name, mSymbol->clone());`
`208`	`208`
	`209`	`+ // make sure the symbol is stored`
	`210`	`+ mStyle->save();`
	`211`	`+`
`209`	`212`	`populateSymbolView();`
`210`	`213`	`}`
`211`	`214`