fix icons

Author: hiaselhans

openglider/gui/app/main_window.py

@@ -8,11 +8,11 @@
 import tempfile
 from typing import TYPE_CHECKING, Any
 from collections.abc import Callable, Iterator
-import qtawesome
 
 import openglider
 from openglider.glider.project import GliderProject
 from openglider.gui.qt import QtCore, QtWidgets, QtGui, QAction
+from openglider.gui.icons import icon
 from openglider.gui.views.compare import GliderPreview
 from openglider.gui.views.console import ConsoleHandler, ConsoleWidget
 from openglider.gui.views.glider_list import GliderListWidget
@@ -51,7 +51,7 @@ def run(self) -> None:
 
     def get_qt_action(self) -> QAction:
         if self.action is None:
-            self.action = QAction(qtawesome.icon("fa.minus"), self.name, self.main_window)
+            self.action = QAction(icon("fa.minus"), self.name, self.main_window)
             self.action.triggered.connect(self.run)
 
         return self.action
@@ -141,27 +141,27 @@ def add_menu(self) -> None:
             self.menus[menu_name] = menubar.addMenu(f"&{menu_name}")
 
         self.menus["debug"] = menubar.addMenu("&Debug")
-        reload_action = QAction(qtawesome.icon("fa.minus"), "Reload", self)
+        reload_action = QAction(icon("fa.minus"), "Reload", self)
         reload_action.triggered.connect(self.app.reload_code)
         self.menus["debug"].addAction(reload_action)
 
-        toggle_console = QAction(qtawesome.icon("mdi6.file-document-outline"), "Toggle Console", self)
+        toggle_console = QAction(icon("mdi6.file-document-outline"), "Toggle Console", self)
         toggle_console.setShortcut("del")  #QtGui.QKeySequence(QtCore.Qt.Key_AsciiCircum)
         #toggle_console.setStatusTip("Toggle Console")
         toggle_console.triggered.connect(self.toggle_console)
         menubar.addAction(toggle_console)
 
-        load_glider = QAction(qtawesome.icon("fa.folder"), "Open", self)
+        load_glider = QAction(icon("fa.folder"), "Open", self)
         load_glider.setShortcut("Ctrl+O")
         load_glider.setStatusTip("Load Glider")
         load_glider.triggered.connect(self.open_dialog)
 
-        load_demokite = QAction(qtawesome.icon("fa.folder"), "Demokite", self)
+        load_demokite = QAction(icon("fa.folder"), "Demokite", self)
         load_demokite.setShortcut("Ctrl+D")
         load_demokite.setStatusTip("Load Demokite")
         load_demokite.triggered.connect(self.load_demokite)
 
-        diff_gliders = QAction(qtawesome.icon("fa.folder"), "Diff gliders", self)
+        diff_gliders = QAction(icon("fa.folder"), "Diff gliders", self)
         diff_gliders.setStatusTip("Diff gliders")
         diff_gliders.triggered.connect(self.diff)
 

openglider/gui/icons/__init__.py

@@ -0,0 +1,6 @@
+import qtawesome
+
+def icon(name, *args, **kwargs):
+    if name.startswith("fa."):
+        name = name.replace("fa.", "fa5s.", 1)
+    return qtawesome.icon(name, *args, **kwargs)

openglider/gui/views/glider_list.py

@@ -8,7 +8,7 @@
 from typing import Any
 
 import openglider
-import qtawesome
+from openglider.gui.icons import icon
 from openglider.glider.project import GliderProject
 from openglider.gui.state.glider_list import GliderListItem, GliderList
 from openglider.gui.qt import QtWidgets
@@ -26,13 +26,13 @@ def draw_buttons(self) -> None:
 
         self.button_save = QtWidgets.QPushButton()
         self.button_save.setFixedSize(30, 30)
-        self.button_save.setIcon(qtawesome.icon("fa.save"))
+        self.button_save.setIcon(icon("fa.save"))
         self.button_save.clicked.connect(self.save)
         self.layout().addWidget(self.button_save)
 
         self.button_edit = QtWidgets.QPushButton()
         self.button_edit.setFixedSize(30, 30)
-        self.button_edit.setIcon(qtawesome.icon("fa.edit"))
+        self.button_edit.setIcon(icon("fa.edit"))
         self.button_edit.clicked.connect(self.edit)
         self.layout().addWidget(self.button_edit)
 

openglider/gui/views/tasks.py

@@ -3,9 +3,9 @@
 from typing import TYPE_CHECKING, Any, Generic, TypeVar
 import logging
 import asyncio
-import qtawesome
 
 from openglider.gui.qt import QtWidgets, QtCore
+from openglider.gui.icons import icon
 
 from openglider.utils.tasks import TaskQueue, Task
 from openglider.gui.views.window import Window
@@ -40,7 +40,7 @@ def __init__(self, parent: QtWidgets.QWidget, app: MainWindow, task: Task, view:
         self.label_runtime = QtWidgets.QLabel()
 
         self.button_view = QtWidgets.QToolButton()
-        self.button_view.setIcon(qtawesome.icon("fa.plus"))
+        self.button_view.setIcon(icon("fa.plus"))
 
 
         if self.view_class is None:
@@ -65,7 +65,7 @@ def update(self, *args: Any, **kwargs: Any) -> None:
         if self.task.failed:
             button = "fa.thumbs-down"
 
-        icon = qtawesome.icon(button)
+        icon = icon(button)
 
         self.label_status.setPixmap(icon.pixmap(QtCore.QSize(40, 40)))
 

openglider/gui/widgets/list_select/item.py

@@ -2,8 +2,7 @@
 import logging
 from typing import Any, TypeVar, Generic, TYPE_CHECKING
 
-import qtawesome
-
+from openglider.gui.icons import icon
 from openglider.gui.state.selection_list.list import SelectionListItem, ItemType
 from openglider.gui.widgets import InputLabel
 from openglider.utils.colors import Color
@@ -49,13 +48,13 @@ def draw_buttons(self) -> None:
         self.button_active.clicked.connect(self.toggle_active)
 
         self.button_color = QtWidgets.QPushButton()
-        self.button_color.setIcon(qtawesome.icon("fa.edit"))
+        self.button_color.setIcon(icon("fa.edit"))
         self.button_color.setFixedSize(30, 30)
         self.button_color.clicked.connect(self.choose_color)
         self.layout().addWidget(self.button_color)
 
         self.button_remove = QtWidgets.QPushButton()
-        self.button_remove.setIcon(qtawesome.icon("fa.trash"))
+        self.button_remove.setIcon(icon("fa.trash"))
         self.button_remove.setFixedSize(30, 30)
         self.layout().addWidget(self.button_remove)
 
@@ -67,11 +66,11 @@ def toggle_active(self) -> None:
 
     def update_active_icon(self) -> None:
         if self.list_item.active:
-            self.button_active.setIcon(qtawesome.icon("msc.folder-active"))
+            self.button_active.setIcon(icon("msc.folder-active"))
             #self.button_active.setAttribute(QtCore.WA_StyledBackground, True)
             self.button_active.setStyleSheet(f"background-color: #{self.list_item.color.hex()};")
         else:
-            self.button_active.setIcon(qtawesome.icon("fa.search"))
+            self.button_active.setIcon(icon("fa.search"))
             self.button_active.setStyleSheet('background-color: transparent;')
 
     def mouseDoubleClickEvent(self, e: QtGui.QMouseEvent) -> None: