[QGIS Commit] r12161 - in trunk/qgis: python/core python/gui
src/app src/core/symbology-ng src/gui/symbology-ng
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 17 06:23:37 EST 2009
Author: wonder
Date: 2009-11-17 06:23:36 -0500 (Tue, 17 Nov 2009)
New Revision: 12161
Modified:
trunk/qgis/python/core/symbology-ng-core.sip
trunk/qgis/python/gui/symbology-ng-gui.sip
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/core/symbology-ng/qgsstylev2.cpp
trunk/qgis/src/core/symbology-ng/qgsstylev2.h
trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h
trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
Log:
Save style file name inside the style.
Fixed saving of symbols added in symbol selector
Modified: trunk/qgis/python/core/symbology-ng-core.sip
===================================================================
--- trunk/qgis/python/core/symbology-ng-core.sip 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/python/core/symbology-ng-core.sip 2009-11-17 11:23:36 UTC (rev 12161)
@@ -670,11 +670,15 @@
//! 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();
+
};
//////////
Modified: trunk/qgis/python/gui/symbology-ng-gui.sip
===================================================================
--- trunk/qgis/python/gui/symbology-ng-gui.sip 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/python/gui/symbology-ng-gui.sip 2009-11-17 11:23:36 UTC (rev 12161)
@@ -59,7 +59,7 @@
%End
public:
- QgsStyleV2ManagerDialog(QgsStyleV2* style, QString styleFilename, QWidget* parent = NULL);
+ QgsStyleV2ManagerDialog(QgsStyleV2* style, QWidget* parent = NULL);
public slots:
void addItem();
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-11-17 11:23:36 UTC (rev 12161)
@@ -1068,7 +1068,7 @@
void QgisApp::showStyleManagerV2()
{
- QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), QgsApplication::userStyleV2Path(), this );
+ QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), this );
dlg.exec();
}
Modified: trunk/qgis/src/core/symbology-ng/qgsstylev2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsstylev2.cpp 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/core/symbology-ng/qgsstylev2.cpp 2009-11-17 11:23:36 UTC (rev 12161)
@@ -216,6 +216,7 @@
e = e.nextSiblingElement();
}
+ mFileName = filename;
return true;
}
@@ -224,8 +225,8 @@
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 @@
doc.save(ts, 2);
f.close();
+ mFileName = filename;
return true;
}
Modified: trunk/qgis/src/core/symbology-ng/qgsstylev2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsstylev2.h 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/core/symbology-ng/qgsstylev2.h 2009-11-17 11:23:36 UTC (rev 12161)
@@ -70,18 +70,22 @@
//! 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;
};
Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp 2009-11-17 11:23:36 UTC (rev 12161)
@@ -32,8 +32,8 @@
///////
-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 @@
void QgsStyleV2ManagerDialog::onFinished()
{
// TODO: save only when modified
- if ( !mStyleFilename.isEmpty() )
- mStyle->save( mStyleFilename );
+ mStyle->save();
}
void QgsStyleV2ManagerDialog::populateTypes()
Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h 2009-11-17 11:23:36 UTC (rev 12161)
@@ -13,7 +13,7 @@
Q_OBJECT
public:
- QgsStyleV2ManagerDialog( QgsStyleV2* style, QString styleFilename, QWidget* parent = NULL );
+ QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent = NULL );
public slots:
void addItem();
Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-11-17 10:59:40 UTC (rev 12160)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-11-17 11:23:36 UTC (rev 12161)
@@ -206,6 +206,9 @@
// add new symbol to style and re-populate the list
mStyle->addSymbol(name, mSymbol->clone());
+ // make sure the symbol is stored
+ mStyle->save();
+
populateSymbolView();
}
More information about the QGIS-commit
mailing list