load_icon() helper function was removed.

JalIcon class was extended with aux_icon() method to load icons by name.

jal/db/helpers.py

@@ -87,11 +87,6 @@ def db_row2dict(model, row) -> dict:
     record = model.record(row)
     return {record.field(x).name(): record.value(x) for x in range(record.count())}
 
-# -------------------------------------------------------------------------------------------------------------------
-# returns QIcon loaded from the file with icon_name located in folder Setup.ICONS_PATH
-def load_icon(icon_name) -> QIcon:
-    return QIcon(get_app_path() + Setup.ICONS_PATH + os.sep + icon_name)
-
 # -------------------------------------------------------------------------------------------------------------------
 # Returns timestamp of the first second of the year of given timestamp
 def year_begin(timestamp: int) -> int:

jal/widgets/icons.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 from enum import auto
 from collections import UserDict
 from PySide6.QtGui import QIcon
@@ -9,6 +10,7 @@
 
 ICON_PREFIX = "ui_"
 FLAG_PREFIX = "flag_"
+AUX_PREFIX = "aux_"
 
 class JalIcon(UserDict):
     NONE = auto()
@@ -108,6 +110,10 @@ def __init__(self):
             self._icons[icon_id] = self.load_icon(img_path + ICON_PREFIX + filename)
         for icon_id, filename in self._flag_files.items():
             self._icons[icon_id] = self.load_icon(img_path + FLAG_PREFIX + filename)
+        for filename in os.listdir(img_path):
+            match = re.match(f"^{AUX_PREFIX}.*", filename)
+            if match:
+                self._icons[filename] = self.load_icon(img_path + filename)
 
     @staticmethod
     def load_icon(path) -> QIcon:
@@ -127,3 +133,10 @@ def country_flag(cls, country_code) -> QIcon:
         if country_code not in cls._flags:
             return QIcon()
         return cls._icons[cls._flags[country_code]]
+
+    @classmethod
+    def aux_icon(cls, icon_name) -> QIcon:
+        filename = AUX_PREFIX + icon_name
+        if filename not in cls._icons:
+            return QIcon()
+        return cls._icons[filename]

jal/widgets/main_window.py

@@ -20,7 +20,7 @@
     CategoryListDialog, QuotesListDialog, PeerListDialog, BaseCurrencyDialog
 from jal.constants import Setup
 from jal.db.backup_restore import JalBackup
-from jal.db.helpers import get_app_path, get_dbfilename, load_icon
+from jal.db.helpers import get_app_path, get_dbfilename
 from jal.db.account import JalAccount
 from jal.db.asset import JalAsset
 from jal.db.settings import JalSettings
@@ -186,7 +186,7 @@ def createStatementsImportMenu(self):
         for i, statement in enumerate(self.statements.items):
             statement_name = statement['name'].replace('&', '&&')  # & -> && to prevent shortcut creation
             if statement['icon']:
-                statement_icon = load_icon(statement['icon'])
+                statement_icon = JalIcon.aux_icon(statement['icon'])
                 action = QAction(statement_icon, statement_name, self)
             else:
                 action = QAction(statement_name, self)