diff --git a/python/plugins/db_manager/db_plugins/info_model.py b/python/plugins/db_manager/db_plugins/info_model.py index 0dac39e3a24..c27d77b521b 100644 --- a/python/plugins/db_manager/db_plugins/info_model.py +++ b/python/plugins/db_manager/db_plugins/info_model.py @@ -77,7 +77,7 @@ class DatabaseInfo: def toHtml(self): if self.db is None: - return HtmlSection(QApplication.translate("DBManagerPlugin", 'Not connected')).toHtml() + return HtmlSection(QApplication.translate("DBManagerPlugin", ' Not connected')).toHtml() ret = [] diff --git a/python/plugins/db_manager/gui_utils.py b/python/plugins/db_manager/gui_utils.py index a9845c107fa..2d999453856 100644 --- a/python/plugins/db_manager/gui_utils.py +++ b/python/plugins/db_manager/gui_utils.py @@ -72,11 +72,9 @@ class GuiUtils: return path @staticmethod - def get_icon_as_pixmap(icon: str) -> Optional[QPixmap]: + def get_pixmap_path(icon: str) -> Optional[str]: """ - Returns a plugin icon's PNG file path - :param icon: icon name (png file name) - :return: icon png path + Returns the path to a pixmap icon """ for suffix in ('.png', '.gif', '.xpm'): path = os.path.join( @@ -84,8 +82,21 @@ class GuiUtils: 'icons', icon + suffix) if os.path.exists(path): - im = QImage(path) - return QPixmap.fromImage(im) + return path + + return None + + @staticmethod + def get_icon_as_pixmap(icon: str) -> Optional[QPixmap]: + """ + Returns a plugin icon's PNG file path + :param icon: icon name (png file name) + :return: icon png path + """ + path = GuiUtils.get_pixmap_path(icon) + if path is not None: + im = QImage(path) + return QPixmap.fromImage(im) return None diff --git a/python/plugins/db_manager/info_viewer.py b/python/plugins/db_manager/info_viewer.py index 3e259af1ad2..d691c8815a0 100644 --- a/python/plugins/db_manager/info_viewer.py +++ b/python/plugins/db_manager/info_viewer.py @@ -24,6 +24,7 @@ from qgis.utils import OverrideCursor from .db_plugins.plugin import BaseError, DbError, DBPlugin, Schema, Table from .dlg_db_error import DlgDbError +from .gui_utils import GuiUtils class InfoViewer(QTextBrowser): @@ -135,8 +136,9 @@ class InfoViewer(QTextBrowser): return True def setHtml(self, html): - # convert special tags :) - html = str(html).replace('', '   ') + # convert special tags + warning_icon_path = GuiUtils.get_pixmap_path('warning-20px') + html = str(html).replace('', f'   ') # add default style html = """