refactor(pixmap): route all panel icons through BlocksPixmap

BlocksScreen/lib/panels/controlTab.py

@@ -272,12 +272,6 @@ def __init__(
             )
         )
 
-        self.path = {
-            "fan_cage": QtGui.QPixmap(":/fan_related/media/btn_icons/fan_cage.svg"),
-            "blower": QtGui.QPixmap(":/fan_related/media/btn_icons/blower.svg"),
-            "fan": QtGui.QPixmap(":/fan_related/media/btn_icons/fan.svg"),
-        }
-
         self.panel.cp_z_tilt_btn.clicked.connect(lambda: self.handle_ztilt())
 
         self.printcores_page.pc_accept.clicked.connect(self.handle_swapcore)

BlocksScreen/lib/panels/filamentTab.py

@@ -18,6 +18,7 @@
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_linedit import BlocksCustomLinEdit
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -175,7 +176,7 @@ def _build_form_page(self) -> QtWidgets.QWidget:
         back_btn = IconButton(page)
         back_btn.setFixedSize(QtCore.QSize(60, 60))
         back_btn.setFlat(True)
-        back_btn.setPixmap(QtGui.QPixmap(":/ui/media/btn_icons/back.svg"))
+        back_btn.setPixmap(BlocksPixmap.get(Icon.BACK))
         back_btn.clicked.connect(lambda: self.popup.hide())
         hdr.addWidget(back_btn)
 
@@ -290,17 +291,15 @@ def _update_swatch():
         skip_btn.setText("Skip")
         skip_btn.setFont(font)
         skip_btn.clicked.connect(self.handle_skip_button)
-        skip_btn.setPixmap(
-            QtGui.QPixmap(":/arrow_icons/media/btn_icons/right_arrow.svg")
-        )
+        skip_btn.setPixmap(BlocksPixmap.get(Icon.RIGHT_ARROW))
         btn_row.addWidget(skip_btn)
 
         accept_btn = BlocksCustomButton(page)
         accept_btn.setFixedSize(230, 80)
         accept_btn.setText("Accept")
         accept_btn.setFont(font)
         accept_btn.clicked.connect(self.on_popup_accept)
-        accept_btn.setPixmap(QtGui.QPixmap(":/dialog/media/btn_icons/yes.svg"))
+        accept_btn.setPixmap(BlocksPixmap.get(Icon.YES))
         btn_row.addWidget(accept_btn)
 
         root.addLayout(btn_row)
@@ -331,7 +330,7 @@ def _build_spool_page(self) -> QtWidgets.QWidget:
         back_btn = IconButton(page)
         back_btn.setFixedSize(QtCore.QSize(60, 60))
         back_btn.setFlat(True)
-        back_btn.setPixmap(QtGui.QPixmap(":/ui/media/btn_icons/back.svg"))
+        back_btn.setPixmap(BlocksPixmap.get(Icon.BACK))
         back_btn.clicked.connect(lambda: self.popup.hide())
         hdr.addWidget(back_btn)
 
@@ -486,15 +485,13 @@ def _add_row(title_text: str) -> QtWidgets.QLabel:
         self.skip_btn.setText("Skip")
         self.skip_btn.setFixedSize(QtCore.QSize(230, 80))
         self.skip_btn.setFont(font)
-        self.skip_btn.setPixmap(
-            QtGui.QPixmap(":/arrow_icons/media/btn_icons/right_arrow.svg")
-        )
+        self.skip_btn.setPixmap(BlocksPixmap.get(Icon.RIGHT_ARROW))
         self.skip_btn.clicked.connect(self.handle_skip_button)
 
         self.accept_btn = BlocksCustomButton(frame_2)
         self.accept_btn.setText("Accept")
         self.accept_btn.setFixedSize(QtCore.QSize(230, 80))
