[needs-docs][dbmanager] harmonize icons

images/images.qrc

@@ -468,6 +468,7 @@
         <file>themes/default/mIconTimerContinue.svg</file>
         <file>themes/default/mIconTimerPause.svg</file>
         <file>themes/default/mIconTreeView.svg</file>
+        <file>themes/default/mIconVirtualLayer.svg</file>
         <file>themes/default/mIconWcs.svg</file>
         <file>themes/default/mIconWfs.svg</file>
         <file>themes/default/mIconWms.svg</file>

images/themes/default/mIconVirtualLayer.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="33.051" x2="4.624" y1="35.071" y2="4.728"><stop offset="0" stop-color="#6e97c4"/><stop offset="1" stop-color="#ecedef"/></linearGradient><path overflow="visible" d="M4.223 2.25h23.554a1.97 1.97 0 0 1 1.973 1.985v23.497c0 1.104-.876 2.018-1.973 2.018H4.223c-1.097 0-1.973-.914-1.973-2.018V4.235A1.97 1.97 0 0 1 4.223 2.25z" fill="url(#a)" stroke="#2e4e72" stroke-width=".5"/><path d="M3.5 3.5l8 20 9-20h8" overflow="visible" fill="none" stroke="#415a75" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><ellipse ry="2.5" rx="2.5" cy="23.5" cx="11.5" overflow="visible" fill="#eeeeec" fill-rule="evenodd" stroke="#415a75" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M6.064 2.291l-.48 2.713-1.427 1.035-1.781.278.054-2.555.608-1.084 1.128-.285z" fill="#eeeeec" fill-rule="evenodd"/><path overflow="visible" d="M4.09 2.06c-.048 0-.092.01-.139.014A1.477 1.477 0 0 1 5 3.5C5 4.34 4.34 5 3.5 5c-.63 0-1.158-.372-1.383-.912v2.621C2.542 6.894 3.01 7 3.5 7 5.421 7 7 5.421 7 3.5c0-.513-.12-.998-.322-1.44z" fill="#415a75" fill-rule="evenodd"/><path d="M18.2 2.29l.223 2.39 2.628 1.344 1.945-.502.696-3.294z" fill="#eeeeec" fill-rule="evenodd"/><path overflow="visible" d="M17.242 2.25c-.151.39-.242.809-.242 1.25C17 5.421 18.579 7 20.5 7S24 5.421 24 3.5c0-.441-.093-.86-.244-1.25h-2.42c.402.266.664.722.664 1.25 0 .84-.66 1.5-1.5 1.5S19 4.34 19 3.5c0-.528.262-.984.664-1.25z" fill="#415a75" fill-rule="evenodd"/><path d="M26.613 2.31l.494 2.721 2.602 1.076-.048-2.659-.6-.723-.96-.372z" fill="#eeeeec" fill-rule="evenodd"/><path overflow="visible" d="M26.244 2.25c-.151.39-.244.81-.244 1.25C26 5.421 27.579 7 29.5 7c.085 0 .166-.02.25-.025v-2A1.485 1.485 0 0 1 28 3.5c0-.447.19-.84.492-1.113a1.972 1.972 0 0 0-.715-.137z" fill="#415a75" fill-rule="evenodd"/><path overflow="visible" d="M4.223 2.25h23.554a1.97 1.97 0 0 1 1.973 1.985v23.497c0 1.104-.876 2.018-1.973 2.018H4.223c-1.097 0-1.973-.914-1.973-2.018V4.235A1.97 1.97 0 0 1 4.223 2.25z" fill="none" stroke="#2e4e72" stroke-width=".5"/></svg>

python/plugins/db_manager/db_model.py

@@ -31,7 +31,7 @@
 from .db_plugins.plugin import BaseError, Table, Database
 from .dlg_db_error import DlgDbError
 
-from qgis.core import QgsDataSourceUri, QgsVectorLayer, QgsRasterLayer, QgsMimeDataUtils
+from qgis.core import QgsApplication, QgsDataSourceUri, QgsVectorLayer, QgsRasterLayer, QgsMimeDataUtils
 from qgis.utils import OverrideCursor
 
 from . import resources_rc  # NOQA
@@ -234,13 +234,13 @@ def __init__(self, table, parent):
 
         # load (shared) icon with first instance of table item
         if not hasattr(TableItem, 'tableIcon'):
