Skip to content
Permalink
Browse files

Merge pull request #3793 from nirvn/default_styles_imp

[style manager] new default symbols shipped with QGIS & add a set of pre-defined tags
  • Loading branch information
m-kuhn committed Nov 22, 2016
2 parents d716640 + e226529 commit 8dbe6ead2b92482f34772cb04b95b67278cd02d3
@@ -2,5 +2,5 @@ usr/share/qgis/svg/*
usr/share/qgis/resources/qgis.db
usr/share/qgis/resources/srs-template.db
usr/share/qgis/resources/customization.xml
usr/share/qgis/resources/symbology-ng-style.db
usr/share/qgis/resources/symbology-ng-style.xml
usr/share/qgis/resources/cpt-city-qgis-min/*
@@ -325,7 +325,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
"apps/%PACKAGENAME%/resources/qgis.db" ^
"apps/%PACKAGENAME%/resources/spatialite.db" ^
"apps/%PACKAGENAME%/resources/srs.db" ^
"apps/%PACKAGENAME%/resources/symbology-ng-style.db" ^
"apps/%PACKAGENAME%/resources/symbology-ng-style.xml" ^
"apps/%PACKAGENAME%/resources/cpt-city-qgis-min/" ^
"apps/%PACKAGENAME%/svg/" ^
"apps/%PACKAGENAME%/crssync.exe" ^
@@ -208,8 +208,32 @@ class QgsStyle : QObject
//! Changes ramp's name
bool renameColorRamp( const QString& oldName, const QString& newName );

//! Creates a temporary memory database
bool createMemoryDB();
/** Creates an on-disk database
*
* This function creates a new on-disk permanent style database.
* \return returns the success state of the database creation
* \note added in QGIS 3.0
* \see createMemoryDb()
*/
bool createDb( const QString& filename );

/** Creates a temporary memory database
*
* This function is used to create a temporary style database in case a permanent on-disk database is not needed.
* \return returns the success state of the temporary memory database creation
* \note added in QGIS 3.0
* \see createDb()
*/
bool createMemoryDb();

/** Creates tables structure for new database
*
* This function is used to create the tables structure in a newly-created database.
* \return returns the success state of the temporary memory database creation
* \note added in QGIS 3.0
* \see createDB(), createMemoryDB()
*/
void createTables();

//! Loads a file into the style
bool load( const QString& filename );
@@ -1,4 +1,4 @@
INSTALL(FILES srs.db qgis.db symbology-ng-style.db spatialite.db customization.xml
INSTALL(FILES srs.db qgis.db symbology-ng-style.xml spatialite.db customization.xml
DESTINATION ${QGIS_DATA_DIR}/resources)
INSTALL(DIRECTORY cpt-city-qgis-min DESTINATION ${QGIS_DATA_DIR}/resources)
INSTALL(DIRECTORY themes DESTINATION ${QGIS_DATA_DIR}/resources)
Binary file not shown.

0 comments on commit 8dbe6ea

Please sign in to comment.
You can’t perform that action at this time.