fix(topbar): render filament icons in the bundled Momcake face

BlocksScreen/lib/panels/mainWindow.py

@@ -35,9 +35,9 @@
 from lib.ui.resources.graphic_resources_rc import *
 from lib.ui.resources.icon_resources_rc import *
 from lib.ui.resources.main_menu_resources_rc import *
-from lib.ui.resources.system_resources_rc import *
 from lib.ui.resources.top_bar_resources_rc import *
 from lib.updater_worker import UpdaterWorker
+from lib.utils.fonts import register_momcake
 from PyQt6 import QtCore, QtGui, QtWidgets
 from screensaver import ScreenSaver
 
@@ -122,6 +122,8 @@ def __init__(self):
         """Set up UI, instantiate subsystems, and wire all inter-component signals."""
         super(MainWindow, self).__init__()
         self.config: BlocksScreenConfig = get_configparser()
+        # Before setupUi: the topbar .svg icons carry text and paint on first show.
+        register_momcake()
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
         self.screensaver = ScreenSaver(self)

BlocksScreen/lib/panels/networkWindow.py

@@ -2828,9 +2828,6 @@ def _setup_saved_details_page(self) -> None:
         self.low_priority_btn.setMaximumSize(QtCore.QSize(100, 100))
         self.low_priority_btn.setCheckable(True)
         self.low_priority_btn.setFlat(True)
-        self.low_priority_btn.setProperty(
-            "icon_pixmap", PixmapCache.get(":/ui/media/btn_icons/indf_svg.svg")
-        )
         self.low_priority_btn.setText("Low")
         self.low_priority_btn.setProperty("class", "back_btn")
         self.low_priority_btn.setProperty("button_type", "icon")
@@ -2844,9 +2841,6 @@ def _setup_saved_details_page(self) -> None:
         self.med_priority_btn.setCheckable(True)
         self.med_priority_btn.setChecked(False)  # Don't set default checked
         self.med_priority_btn.setFlat(True)
-        self.med_priority_btn.setProperty(
-            "icon_pixmap", PixmapCache.get(":/ui/media/btn_icons/indf_svg.svg")
-        )
         self.med_priority_btn.setText("Medium")
         self.med_priority_btn.setProperty("class", "back_btn")
         self.med_priority_btn.setProperty("button_type", "icon")
@@ -2860,9 +2854,6 @@ def _setup_saved_details_page(self) -> None:
         self.high_priority_btn.setCheckable(True)
         self.high_priority_btn.setChecked(False)
         self.high_priority_btn.setFlat(True)
-        self.high_priority_btn.setProperty(
-            "icon_pixmap", PixmapCache.get(":/ui/media/btn_icons/indf_svg.svg")
-        )
         self.high_priority_btn.setText("High")
         self.high_priority_btn.setProperty("class", "back_btn")
         self.high_priority_btn.setProperty("button_type", "icon")

BlocksScreen/lib/panels/printTab.py

@@ -428,20 +428,6 @@ def _on_delete_file_confirmed(self, filename: str, directory: str) -> None:
         except (RuntimeError, TypeError):
             pass
 
-    def setProperty(self, name: str, value: typing.Any) -> bool:
-        """Intercept the set property method
-
-        Args:
-            name (str): Name of the dynamic property
-            value (typing.Any): Value for the dynamic property
-
-        Returns:
-            bool: Returns to the super class
-        """
-        if name == "backgroundPixmap":
-            self.background = value
-        return super().setProperty(name, value)
-
     def handle_cancel_print(self) -> None:
         """Handles the print cancel action"""
         if (
@@ -514,10 +500,6 @@ def setupMainPrintPage(self) -> None:
         self.setSizePolicy(sizePolicy)
         self.setMinimumSize(QtCore.QSize(710, 410))
         self.setMaximumSize(QtCore.QSize(720, 420))
-        self.setProperty(
-            "backgroundPixmap",
-            QtGui.QPixmap(":/background/media/graphics/scroll_list_window.svg"),
-        )
         self.print_page = QtWidgets.QWidget()
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,

BlocksScreen/lib/panels/widgets/babystepPage.py

@@ -258,9 +258,6 @@ def _setupUI(self) -> None:
         self.bbp_z_offset_current_value.setText(
             f"Z: {round(self._pending_z_offset, 3) or 0.0:.3f} mm"
         )
-        self.bbp_z_offset_current_value.setPixmap(
-            QtGui.QPixmap(":/graphics/media/btn_icons/z_offset_adjust.svg")
-        )
         self.bbp_z_offset_current_value.setAlignment(
             QtCore.Qt.AlignmentFlag.AlignCenter
         )

BlocksScreen/lib/panels/widgets/basicFilamentPanel.py

@@ -639,23 +639,23 @@ def _setupUi(self):
             (
                 "load_pla_btn",
                 "PLA",
-                ":/filament_related/media/topbar/pla_filament_topbar.svg",
+                ":/top_bar_icons/media/topbar/pla_filament_topbar.svg",
                 0,
                 0,
                 FilamentTypes.PLA,
             ),
             (
                 "load_petg_btn",
                 "PETG",
-                ":/filament_related/media/topbar/petg_filament_topbar.svg",
+                ":/top_bar_icons/media/topbar/petg_filament_topbar.svg",
                 0,
                 1,
                 FilamentTypes.PETG,
             ),
             (
                 "load_abs_btn",
                 "ABS",
-                ":/filament_related/media/topbar/abs_filament_topbar.svg",
+                ":/top_bar_icons/media/topbar/abs_filament_topbar.svg",
                 1,
                 0,
                 FilamentTypes.ABS,

BlocksScreen/lib/panels/widgets/inputshaperPage.py

@@ -2,6 +2,7 @@
 
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
+from lib.utils.fonts import register_momcake
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -135,10 +136,7 @@ def add_type_entry(self, cli_name: str, recommended: str = "") -> None:
 
     def _setupUI(self) -> None:
         """Setup UI for updatePage"""
-        font_id = QtGui.QFontDatabase.addApplicationFont(
-            ":/font/media/fonts for text/Momcake-Bold.ttf"
-        )
-        font_family = QtGui.QFontDatabase.applicationFontFamilies(font_id)[0]
+        font_family = register_momcake()
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,

BlocksScreen/lib/panels/widgets/popupDialogWidget.py

@@ -32,7 +32,8 @@ def __init__(self, parent) -> None:
         self.message_type: Popup.MessageType = Popup.MessageType.INFO
         self.default_background_color = QtGui.QColor(164, 164, 164)
         self.info_icon = QtGui.QPixmap(":ui/media/btn_icons/info.svg")
-        self.warning_icon = QtGui.QPixmap(":ui/media/btn_icons/warning.svg")
+        # no warning asset exists yet; the yellow ColorCode carries the severity
+        self.warning_icon = QtGui.QPixmap(":ui/media/btn_icons/error.svg")
         self.error_icon = QtGui.QPixmap(":ui/media/btn_icons/error.svg")
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_TranslucentBackground, True)
         self.setMouseTracking(True)
@@ -179,6 +180,8 @@ def _add_popup(self) -> None:
                     self.icon_label.setPixmap(self.warning_icon)
                 case Popup.MessageType.ERROR:
                     self.icon_label.setPixmap(self.error_icon)
+                case _:
+                    self.icon_label.clear()
 
             end_rect = self._calculate_target_geometry()
             start_rect = end_rect.translated(0, -end_rect.height() * 2)

BlocksScreen/lib/panels/widgets/probeHelperPage.py

@@ -946,9 +946,6 @@ def _setupUi(self) -> None:
         self.current_offset_info.setFont(font)
         self.current_offset_info.setStyleSheet("background: transparent; color: white;")
         self.current_offset_info.setText("Z:0.000mm")
-        self.current_offset_info.setPixmap(
-            QtGui.QPixmap(":/graphics/media/btn_icons/z_offset_adjust.svg")
-        )
         self.current_offset_info.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.current_offset_info.setObjectName("current_offset_info")
         # Add graphic frame AFTER the offset buttons group box

BlocksScreen/lib/panels/widgets/sensorsPanel.py

@@ -2,6 +2,7 @@
 
 from lib.panels.widgets.sensorWidget import SensorWidget
 from lib.utils.blocks_frame import BlocksCustomFrame
+from lib.utils.fonts import register_momcake
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -130,10 +131,7 @@ def create_sensor_widget(self, name: str) -> SensorWidget:
 
     def _setupUi(self) -> None:
         """Setup UI for updatePage"""
-        font_id = QtGui.QFontDatabase.addApplicationFont(
-            ":/font/media/fonts for text/Momcake-Bold.ttf"
-        )
-        font_family = QtGui.QFontDatabase.applicationFontFamilies(font_id)[0]
+        font_family = register_momcake()
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,

BlocksScreen/lib/panels/widgets/slider_selector_page.py

@@ -27,7 +27,7 @@ def __init__(self, parent) -> None:
         self.decrease_button_icon = QtGui.QPixmap(
             ":/arrow_icons/media/btn_icons/left_arrow.svg"
         )
-        self.background = QtGui.QPixmap(":/ui/background/media/1st_background.png")
+        self.background = QtGui.QPixmap(":/background/media/1st_background.png")
         self.setStyleSheet(
             "#SliderPage{background-image: url(:/background/media/1st_background.png);}\n"
         )

BlocksScreen/lib/panels/widgets/updatePage.py

@@ -5,6 +5,7 @@
 import typing
 from types import MappingProxyType
 
+from lib.utils.fonts import register_momcake
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 from BlocksScreen.lib.panels.widgets.basePopup import BasePopup
@@ -492,15 +493,10 @@ def show_loading(self, loading: bool = False) -> None:
         self.disable_popups.emit(loading)
 
     def _setupUI(self) -> None:
-        bold_id = QtGui.QFontDatabase.addApplicationFont(
-            ":/font/media/fonts for text/Momcake-Bold.ttf"
-        )
-        self._font_family = QtGui.QFontDatabase.applicationFontFamilies(bold_id)[0]
-        thin_id = QtGui.QFontDatabase.addApplicationFont(
-            ":/font/media/fonts for text/Momcake-Thin.ttf"
-        )
-        thin_families = QtGui.QFontDatabase.applicationFontFamilies(thin_id)
-        _title_family = thin_families[0] if thin_families else ""
+        # Qt files the Thin and Bold faces under one family, so both ids gave the
+        # same name here; the weight is chosen per QFont, not per family.
+        self._font_family = register_momcake()
+        _title_family = self._font_family
 
         self.setObjectName("updatePage")
         self.setStyleSheet(