-        self.accept_btn.setPixmap(QtGui.QPixmap(":/dialog/media/btn_icons/yes.svg"))
+        self.accept_btn.setPixmap(BlocksPixmap.get(Icon.YES))
         self.accept_btn.setFont(font)
         self.accept_btn.clicked.connect(lambda: self._on_spool_selected())
 
@@ -958,7 +955,7 @@ def setupUi(self):
         self.fp_button_1.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.fp_button_1.setProperty(
             "icon_pixmap",
-            QtGui.QPixmap(":/filament_related/media/btn_icons/load_filament.svg"),
+            BlocksPixmap.get(Icon.LOAD_FILAMENT),
         )
         self.fp_button_1.setObjectName("fp_button_1")
 
@@ -973,7 +970,7 @@ def setupUi(self):
         self.fp_button_2.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.fp_button_2.setProperty(
             "icon_pixmap",
-            QtGui.QPixmap(":/filament_related/media/btn_icons/base dados spool 1.svg"),
+            BlocksPixmap.get(Icon.BASE_DADOS_SPOOL_1),
         )
         self.fp_button_2.setObjectName("fp_button_2")
 

BlocksScreen/lib/panels/printTab.py

@@ -17,6 +17,7 @@
 from lib.panels.widgets.tunePage import TuneWidget
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.display_button import DisplayButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
@@ -541,9 +542,7 @@ def setupMainPrintPage(self) -> None:
         self.main_print_btn.setStyleSheet("")
         self.main_print_btn.setAutoDefault(False)
         self.main_print_btn.setFlat(True)
-        self.main_print_btn.setProperty(
-            "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/print.svg")
-        )
+        self.main_print_btn.setProperty("icon_pixmap", BlocksPixmap.get(Icon.PRINT))
         self.main_print_btn.setObjectName("main_print_btn")
         self.save_config_btn = DisplayButton(parent=self.print_page)
         self.save_config_btn.setGeometry(QtCore.QRect(540, 20, 170, 50))
@@ -555,9 +554,7 @@ def setupMainPrintPage(self) -> None:
         self.save_config_btn.setContextMenuPolicy(
             QtCore.Qt.ContextMenuPolicy.NoContextMenu
         )
-        self.save_config_btn.setProperty(
-            "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/save.svg")
-        )
+        self.save_config_btn.setProperty("icon_pixmap", BlocksPixmap.get(Icon.SAVE))
         self.save_config_btn.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.save_config_btn.setStyleSheet("")
         self.save_config_btn.setAutoDefault(False)

BlocksScreen/lib/panels/utilitiesTab.py

