[dbmanager] vectorize icons to fix toolbar in hidpi context

qgis · Jul 2, 2018 · 53d4ad3 · 53d4ad3
1 parent 9b0241c
commit 53d4ad3
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 38 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -234,20 +234,23 @@
         <file>themes/default/mActionConditionalFormatting.svg</file>
         <file>themes/default/mActionContextHelp.png</file>
         <file>themes/default/mActionCreateMemory.svg</file>
+        <file>themes/default/mActionCreateTable.svg</file>
         <file>themes/default/mActionCustomProjection.svg</file>
         <file>themes/default/mActionDecreaseBrightness.svg</file>
         <file>themes/default/mActionDecreaseContrast.svg</file>
         <file>themes/default/mActionDeleteAttribute.svg</file>
         <file>themes/default/mActionDeletePart.svg</file>
         <file>themes/default/mActionDeleteRing.svg</file>
         <file>themes/default/mActionDeleteSelected.svg</file>
+        <file>themes/default/mActionDeleteTable.svg</file>
         <file>themes/default/mActionDeselectAll.svg</file>
         <file>themes/default/mActionDraw.svg</file>
         <file>themes/default/mActionDuplicateLayer.svg</file>
         <file>themes/default/mActionDuplicateComposer.svg</file>
         <file>themes/default/mActionEditCopy.svg</file>
         <file>themes/default/mActionEditCut.svg</file>
         <file>themes/default/mActionEditPaste.svg</file>
+        <file>themes/default/mActionEditTable.svg</file>
         <file>themes/default/mActionExpandNewTree.svg</file>
         <file>themes/default/mActionExpandTree.svg</file>
         <file>themes/default/mActionFileExit.svg</file>

diff --git a/images/themes/default/mActionAddTable.svg b/images/themes/default/mActionAddTable.svg
diff --git a/images/themes/default/mActionCreateTable.svg b/images/themes/default/mActionCreateTable.svg
diff --git a/images/themes/default/mActionDeleteTable.svg b/images/themes/default/mActionDeleteTable.svg
diff --git a/images/themes/default/mActionEditTable.svg b/images/themes/default/mActionEditTable.svg
diff --git a/python/plugins/db_manager/db_manager.py b/python/plugins/db_manager/db_manager.py
@@ -29,7 +29,7 @@
 from qgis.PyQt.QtGui import QIcon, QKeySequence
 
 from qgis.gui import QgsMessageBar
-from qgis.core import Qgis, QgsSettings, QgsMapLayer
+from qgis.core import Qgis, QgsApplication, QgsSettings, QgsMapLayer
 from qgis.utils import OverrideCursor
 
 from .info_viewer import InfoViewer
@@ -429,7 +429,7 @@ def setupUi(self):
         sep.setObjectName("DB_Manager_DbMenu_placeholder")
         sep.setVisible(False)
 
-        self.actionRefresh = self.menuDb.addAction(QIcon(":/db_manager/actions/refresh"), self.tr("&Refresh"),
+        self.actionRefresh = self.menuDb.addAction(QgsApplication.getThemeIcon("/mActionDraw.svg"), self.tr("&Refresh"),
                                                    self.refreshActionSlot, QKeySequence("F5"))
         self.actionSqlWindow = self.menuDb.addAction(QIcon(":/db_manager/actions/sql_window"), self.tr("&SQL Window"),
                                                      self.runSqlWindow, QKeySequence("F2"))
@@ -463,5 +463,11 @@ def setupUi(self):
         # add actions to the toolbar
         self.toolBar.addAction(self.actionRefresh)
         self.toolBar.addAction(self.actionSqlWindow)
+        self.toolBar.addSeparator()
         self.toolBar.addAction(self.actionImport)
         self.toolBar.addAction(self.actionExport)
+
+        widget = self.toolBar.widgetForAction(self.actionImport)
+        widget.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+        widget = self.toolBar.widgetForAction(self.actionExport)
+        widget.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py
@@ -241,17 +241,17 @@ def registerDatabaseActions(self, mainWindow):
         mainWindow.registerAction(action, None, self.deleteActionSlot)
         action.setShortcuts(QKeySequence.Delete)
 
-        action = QAction(QIcon(":/db_manager/actions/create_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionCreateTable.svg"),
                          QApplication.translate(
                              "DBManagerPlugin", "&Create Table…"), self)
         mainWindow.registerAction(action, QApplication.translate(
             "DBManagerPlugin", "&Table"), self.createTableActionSlot)
-        action = QAction(QIcon(":/db_manager/actions/edit_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionEditTable.svg"),
                          QApplication.translate(
                              "DBManagerPlugin", "&Edit Table…"), self)
         mainWindow.registerAction(action, QApplication.translate(
             "DBManagerPlugin", "&Table"), self.editTableActionSlot)
-        action = QAction(QIcon(":/db_manager/actions/del_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionDeleteTable.svg"),
                          QApplication.translate(
                              "DBManagerPlugin", "&Delete Table/View…"), self)
         mainWindow.registerAction(action, QApplication.translate(

diff --git a/python/plugins/db_manager/db_plugins/plugin.py b/python/plugins/db_manager/db_plugins/plugin.py
@@ -327,14 +327,14 @@ def registerDatabaseActions(self, mainWindow):
         mainWindow.registerAction(action, None, self.deleteActionSlot)
         action.setShortcuts(QKeySequence.Delete)
 
-        action = QAction(QIcon(":/db_manager/actions/create_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionCreateTable.svg"),
                          QApplication.translate("DBManagerPlugin", "&Create Table…"), self)
         mainWindow.registerAction(action, QApplication.translate("DBManagerPlugin", "&Table"),
                                   self.createTableActionSlot)
-        action = QAction(QIcon(":/db_manager/actions/edit_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionEditTable.svg"),
                          QApplication.translate("DBManagerPlugin", "&Edit Table…"), self)
         mainWindow.registerAction(action, QApplication.translate("DBManagerPlugin", "&Table"), self.editTableActionSlot)
-        action = QAction(QIcon(":/db_manager/actions/del_table"),
+        action = QAction(QgsApplication.getThemeIcon("/mActionDeleteTable.svg"),
                          QApplication.translate("DBManagerPlugin", "&Delete Table/View…"), self)
         mainWindow.registerAction(action, QApplication.translate("DBManagerPlugin", "&Table"),
                                   self.deleteTableActionSlot)

diff --git a/python/plugins/db_manager/icons/toolbar/action_del_table.png b/python/plugins/db_manager/icons/toolbar/action_del_table.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_delete.png b/python/plugins/db_manager/icons/toolbar/action_delete.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_edit_table.png b/python/plugins/db_manager/icons/toolbar/action_edit_table.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_export.png b/python/plugins/db_manager/icons/toolbar/action_export.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_import.png b/python/plugins/db_manager/icons/toolbar/action_import.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_new_table.png b/python/plugins/db_manager/icons/toolbar/action_new_table.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_refresh.png b/python/plugins/db_manager/icons/toolbar/action_refresh.png
diff --git a/python/plugins/db_manager/icons/toolbar/action_sql_window.png b/python/plugins/db_manager/icons/toolbar/action_sql_window.png
diff --git a/python/plugins/db_manager/icons/toolbar/mActionDBExport.svg b/python/plugins/db_manager/icons/toolbar/mActionDBExport.svg