refactor: reorganize panel/widget file structure and standardize UI setup

BlocksScreen/devices/storage/usb_controller.py

@@ -4,7 +4,7 @@
 from PyQt6 import QtCore
 
 from .udisks2 import UDisksDBusAsync
-from lib.panels.widgets.bannerPopup import BannerPopup
+from lib.panels.widgets.Common.bannerPopup import BannerPopup
 
 ResType: typing.TypeAlias = typing.Literal["always", "none"]
 

BlocksScreen/lib/panels/controlTab.py

@@ -6,15 +6,15 @@
 import typing
 
 from lib.moonrakerComm import MoonWebSocket
-from lib.panels.widgets.basePopup import BasePopup
+from lib.panels.widgets.Common.basePopup import BasePopup
 from lib.panels.widgets.ControlTab.axisPage import AxisPage
 from lib.panels.widgets.ControlTab.extruderPage import ExtruderPage
 from lib.panels.widgets.ControlTab.fansPage import FansPage
 from lib.panels.widgets.ControlTab.printcorePage import SwapPrintcorePage
 from lib.panels.widgets.ControlTab.probeHelperPage import ProbeHelper
 from lib.panels.widgets.ControlTab.temperaturePage import TemperaturePage
-from lib.panels.widgets.numpadPage import CustomNumpad
-from lib.panels.widgets.slider_selector_page import SliderPage
+from lib.panels.widgets.Common.numpadPage import CustomNumpad
+from lib.panels.widgets.Common.slider_selector_page import SliderPage
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.icon_button import IconButton

BlocksScreen/lib/panels/filamentTab.py

@@ -4,16 +4,16 @@
 
 from devices.amu import AMUManager
 from devices.amu.models import GateStatus
-from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.colorWheelWidget import ColorWheelWidget
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.panels.widgets.FilamentTab.colorWheelWidget import ColorWheelWidget
 from lib.panels.widgets.FilamentTab.addFilamentPage import AddFilamentPage
 from lib.panels.widgets.FilamentTab.addSpoolPage import AddSpoolPage
 from lib.panels.widgets.FilamentTab.amuPage import AMUpage
 from lib.panels.widgets.FilamentTab.basicFilamentPanel import BasicFilamentPanel
 from lib.panels.widgets.FilamentTab.spoolmanPage import SpoolmanPage
-from lib.panels.widgets.keyboardPage import CustomQwertyKeyboard
-from lib.panels.widgets.loadWidget import LoadingOverlayWidget
-from lib.panels.widgets.numpadPage import CustomNumpad
+from lib.panels.widgets.Common.keyboardPage import CustomQwertyKeyboard
+from lib.panels.widgets.Common.loadWidget import LoadingOverlayWidget
+from lib.panels.widgets.Common.numpadPage import CustomNumpad
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame

BlocksScreen/lib/panels/mainWindow.py

@@ -22,10 +22,10 @@
 from lib.panels.networkWindow import NetworkControlWindow, PixmapCache
 from lib.panels.printTab import PrintTab
 from lib.panels.utilitiesTab import UtilitiesTab
-from lib.panels.widgets.basePopup import BasePopup
+from lib.panels.widgets.Common.basePopup import BasePopup
 from lib.panels.widgets.MainWindow.cancelPage import CancelPage
 from lib.panels.widgets.MainWindow.connectionPage import ConnectionPage
-from lib.panels.widgets.loadWidget import LoadingOverlayWidget
+from lib.panels.widgets.Common.loadWidget import LoadingOverlayWidget
 from lib.panels.widgets.MainWindow.notificationPage import NotificationPage
 from lib.panels.widgets.MainWindow.updatePage import UpdatePage
 from lib.printer import Printer

BlocksScreen/lib/panels/networkWindow.py

@@ -21,9 +21,9 @@
     is_hidden_ssid,
     signal_to_bars,
 )
-from lib.panels.widgets.keyboardPage import CustomQwertyKeyboard
-from lib.panels.widgets.loadWidget import LoadingOverlayWidget
-from lib.panels.widgets.popupDialogWidget import Popup
+from lib.panels.widgets.Common.keyboardPage import CustomQwertyKeyboard
+from lib.panels.widgets.Common.loadWidget import LoadingOverlayWidget
+from lib.panels.widgets.Common.popupDialogWidget import Popup
 from lib.qrcode_gen import generate_wifi_qrcode
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
@@ -156,7 +156,7 @@ def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
         super().__init__(parent) if parent else super().__init__()
 
         self._init_instance_variables()