-            TableItem.tableIcon = QIcon(":/db_manager/icons/table.png")
+            TableItem.tableIcon = QgsApplication.getThemeIcon("/mIconTableLayer.svg")
             TableItem.viewIcon = QIcon(":/db_manager/icons/view.png")
             TableItem.viewMaterializedIcon = QIcon(":/db_manager/icons/view_materialized.png")
-            TableItem.layerPointIcon = QIcon(":/db_manager/icons/layer_point.png")
-            TableItem.layerLineIcon = QIcon(":/db_manager/icons/layer_line.png")
-            TableItem.layerPolygonIcon = QIcon(":/db_manager/icons/layer_polygon.png")
-            TableItem.layerRasterIcon = QIcon(":/db_manager/icons/layer_raster.png")
+            TableItem.layerPointIcon = QgsApplication.getThemeIcon("/mIconPointLayer.svg")
+            TableItem.layerLineIcon = QgsApplication.getThemeIcon("/mIconLineLayer.svg")
+            TableItem.layerPolygonIcon = QgsApplication.getThemeIcon("/mIconPolygonLayer.svg")
+            TableItem.layerRasterIcon = QgsApplication.getThemeIcon("/mIconRasterLayer.svg")
             TableItem.layerUnknownIcon = QIcon(":/db_manager/icons/layer_unknown.png")
 
     def data(self, column):

python/plugins/db_manager/db_plugins/gpkg/CMakeLists.txt

@@ -1,8 +1,5 @@
 
 FILE(GLOB PY_FILES *.py)
