Skip to content

Commit 7e8ec00

Browse files
committed
[dbmanager] vectorize icons to fix toolbar in hidpi context
1 parent 7cb80a2 commit 7e8ec00

21 files changed

+28
-85
lines changed

images/images.qrc

+3
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,22 @@
234234
<file>themes/default/mActionConditionalFormatting.svg</file>
235235
<file>themes/default/mActionContextHelp.png</file>
236236
<file>themes/default/mActionCreateMemory.svg</file>
237+
<file>themes/default/mActionCreateTable.svg</file>
237238
<file>themes/default/mActionCustomProjection.svg</file>
238239
<file>themes/default/mActionDecreaseBrightness.svg</file>
239240
<file>themes/default/mActionDecreaseContrast.svg</file>
240241
<file>themes/default/mActionDeleteAttribute.svg</file>
241242
<file>themes/default/mActionDeletePart.svg</file>
242243
<file>themes/default/mActionDeleteRing.svg</file>
243244
<file>themes/default/mActionDeleteSelected.svg</file>
245+
<file>themes/default/mActionDeleteTable.svg</file>
244246
<file>themes/default/mActionDeselectAll.svg</file>
245247
<file>themes/default/mActionDuplicateLayer.svg</file>
246248
<file>themes/default/mActionDuplicateComposer.svg</file>
247249
<file>themes/default/mActionEditCopy.svg</file>
248250
<file>themes/default/mActionEditCut.svg</file>
249251
<file>themes/default/mActionEditPaste.svg</file>
252+
<file>themes/default/mActionEditTable.svg</file>
250253
<file>themes/default/mActionExpandNewTree.svg</file>
251254
<file>themes/default/mActionExpandTree.svg</file>
252255
<file>themes/default/mActionFileExit.svg</file>
+1-22
Loading
Loading
Loading
Loading
+1-47
Loading

python/plugins/db_manager/db_manager.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from qgis.PyQt.QtGui import QIcon, QKeySequence
3030

3131
from qgis.gui import QgsMessageBar
32-
from qgis.core import Qgis, QgsSettings, QgsMapLayer
32+
from qgis.core import Qgis, QgsApplication, QgsSettings, QgsMapLayer
3333
from qgis.utils import OverrideCursor
3434

3535
from .info_viewer import InfoViewer
@@ -429,7 +429,7 @@ def setupUi(self):
429429
sep.setObjectName("DB_Manager_DbMenu_placeholder")
430430
sep.setVisible(False)
431431

432-
self.actionRefresh = self.menuDb.addAction(QIcon(":/db_manager/actions/refresh"), self.tr("&Refresh"),
432+
self.actionRefresh = self.menuDb.addAction(QgsApplication.getThemeIcon("/mActionRefresh.svg"), self.tr("&Refresh"),
433433
self.refreshActionSlot, QKeySequence("F5"))
434434
self.actionSqlWindow = self.menuDb.addAction(QIcon(":/db_manager/actions/sql_window"), self.tr("&SQL Window"),
435435
self.runSqlWindow, QKeySequence("F2"))
@@ -463,5 +463,11 @@ def setupUi(self):
463463
# add actions to the toolbar
464464
self.toolBar.addAction(self.actionRefresh)
465465
self.toolBar.addAction(self.actionSqlWindow)
466+
self.toolBar.addSeparator()
466467
self.toolBar.addAction(self.actionImport)
467468
self.toolBar.addAction(self.actionExport)
469+
470+
widget = self.toolBar.widgetForAction(self.actionImport)
471+
widget.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
472+
widget = self.toolBar.widgetForAction(self.actionExport)
473+
widget.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)

0 commit comments

Comments
 (0)