-        self._setupUI()
+        self._setup_ui()
         self._init_timers()
         self._init_model_view()
         self._init_network_manager()
@@ -1787,7 +1787,7 @@ def showEvent(self, event: QtGui.QShowEvent | None) -> None:
         self._nm.refresh_state()
         super().showEvent(event)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         """Build and lay out the entire stacked-widget UI tree."""
         self.setObjectName("wifi_stacked_page")
         self.resize(800, 480)

BlocksScreen/lib/panels/printTab.py

@@ -6,15 +6,15 @@
 from configfile import BlocksScreenConfig, get_configparser
 from lib.files import Files
 from lib.moonrakerComm import MoonWebSocket
-from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.numpadPage import CustomNumpad
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.panels.widgets.Common.numpadPage import CustomNumpad
 from lib.panels.widgets.PrintTab.babystepPage import BabystepPage
 from lib.panels.widgets.PrintTab.confirmPage import ConfirmWidget
 from lib.panels.widgets.PrintTab.filesPage import FilesPage
 from lib.panels.widgets.PrintTab.jobStatusPage import JobStatusWidget
 from lib.panels.widgets.PrintTab.sensorsPanel import SensorsWindow
 from lib.panels.widgets.PrintTab.tunePage import TuneWidget
-from lib.panels.widgets.slider_selector_page import SliderPage
+from lib.panels.widgets.Common.slider_selector_page import SliderPage
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.display_button import DisplayButton

BlocksScreen/lib/panels/utilitiesTab.py

@@ -5,10 +5,10 @@
 from functools import partial
 
 from lib.moonrakerComm import MoonWebSocket
-from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.inputshaperPage import InputShaperPage
-from lib.panels.widgets.optionCardWidget import OptionCard
-from lib.panels.widgets.troubleshootPage import TroubleshootPage
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.panels.widgets.UtilitiesTab.inputshaperPage import InputShaperPage
+from lib.panels.widgets.Common.optionCardWidget import OptionCard
+from lib.panels.widgets.UtilitiesTab.troubleshootPage import TroubleshootPage
 from lib.printer import Printer
 from lib.ui.utilitiesStackedWidget_ui import Ui_utilitiesStackedWidget
 from lib.utils.blocks_button import BlocksCustomButton

BlocksScreen/lib/panels/widgets/bannerPopup.py → BlocksScreen/lib/panels/widgets/Common/bannerPopup.py

@@ -31,7 +31,7 @@ def __init__(self, parent=None) -> None:
             | QtCore.Qt.WindowType.Tool
             | QtCore.Qt.WindowType.X11BypassWindowManagerHint
         )
-        self._setupUI()
+        self._setup_ui()
         self.slide_in_animation = QtCore.QPropertyAnimation(self, b"geometry")
         self.slide_in_animation.setDuration(1000)
         self.slide_in_animation.setEasingCurve(QtCore.QEasingCurve.Type.OutCubic)
@@ -191,7 +191,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None:
         painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.drawRoundedRect(self.rect(), 50, 70)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         self.horizontal_layout = QtWidgets.QHBoxLayout(self)
         self.horizontal_layout.setContentsMargins(5, 5, 5, 5)
 

BlocksScreen/lib/panels/widgets/loadWidget.py → BlocksScreen/lib/panels/widgets/Common/loadWidget.py

@@ -29,7 +29,7 @@ def __init__(
         self.max_length = 150.0
         self.length_step = 2.5
 
-        self._setupUI()
+        self._setup_ui()
 
         config: BlocksScreenConfig = get_configparser()
         animation_path = None
@@ -173,7 +173,7 @@ def show(self) -> None:
         self.repaint()
         return super().show()
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_TranslucentBackground, True)
         self.gifshow = QtWidgets.QLabel("", self)
         self.gifshow.setObjectName("gifshow")

BlocksScreen/lib/panels/widgets/numpadPage.py → BlocksScreen/lib/panels/widgets/Common/numpadPage.py

@@ -17,7 +17,7 @@ def __init__(
         parent,
     ) -> None:
         super().__init__(parent)
-        self._setupUI()
+        self._setup_ui()
         self.current_value: str = "0"
         self.name: str = ""
         self.min_value: int = 0
@@ -108,7 +108,7 @@ def update_min_max_label(self) -> None:
         """Updates the text of the min/max label."""
         self.min_max_label.setText(f"Range: {self.min_value} - {self.max_value}")
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         self.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.BlankCursor))
 
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, True)

