use Icon instead of QIcon

This commit is contained in:
2022-08-28 09:07:34 +02:00
parent 272a0fa076
commit a4052bb43e
5 changed files with 9 additions and 14 deletions

View File

@@ -5,6 +5,7 @@ from PySide6.QtWidgets import *
from PySide6.QtGui import * from PySide6.QtGui import *
from PySide6.QtCore import Qt from PySide6.QtCore import Qt
from src.ui.icon import Icon
from src.util import urlutils from src.util import urlutils
from src.settings.cutesettings import CuteSettings from src.settings.cutesettings import CuteSettings
from src.pluginregistry import PluginRegistry from src.pluginregistry import PluginRegistry
@@ -78,7 +79,7 @@ class MainWindow(QMainWindow):
menu.addAction(action) menu.addAction(action)
if menu_contribution.menu: if menu_contribution.menu:
submenu = QMenu(menu_contribution.menu.label, menu_bar) 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( menu_contribution.menu.add_change_listener(
lambda qmenu=submenu, rmenu=menu_contribution.menu: self._rmenu_update(qmenu, rmenu)) lambda qmenu=submenu, rmenu=menu_contribution.menu: self._rmenu_update(qmenu, rmenu))
self._rmenu_update(submenu, menu_contribution.menu) self._rmenu_update(submenu, menu_contribution.menu)

View File

@@ -4,7 +4,6 @@ import sys
from pathlib import Path from pathlib import Path
from PySide6.QtCore import QDir, QModelIndex from PySide6.QtCore import QDir, QModelIndex
from PySide6.QtGui import QIcon
from src.pluginregistry import PluginRegistry from src.pluginregistry import PluginRegistry
from src.plugins.krowlog.Tab import Tab from src.plugins.krowlog.Tab import Tab
@@ -14,6 +13,7 @@ from src.i18n import _
from src.settings.settings import Settings from src.settings.settings import Settings
from src.ui.formgrid import FormGrid from src.ui.formgrid import FormGrid
from src.ui.hbox import HBox from src.ui.hbox import HBox
from src.ui.icon import Icon
class FilesBrowserWidget(Tab): class FilesBrowserWidget(Tab):
@@ -30,10 +30,10 @@ class FilesBrowserWidget(Tab):
self._base_dir = QLineEdit(self._initialFolder()) self._base_dir = QLineEdit(self._initialFolder())
self._base_dir.textChanged.connect(self._base_dir_changed) 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_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.setToolTip(_("Focus on current file"))
btn_base_dir_for_current_file.pressed.connect(self._select_btn_base_dir_for_current_file) btn_base_dir_for_current_file.pressed.connect(self._select_btn_base_dir_for_current_file)

View File

@@ -6,7 +6,6 @@ import time
from typing import Optional, Callable from typing import Optional, Callable
from PySide6.QtCore import QRunnable, QThreadPool, Signal from PySide6.QtCore import QRunnable, QThreadPool, Signal
from PySide6.QtGui import QIcon
from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QPushButton, QComboBox, \ from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QPushButton, QComboBox, \
QSizePolicy, QProgressBar QSizePolicy, QProgressBar

View File

@@ -1,14 +1,8 @@
from typing import Optional from typing import Optional
from PySide6.QtGui import QIcon
from src.pluginbase import PluginBase from src.pluginbase import PluginBase
from src.plugins.domain.raction import RAction from src.plugins.domain.raction import RAction
from src.plugins.logfile.filterwidget import FilterWidget
from src.plugins.logfile.preprocesslineshook import PreProcessLinesHook from src.plugins.logfile.preprocesslineshook import PreProcessLinesHook
from src.plugins.timediff.time_diff_pre_process_lines_hook import TimeDiffPreProcessLinesHook from src.plugins.timediff.time_diff_pre_process_lines_hook import TimeDiffPreProcessLinesHook
from src.i18n import _
class TimeDiffPlugin(PluginBase): class TimeDiffPlugin(PluginBase):
def __init__(self): def __init__(self):

View File

@@ -16,6 +16,7 @@ from src.ui.bigtext.highlighted_range import HighlightedRange
from src.ui.bigtext.highlightingdialog import HighlightingDialog from src.ui.bigtext.highlightingdialog import HighlightingDialog
from src.ui.bigtext.line import Line from src.ui.bigtext.line import Line
from src.ui.bigtext.logFileModel import LogFileModel from src.ui.bigtext.logFileModel import LogFileModel
from src.ui.icon import Icon
from src.util.conversion import humanbytes from src.util.conversion import humanbytes
from src.pluginregistry import PluginRegistry from src.pluginregistry import PluginRegistry
@@ -175,18 +176,18 @@ class InnerBigText(QWidget):
def _open_menu(self, position): def _open_menu(self, position):
menu = QMenu(self) 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) triggered=self.copy_selection)
copy_clipboard.setShortcut("CTRL+C") copy_clipboard.setShortcut("CTRL+C")
copy_clipboard.setDisabled(not self._has_selection()) copy_clipboard.setDisabled(not self._has_selection())
menu.addAction(copy_clipboard) 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) triggered=self._copy_selection_to_file)
copy_to_file.setDisabled(not self._has_selection()) copy_to_file.setDisabled(not self._has_selection())
menu.addAction(copy_to_file) 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) triggered=self._select_all)
select_all.setShortcut("CTRL+A") select_all.setShortcut("CTRL+A")
menu.addAction(select_all) menu.addAction(select_all)