single dialog to save all types (QML, SLD, DataBase)

qgis · Sep 14, 2018 · 5e6c382 · 5e6c382
1 parent cb97740
commit 5e6c382
Show file tree

Hide file tree

Showing 13 changed files with 348 additions and 536 deletions.
diff --git a/python/core/auto_generated/qgsmaplayer.sip.in b/python/core/auto_generated/qgsmaplayer.sip.in
@@ -874,7 +874,7 @@ record in the users style table in their personal qgis.db)
 .. seealso:: :py:func:`loadNamedStyle`
 %End
 
-    virtual QString saveNamedStyle( const QString &uri, bool &resultFlag /Out/ );
+    virtual QString saveNamedStyle( const QString &uri, bool &resultFlag /Out/, StyleCategories categories = AllStyleCategories );
 %Docstring
 Save the properties of this layer as a named style
 (either as a .qml file on disk or as a

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -66,7 +66,6 @@ SET(QGIS_APP_SRCS
   qgspuzzlewidget.cpp
   qgsversionmigration.cpp
   qgsrulebasedlabelingwidget.cpp
-  qgssavestyletodbdialog.cpp
   qgssnappinglayertreemodel.cpp
   qgssnappingwidget.cpp
   qgsstatusbarcoordinateswidget.cpp
@@ -138,7 +137,7 @@ SET(QGIS_APP_SRCS
   qgssvgannotationdialog.cpp
   qgsundowidget.cpp
   qgsvectorlayerlegendwidget.cpp
-  qgsvectorlayerloadsavestyledialog.cpp
+  qgsvectorlayersavestyledialog.cpp
   qgsvectorlayerproperties.cpp
   qgsmapthemes.cpp
   qgshandlebadlayers.cpp
@@ -290,7 +289,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsmapsavedialog.h
   qgspuzzlewidget.h
   qgsrulebasedlabelingwidget.h
-  qgssavestyletodbdialog.h
   qgssnappinglayertreemodel.h
   qgssnappingwidget.h
   qgsstatusbarcoordinateswidget.h
@@ -378,7 +376,7 @@ SET (QGIS_APP_MOC_HDRS
   qgstextannotationdialog.h
   qgsundowidget.h
   qgsvectorlayerlegendwidget.h
-  qgsvectorlayerloadsavestyledialog.h
+  qgsvectorlayersavestyledialog.h
   qgsvectorlayerproperties.h
   qgsmapthemes.h
   qgshandlebadlayers.h

diff --git a/src/app/qgssavestyletodbdialog.cpp b/src/app/qgssavestyletodbdialog.cpp
diff --git a/src/app/qgssavestyletodbdialog.h b/src/app/qgssavestyletodbdialog.h
diff --git a/src/app/qgsvectorlayerloadsavestyledialog.cpp b/src/app/qgsvectorlayerloadsavestyledialog.cpp