From a4052bb43e6d2a4b580c4ba8240e671f1e623d18 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 28 Aug 2022 09:07:34 +0200 Subject: [PATCH] use Icon instead of QIcon --- src/mainwindow.py | 3 ++- src/plugins/filesbrowser/filesbrowserwidget.py | 6 +++--- src/plugins/logfile/filterwidget.py | 1 - src/plugins/timediffplugin.py | 6 ------ src/ui/bigtext/bigtext.py | 7 ++++--- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/mainwindow.py b/src/mainwindow.py index 2388a22..4ed3b43 100644 --- a/src/mainwindow.py +++ b/src/mainwindow.py @@ -5,6 +5,7 @@ from PySide6.QtWidgets import * from PySide6.QtGui import * from PySide6.QtCore import Qt +from src.ui.icon import Icon from src.util import urlutils from src.settings.cutesettings import CuteSettings from src.pluginregistry import PluginRegistry @@ -78,7 +79,7 @@ class MainWindow(QMainWindow): menu.addAction(action) if menu_contribution.menu: submenu = QMenu(menu_contribution.menu.label, menu_bar) - submenu.setIcon(QIcon.fromTheme(menu_contribution.menu.icon_from_theme)) + submenu.setIcon(Icon.fromTheme(menu_contribution.menu.icon_from_theme)) menu_contribution.menu.add_change_listener( lambda qmenu=submenu, rmenu=menu_contribution.menu: self._rmenu_update(qmenu, rmenu)) self._rmenu_update(submenu, menu_contribution.menu) diff --git a/src/plugins/filesbrowser/filesbrowserwidget.py b/src/plugins/filesbrowser/filesbrowserwidget.py index 10b3ab2..b1b14a6 100644 --- a/src/plugins/filesbrowser/filesbrowserwidget.py +++ b/src/plugins/filesbrowser/filesbrowserwidget.py @@ -4,7 +4,6 @@ import sys from pathlib import Path from PySide6.QtCore import QDir, QModelIndex -from PySide6.QtGui import QIcon from src.pluginregistry import PluginRegistry from src.plugins.krowlog.Tab import Tab @@ -14,6 +13,7 @@ from src.i18n import _ from src.settings.settings import Settings from src.ui.formgrid import FormGrid from src.ui.hbox import HBox +from src.ui.icon import Icon class FilesBrowserWidget(Tab): @@ -30,10 +30,10 @@ class FilesBrowserWidget(Tab): self._base_dir = QLineEdit(self._initialFolder()) self._base_dir.textChanged.connect(self._base_dir_changed) - btn_select_base_dir = QPushButton(QIcon("icons/ionicons/folder-open.svg"), "") + btn_select_base_dir = QPushButton(Icon("icons/ionicons/folder-open.svg"), "") btn_select_base_dir.pressed.connect(self._select_base_dir) - btn_base_dir_for_current_file = QPushButton(QIcon("icons/myicons/target.svg"), "") + btn_base_dir_for_current_file = QPushButton(Icon("icons/myicons/target.svg"), "") btn_base_dir_for_current_file.setToolTip(_("Focus on current file")) btn_base_dir_for_current_file.pressed.connect(self._select_btn_base_dir_for_current_file) diff --git a/src/plugins/logfile/filterwidget.py b/src/plugins/logfile/filterwidget.py index 3f18907..e1d6d6c 100644 --- a/src/plugins/logfile/filterwidget.py +++ b/src/plugins/logfile/filterwidget.py @@ -6,7 +6,6 @@ import time from typing import Optional, Callable from PySide6.QtCore import QRunnable, QThreadPool, Signal -from PySide6.QtGui import QIcon from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QPushButton, QComboBox, \ QSizePolicy, QProgressBar diff --git a/src/plugins/timediffplugin.py b/src/plugins/timediffplugin.py index a2d0795..0e20799 100644 --- a/src/plugins/timediffplugin.py +++ b/src/plugins/timediffplugin.py @@ -1,14 +1,8 @@ from typing import Optional - -from PySide6.QtGui import QIcon - from src.pluginbase import PluginBase from src.plugins.domain.raction import RAction -from src.plugins.logfile.filterwidget import FilterWidget from src.plugins.logfile.preprocesslineshook import PreProcessLinesHook from src.plugins.timediff.time_diff_pre_process_lines_hook import TimeDiffPreProcessLinesHook -from src.i18n import _ - class TimeDiffPlugin(PluginBase): def __init__(self): diff --git a/src/ui/bigtext/bigtext.py b/src/ui/bigtext/bigtext.py index 27aeb81..a962c4e 100644 --- a/src/ui/bigtext/bigtext.py +++ b/src/ui/bigtext/bigtext.py @@ -16,6 +16,7 @@ from src.ui.bigtext.highlighted_range import HighlightedRange from src.ui.bigtext.highlightingdialog import HighlightingDialog from src.ui.bigtext.line import Line from src.ui.bigtext.logFileModel import LogFileModel +from src.ui.icon import Icon from src.util.conversion import humanbytes from src.pluginregistry import PluginRegistry @@ -175,18 +176,18 @@ class InnerBigText(QWidget): def _open_menu(self, position): menu = QMenu(self) - copy_clipboard = QAction(QIcon.fromTheme("edit-copy"), _("&Copy to Clipboard"), self, + copy_clipboard = QAction(Icon.fromTheme("edit-copy"), _("&Copy to Clipboard"), self, triggered=self.copy_selection) copy_clipboard.setShortcut("CTRL+C") copy_clipboard.setDisabled(not self._has_selection()) menu.addAction(copy_clipboard) - copy_to_file = QAction(QIcon.fromTheme("document-save-as"), _("Copy to &File"), self, + copy_to_file = QAction(Icon.fromTheme("document-save-as"), _("Copy to &File"), self, triggered=self._copy_selection_to_file) copy_to_file.setDisabled(not self._has_selection()) menu.addAction(copy_to_file) - select_all = QAction(QIcon.fromTheme("edit-select-all"), _("Select &All"), self, + select_all = QAction(Icon.fromTheme("edit-select-all"), _("Select &All"), self, triggered=self._select_all) select_all.setShortcut("CTRL+A") menu.addAction(select_all)