@@ -12,8 +12,9 @@
 from lib.printer import Printer
 from lib.ui.utilitiesStackedWidget_ui import Ui_utilitiesStackedWidget
 from lib.utils.blocks_button import BlocksCustomButton
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.toggleAnimatedButton import ToggleAnimatedButton
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 @dataclass
@@ -127,7 +128,7 @@ def __init__(
         self._is_timeout_timer.timeout.connect(self._on_is_timeout)
 
         # --- PixMap ---
-        self._led_pixmap = QtGui.QPixmap(":/ui/media/btn_icons/LEDs.svg")
+        self._led_pixmap = BlocksPixmap.get(Icon.LEDS)
         # --- UI Setup ---
         self.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.panel.update_btn.clicked.connect(
@@ -204,16 +205,14 @@ def __init__(
         self.printer.printer_config.connect(self.on_printer_config_received)
         self.printer.gcode_move_update.connect(self.on_gcode_move_update)
 
-        self.panel.update_btn.setPixmap(
-            QtGui.QPixmap(":/system/media/btn_icons/update-software-icon.svg")
-        )
+        self.panel.update_btn.setPixmap(BlocksPixmap.get(Icon.UPDATE_SOFTWARE_ICON))
 
         # ---- Input Shaper ----
         self.automatic_is = OptionCard(
             self,
             "Automatic\nInput Shaper",
             "Automatic Input Shaper",
-            QtGui.QPixmap(":/input_shaper/media/btn_icons/input_shaper_auto.svg"),
+            BlocksPixmap.get(Icon.INPUT_SHAPER_AUTO),
         )  # type: ignore
         self.automatic_is.setObjectName("Automatic_IS_Card")
         self.panel.is_content_layout.addWidget(
@@ -227,7 +226,7 @@ def __init__(
             self,
             "Manual\nInput Shaper",
             "Manual Input Shaper",
-            QtGui.QPixmap(":/input_shaper/media/btn_icons/input_shaper_manual.svg"),
+            BlocksPixmap.get(Icon.INPUT_SHAPER_MANUAL),
         )  # type: ignore
         self.manual_is.setObjectName("Manual_IS_Card")
         self.panel.is_content_layout.addWidget(

BlocksScreen/lib/panels/widgets/addFilamentPage.py

@@ -7,6 +7,7 @@
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_linedit import BlocksCustomLinEdit
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
@@ -242,7 +243,7 @@ def _make_field(parent: QtWidgets.QWidget) -> BlocksCustomLinEdit:
         back_btn = IconButton(self)
         back_btn.setFixedSize(QtCore.QSize(60, 60))
         back_btn.setFlat(True)
-        back_btn.setPixmap(QtGui.QPixmap(":/ui/media/btn_icons/back.svg"))
+        back_btn.setPixmap(BlocksPixmap.get(Icon.BACK))
         back_btn.clicked.connect(self.cancelled)
         hdr.addWidget(back_btn)
         root.addLayout(hdr)
@@ -367,8 +368,6 @@ def _make_field(parent: QtWidgets.QWidget) -> BlocksCustomLinEdit:
         submit_btn.setFixedSize(220, 80)
         submit_btn.setFont(_f(16))
         submit_btn.setText("Add\nFilament")
-        submit_btn.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/add filament.svg")
-        )
+        submit_btn.setPixmap(BlocksPixmap.get(Icon.ADD_FILAMENT))
         submit_btn.clicked.connect(self._on_submit)
         root.addWidget(submit_btn, alignment=QtCore.Qt.AlignmentFlag.AlignCenter)

BlocksScreen/lib/panels/widgets/addSpoolPage.py

@@ -7,6 +7,7 @@
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_linedit import BlocksCustomLinEdit
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -286,7 +287,7 @@ def _key_lbl(text: str) -> QtWidgets.QLabel:
         back_btn = IconButton(self)
         back_btn.setFixedSize(QtCore.QSize(60, 60))
         back_btn.setFlat(True)
-        back_btn.setPixmap(QtGui.QPixmap(":/ui/media/btn_icons/back.svg"))
+        back_btn.setPixmap(BlocksPixmap.get(Icon.BACK))
         back_btn.clicked.connect(self.cancelled)
         hdr.addWidget(back_btn)
         root.addLayout(hdr)
@@ -383,9 +384,7 @@ def _field(label: str) -> BlocksCustomLinEdit:
         self._submit_btn.setText("Add Spool")
         self._submit_btn.setEnabled(False)
         self._submit_btn.clicked.connect(self._on_submit)
-        self._submit_btn.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/add spool.svg")
-        )
+        self._submit_btn.setPixmap(BlocksPixmap.get(Icon.ADD_SPOOL))
         right_lay.addWidget(self._submit_btn)
 
         body.addWidget(right_frame, 1)

BlocksScreen/lib/panels/widgets/amuPage.py

@@ -4,6 +4,7 @@
 from devices.amu.models import GateInfo
 from lib.panels.widgets.amuWidgets import SpoolCarousel, SpoolInfoPanel
 from lib.utils.blocks_frame import BlocksCustomFrame
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
@@ -217,9 +218,7 @@ def _build_ui(self):
         self.main_back_button.setSizePolicy(sizePolicy)
         self.main_back_button.setMinimumSize(QtCore.QSize(60, 60))
         self.main_back_button.setMaximumSize(QtCore.QSize(60, 60))
-        self.main_back_button.setProperty(
-            "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")
-        )
+        self.main_back_button.setProperty("icon_pixmap", BlocksPixmap.get(Icon.BACK))
         self.main_back_button.setObjectName("main_back_button")
         self.filament_page_header_layout.addWidget(self.main_back_button)
 

BlocksScreen/lib/panels/widgets/amuWidgets.py

@@ -3,6 +3,7 @@
 from devices.amu.models import GateStatus
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_linedit import BlocksCustomLinEdit
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
@@ -21,12 +22,8 @@ def __init__(self, parent=None):
         self.weight = 0
         self.setCheckable(True)
         self.setMinimumHeight(100)
-        self._icon = QtGui.QPixmap(
-            ":/filament_related/media/btn_icons/loaded_spool.svg"
-        )
-        self._unloaded_icon = QtGui.QPixmap(
-            ":/filament_related/media/btn_icons/half_spoll.svg"
-        )
+        self._icon = BlocksPixmap.get(Icon.LOADED_SPOOL)
+        self._unloaded_icon = BlocksPixmap.get(Icon.HALF_SPOLL)
 
     def setColor(self, qc: QtGui.QColor):
         """sets button color
@@ -213,13 +210,9 @@ def _build_ui(self):
         root = QtWidgets.QHBoxLayout(self)
 
         self.left_arrow = IconButton(self)
-        self.left_arrow.setPixmap(
-            QtGui.QPixmap(":/arrow_icons/media/btn_icons/arrow_left.svg")
-        )
+        self.left_arrow.setPixmap(BlocksPixmap.get(Icon.ARROW_LEFT))
         self.right_arrow = IconButton(self)
-        self.right_arrow.setPixmap(
-            QtGui.QPixmap(":/arrow_icons/media/btn_icons/arrow_right.svg")
-        )
+        self.right_arrow.setPixmap(BlocksPixmap.get(Icon.ARROW_RIGHT))
 
         self.right_arrow.setFixedWidth(60)
         self.left_arrow.setFixedWidth(60)
@@ -449,27 +442,19 @@ def make_val(text="—", edit: bool = True, type: str = "keypad"):
         self._btn_load.setText("Load")
         self._btn_load.setFixedSize(140, 60)
         self._btn_load.setFont(font)
-        self._btn_load.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/load_filament.svg")
-        )
+        self._btn_load.setPixmap(BlocksPixmap.get(Icon.LOAD_FILAMENT))
         self._btn_unload = BlocksCustomButton(self)
         self._btn_unload.setText("Unload")
         self._btn_unload.setFont(font)
-        self._btn_unload.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/unload_filament.svg")
-        )
+        self._btn_unload.setPixmap(BlocksPixmap.get(Icon.UNLOAD_FILAMENT))
         self._btn_unload.setFixedSize(140, 60)
         self._btn_purge = BlocksCustomButton(self)
         self._btn_purge.setText("Eject")
         self._btn_purge.setFont(font)
-        self._btn_purge.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/eject.svg")
-        )
+        self._btn_purge.setPixmap(BlocksPixmap.get(Icon.EJECT))
         self._btn_purge.setFixedSize(140, 60)
         self._btn_cut = BlocksCustomButton(self)
-        self._btn_cut.setPixmap(
-            QtGui.QPixmap(":/filament_related/media/btn_icons/check gate 1.svg")
-        )
+        self._btn_cut.setPixmap(BlocksPixmap.get(Icon.CHECK_GATE_1))
         self._btn_cut.setText("Check\nGates")
         self._btn_cut.setFont(font)
         self._btn_cut.setFixedSize(140, 60)

BlocksScreen/lib/panels/widgets/babystepPage.py

@@ -2,6 +2,7 @@
 import typing
 
 from lib.utils.blocks_label import BlocksLabel
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.check_button import BlocksCustomCheckButton
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -179,7 +180,7 @@ def _setupUI(self) -> None:
         self.babystep_back_btn.setMinimumSize(QtCore.QSize(60, 60))
         self.babystep_back_btn.setMaximumSize(QtCore.QSize(60, 60))
         self.babystep_back_btn.setFlat(True)
-        self.babystep_back_btn.setPixmap(QtGui.QPixmap(":/ui/media/btn_icons/back.svg"))
+        self.babystep_back_btn.setPixmap(BlocksPixmap.get(Icon.BACK))
         header.addWidget(self.babystep_back_btn, 0)
         main_vlayout.addLayout(header)
 
@@ -226,9 +227,7 @@ def _setupUI(self) -> None:
         self.bbp_babystep_graphic.setLayoutDirection(
             QtCore.Qt.LayoutDirection.RightToLeft
         )
-        self.bbp_babystep_graphic.setPixmap(
-            QtGui.QPixmap(":/graphics/media/graphics/babystep_graphic.png")
-        )
+        self.bbp_babystep_graphic.setPixmap(BlocksPixmap.source(Icon.BABYSTEP_GRAPHIC))
         self.bbp_babystep_graphic.setScaledContents(False)
         self.bbp_babystep_graphic.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
 
@@ -283,19 +282,15 @@ def _setupUI(self) -> None:
         self.bbp_mvup.setMinimumSize(QtCore.QSize(80, 80))
         self.bbp_mvup.setMaximumSize(QtCore.QSize(80, 80))
         self.bbp_mvup.setFlat(True)
-        self.bbp_mvup.setPixmap(
-            QtGui.QPixmap(":/baby_step/media/btn_icons/move_nozzle_close.svg")
-        )
+        self.bbp_mvup.setPixmap(BlocksPixmap.get(Icon.MOVE_NOZZLE_CLOSE))
         move_layout.addWidget(self.bbp_mvup, 0, QtCore.Qt.AlignmentFlag.AlignRight)
 
         self.bbp_mvdown = IconButton(parent=self)
         self.bbp_mvdown.setSizePolicy(size_policy)
         self.bbp_mvdown.setMinimumSize(QtCore.QSize(80, 80))
         self.bbp_mvdown.setMaximumSize(QtCore.QSize(80, 80))
         self.bbp_mvdown.setFlat(True)
-        self.bbp_mvdown.setPixmap(
-            QtGui.QPixmap(":/baby_step/media/btn_icons/move_nozzle_away.svg")
-        )
+        self.bbp_mvdown.setPixmap(BlocksPixmap.get(Icon.MOVE_NOZZLE_AWAY))
         move_layout.addWidget(self.bbp_mvdown, 0, QtCore.Qt.AlignmentFlag.AlignRight)
 
         content.addLayout(move_layout)

BlocksScreen/lib/panels/widgets/bannerPopup.py

@@ -1,6 +1,7 @@
 import enum
 from collections import deque
 
+from lib.utils.blocks_pixmap import BlocksPixmap, Icon
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
@@ -137,7 +138,7 @@ def _add_popup(self) -> None:
             message_type = message_entry.get("type")
 
             message = "Unknown Event"
-            icon = ":ui/media/btn_icons/info.svg"
+            icon = Icon.INFO
 
             # TODO: missing usb icons
             match message_type:
@@ -149,11 +150,11 @@ def _add_popup(self) -> None:
                     # icon = ""
                 case BannerPopup.MessageType.CORRUPTED:
                     message = "Usb Corrupted"
-                    icon = ":/ui/media/btn_icons/troubleshoot.svg"
+                    icon = Icon.TROUBLESHOOT
             end_rect = self._calculate_target_geometry()
             start_rect = end_rect.translated(end_rect.width() * 2, 0)
 
-            self.icon_label.setPixmap(QtGui.QPixmap(icon))
+            self.icon_label.setPixmap(BlocksPixmap.get(icon))
 
             self.slide_in_animation.setStartValue(start_rect)
             self.slide_in_animation.setEndValue(end_rect)