-FILE(GLOB ICON_FILES icons/*.png)
-
-PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
 PLUGIN_INSTALL(db_manager db_plugins/gpkg ${PY_FILES} ${PYRC_FILES})
 PLUGIN_INSTALL(db_manager db_plugins/gpkg/icons ${ICON_FILES})

python/plugins/db_manager/db_plugins/gpkg/plugin.py

@@ -27,15 +27,12 @@
 from qgis.PyQt.QtCore import Qt, QFileInfo, QCoreApplication
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QApplication, QAction, QFileDialog
-from qgis.core import Qgis, QgsDataSourceUri, QgsSettings
+from qgis.core import Qgis, QgsApplication, QgsDataSourceUri, QgsSettings
 from qgis.gui import QgsMessageBar
 
 from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, \
     InvalidDataException
 
-from . import resources_rc
-hasattr(resources_rc, 'foo')
-
 
 def classFactory():
     return GPKGDBPlugin
@@ -45,7 +42,7 @@ class GPKGDBPlugin(DBPlugin):
 
     @classmethod
     def icon(self):
-        return QIcon(":/db_manager/gpkg/icon")
+        return QgsApplication.getThemeIcon("/mGeoPackage.svg")
 
     @classmethod
     def typeName(self):

python/plugins/db_manager/db_plugins/oracle/CMakeLists.txt

@@ -1,8 +1,5 @@
 
 FILE(GLOB PY_FILES *.py)
-FILE(GLOB ICON_FILES icons/*.png)
-
-PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
 PLUGIN_INSTALL(db_manager db_plugins/oracle ${PY_FILES} ${PYRC_FILES})
 PLUGIN_INSTALL(db_manager db_plugins/oracle/icons ${ICON_FILES})

python/plugins/db_manager/db_plugins/oracle/plugin.py

@@ -32,16 +32,14 @@
 from qgis.PyQt.QtGui import QIcon, QKeySequence
 from qgis.PyQt.QtWidgets import QAction, QApplication, QMessageBox
 
-from qgis.core import QgsVectorLayer, NULL, QgsSettings
+from qgis.core import QgsApplication QgsVectorLayer, NULL, QgsSettings
 
 from ..plugin import ConnectionError, InvalidDataException, DBPlugin, \
     Database, Schema, Table, VectorTable, TableField, TableConstraint, \
     TableIndex, TableTrigger
 
 from qgis.core import QgsCredentials
 
-from . import resources_rc  # NOQA
-
 
 def classFactory():
     return OracleDBPlugin
@@ -51,7 +49,7 @@ class OracleDBPlugin(DBPlugin):
 
     @classmethod
     def icon(self):
-        return QIcon(":/db_manager/oracle/icon")
+        return QgsApplication.getThemeIcon("/mIconOracle.svg")
 
     @classmethod
     def typeName(self):

python/plugins/db_manager/db_plugins/postgis/CMakeLists.txt

@@ -1,7 +1,4 @@
 FILE(GLOB PY_FILES *.py)
-FILE(GLOB ICON_FILES icons/*.png)
-
-PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
 PLUGIN_INSTALL(db_manager db_plugins/postgis ${PY_FILES} ${PYRC_FILES})
 PLUGIN_INSTALL(db_manager db_plugins/postgis/icons ${ICON_FILES})

python/plugins/db_manager/db_plugins/postgis/plugin.py

@@ -29,16 +29,14 @@
 from qgis.PyQt.QtCore import Qt, QRegExp, QCoreApplication
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QApplication, QMessageBox
-from qgis.core import Qgis, QgsSettings
+from qgis.core import Qgis, QgsApplication, QgsSettings
 from qgis.gui import QgsMessageBar
 
 from ..plugin import ConnectionError, InvalidDataException, DBPlugin, Database, Schema, Table, VectorTable, RasterTable, \
     TableField, TableConstraint, TableIndex, TableTrigger, TableRule
 
 import re
 
-from . import resources_rc  # NOQA
-
 
 def classFactory():
     return PostGisDBPlugin
@@ -48,7 +46,7 @@ class PostGisDBPlugin(DBPlugin):
 
     @classmethod
     def icon(self):
-        return QIcon(":/db_manager/postgis/icon")
+        return QgsApplication.getThemeIcon("/mIconPostgis.svg")
 
     @classmethod
     def typeName(self):

python/plugins/db_manager/db_plugins/spatialite/CMakeLists.txt

@@ -1,8 +1,5 @@
 
 FILE(GLOB PY_FILES *.py)
-FILE(GLOB ICON_FILES icons/*.png)
-
-PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
 PLUGIN_INSTALL(db_manager db_plugins/spatialite ${PY_FILES} ${PYRC_FILES})
 PLUGIN_INSTALL(db_manager db_plugins/spatialite/icons ${ICON_FILES})

python/plugins/db_manager/db_plugins/spatialite/plugin.py

@@ -27,14 +27,12 @@
 from qgis.PyQt.QtCore import Qt, QFileInfo, QCoreApplication
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QApplication, QAction, QFileDialog
-from qgis.core import Qgis, QgsDataSourceUri, QgsSettings
+from qgis.core import Qgis, QgsApplication, QgsDataSourceUri, QgsSettings
 from qgis.gui import QgsMessageBar
 
 from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, \
     InvalidDataException
 
-from . import resources_rc  # NOQA
-
 
 def classFactory():
     return SpatiaLiteDBPlugin
@@ -44,7 +42,7 @@ class SpatiaLiteDBPlugin(DBPlugin):
 
     @classmethod
     def icon(self):
-        return QIcon(":/db_manager/spatialite/icon")
+        return QgsApplication.getThemeIcon("/mIconSpatialite.svg")
 
     @classmethod
     def typeName(self):

python/plugins/db_manager/db_plugins/vlayers/CMakeLists.txt

@@ -1,7 +1,5 @@
 
 FILE(GLOB PY_FILES *.py)
 
-PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc)
-
 PLUGIN_INSTALL(db_manager db_plugins/vlayers ${PY_FILES} ${PYRC_FILES})
 

python/plugins/db_manager/db_plugins/vlayers/plugin.py

@@ -24,12 +24,10 @@
 
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtGui import QIcon
-from qgis.core import QgsVectorLayer, QgsProject, QgsVirtualLayerDefinition
+from qgis.core import QgsApplication, QgsVectorLayer, QgsProject, QgsVirtualLayerDefinition
 
 from ..plugin import DBPlugin, Database, Table, VectorTable, TableField
 
-from . import resources_rc  # NOQA
-
 
 def classFactory():
     return VLayerDBPlugin
@@ -39,7 +37,7 @@ class VLayerDBPlugin(DBPlugin):
 
     @classmethod
     def icon(self):
-        return QIcon(":/db_manager/vlayers/icon")
+        return QgsApplication.getThemeIcon("/mIconVirtualLayer.svg")
 
     @classmethod
     def typeName(self):