BlocksScreen/lib/panels/widgets/optionCardWidget.py → BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py

@@ -25,7 +25,7 @@ def __init__(
         self.name = name
         self.card_text = text
         self.doubleT: bool = False
-        self._setupUi(self)
+        self._setup_ui(self)
         self.option_icon.setAttribute(
             QtCore.Qt.WidgetAttribute.WA_TransparentForMouseEvents
         )
@@ -200,7 +200,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None:
 
         painter.end()
 
-    def _setupUi(self, option_card):
+    def _setup_ui(self, option_card):
         option_card.setObjectName("option_card")
         option_card.resize(200, 300)
         sizePolicy = QtWidgets.QSizePolicy(

BlocksScreen/lib/panels/widgets/popupDialogWidget.py → BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py

@@ -41,7 +41,7 @@ def __init__(self, parent) -> None:
             | QtCore.Qt.WindowType.FramelessWindowHint
             | QtCore.Qt.WindowType.X11BypassWindowManagerHint
         )
-        self._setupUI()
+        self._setup_ui()
         self.slide_in_animation = QtCore.QPropertyAnimation(self, b"geometry")
         self.slide_in_animation.setDuration(1000)
         self.slide_in_animation.setEasingCurve(QtCore.QEasingCurve.Type.OutCubic)
@@ -231,7 +231,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None:
         painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.drawRoundedRect(self.rect(), 10, 10)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         self.horizontal_layout = QtWidgets.QHBoxLayout(self)
         self.horizontal_layout.setContentsMargins(5, 5, 5, 5)
 

BlocksScreen/lib/panels/widgets/slider_selector_page.py → BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py

@@ -32,7 +32,7 @@ def __init__(self, parent) -> None:
             "#SliderPage{background-image: url(:/background/media/1st_background.png);}\n"
         )
         self.setObjectName("SliderPage")
-        self._setupUI()
+        self._setup_ui()
         self.back_button.clicked.connect(self.request_back.emit)
         self.back_button.clicked.connect(self.value_selected.disconnect)
         self.slider.sliderReleased.connect(self.on_slider_value_change)
@@ -83,7 +83,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None:
         self.object_name_label.setText(str(self.name))
         painter.end()
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         """Setup the components for the widget"""
         self.setMinimumSize(QtCore.QSize(700, 410))
         self.setMaximumSize(QtCore.QSize(720, 420))

BlocksScreen/lib/panels/widgets/ControlTab/fansPage.py

@@ -3,7 +3,7 @@
 import re
 import typing
 
-from lib.panels.widgets.optionCardWidget import OptionCard
+from lib.panels.widgets.Common.optionCardWidget import OptionCard
 from lib.utils.gcode import fan_speed_gcode
 from lib.utils.icon_button import IconButton
 from PyQt6 import QtCore, QtGui, QtWidgets

BlocksScreen/lib/panels/widgets/ControlTab/printcorePage.py

@@ -14,7 +14,7 @@ def __init__(
         self.setWindowFlags(
             QtCore.Qt.WindowType.Popup | QtCore.Qt.WindowType.FramelessWindowHint
         )
-        self._setupUI()
+        self._setup_ui()
         self.repaint()
 
     def setText(self, text: str) -> None:
@@ -81,7 +81,7 @@ def show(self) -> None:
         self.repaint()
         return super().show()
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         font = QtGui.QFont()
         font.setPointSize(20)
 

BlocksScreen/lib/panels/widgets/ControlTab/probeHelperPage.py

@@ -2,7 +2,7 @@
 import logging
 import typing
 
-from lib.panels.widgets.optionCardWidget import OptionCard
+from lib.panels.widgets.Common.optionCardWidget import OptionCard
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_label import BlocksLabel
 from lib.utils.check_button import BlocksCustomCheckButton

BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py

@@ -1,9 +1,9 @@
 import typing
 
-from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.colorWheelWidget import ColorWheelWidget
-from lib.panels.widgets.keyboardPage import CustomQwertyKeyboard
-from lib.panels.widgets.numpadPage import CustomNumpad
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.panels.widgets.FilamentTab.colorWheelWidget import ColorWheelWidget
+from lib.panels.widgets.Common.keyboardPage import CustomQwertyKeyboard
+from lib.panels.widgets.Common.numpadPage import CustomNumpad
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_linedit import BlocksCustomLinEdit

BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py

@@ -1,9 +1,9 @@
 import typing
 
-from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.keyboardPage import CustomQwertyKeyboard
-from lib.panels.widgets.loadWidget import LoadingOverlayWidget
-from lib.panels.widgets.numpadPage import CustomNumpad
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.panels.widgets.Common.keyboardPage import CustomQwertyKeyboard
+from lib.panels.widgets.Common.loadWidget import LoadingOverlayWidget
+from lib.panels.widgets.Common.numpadPage import CustomNumpad
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_linedit import BlocksCustomLinEdit

BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py

@@ -3,7 +3,7 @@
 from functools import partial
 
 from lib.filament import Filament
-from lib.panels.widgets.popupDialogWidget import Popup
+from lib.panels.widgets.Common.popupDialogWidget import Popup
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame

BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py

@@ -3,7 +3,7 @@
 
 from lib.panels.widgets.FilamentTab.addFilamentPage import AddFilamentPage
 from lib.panels.widgets.FilamentTab.addSpoolPage import AddSpoolPage
-from lib.panels.widgets.basePopup import BasePopup
+from lib.panels.widgets.Common.basePopup import BasePopup
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
@@ -42,7 +42,7 @@ def __init__(self, parent=None) -> None:
         self._selected_spool: dict | None = None
         self._display_name_to_spool: dict[str, dict] = {}
 
-        self._setupUI()
+        self._setup_ui()
         self._setup_add_popup()
         self.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
 
@@ -314,7 +314,7 @@ def showEvent(self, event: QtGui.QShowEvent | None) -> None:  # noqa: N802
         self._on_reload_clicked()
         return super().showEvent(event)
 
-    def _setupUI(self) -> None:  # noqa: N802
+    def _setup_ui(self) -> None:  # noqa: N802
         self.setMaximumHeight(470)
 
         size_policy = QtWidgets.QSizePolicy(

BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py

@@ -26,7 +26,7 @@ class CancelPage(QtWidgets.QWidget):
     def __init__(self, parent: QtWidgets.QWidget, ws: MoonWebSocket) -> None:
         super().__init__(parent)
         self.ws: MoonWebSocket = ws
-        self._setupUI()
+        self._setup_ui()
         self.filename = ""
 
         self.confirm_button.clicked.connect(lambda: self._handle_accept())
@@ -114,7 +114,7 @@ def _show_screen_thumbnail(self, dict):
             )
         self.set_pixmap(last_thumb)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         """Setup widget ui"""
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,

BlocksScreen/lib/panels/widgets/MainWindow/connectionPage.py

@@ -122,7 +122,7 @@ class ConnectionPage(QtWidgets.QFrame):
     def __init__(self, parent: QtWidgets.QWidget, ws: MoonWebSocket, /) -> None:
         super().__init__(parent)
         self.ws = ws
-        self._setupUI()
+        self._setup_ui()
 
         self._state: ConnectionState = ConnectionState.DISCONNECTED
         self.base_text: str = ""
@@ -377,7 +377,7 @@ def eventFilter(self, a0: QtCore.QObject | None, a1: QtCore.QEvent | None) -> bo
             self._set_state(ConnectionState.KLIPPER_READY)
         return super().eventFilter(a0, a1)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         self.setMinimumSize(QtCore.QSize(800, 480))
         self.setMaximumSize(QtCore.QSize(800, 480))
         self.setObjectName("ConnectionPage")

BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py

@@ -1,7 +1,7 @@
 from collections import deque
 from typing import ClassVar
 
-from lib.panels.widgets.popupDialogWidget import Popup
+from lib.panels.widgets.Common.popupDialogWidget import Popup
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.icon_button import IconButton
@@ -24,7 +24,7 @@ def __init__(self, parent=None) -> None:
         self._ICON_INFO = QtGui.QPixmap(":/ui/media/btn_icons/info.svg")
         self._ICON_WARN = QtGui.QPixmap(":/ui/media/btn_icons/troubleshoot.svg")
         self._ICON_ERROR = QtGui.QPixmap(":/ui/media/btn_icons/error.svg")
-        self._setupUI()
+        self._setup_ui()
         self.cli_tracking: deque = deque()
         self.selected_item: ListItem | None = None
         self.popup = Popup(self)
@@ -167,7 +167,7 @@ def _add_notif_entry(
         item._cache[-1] = time
         self.model.add_item(item)
 
-    def _setupUI(self) -> None:
+    def _setup_ui(self) -> None:
         """Setup UI for updatePage"""
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,