From a6af60e8a78336fe461da859fc9c4015a13d0aba Mon Sep 17 00:00:00 2001 From: Robert0Mart Date: Mon, 31 Aug 2026 11:49:22 +0100 Subject: [PATCH 1/3] refactor: organized the rest of the widgets into a common folder --- BlocksScreen/devices/storage/usb_controller.py | 2 +- BlocksScreen/lib/panels/controlTab.py | 6 +++--- BlocksScreen/lib/panels/filamentTab.py | 10 +++++----- BlocksScreen/lib/panels/mainWindow.py | 4 ++-- BlocksScreen/lib/panels/networkWindow.py | 6 +++--- BlocksScreen/lib/panels/printTab.py | 6 +++--- BlocksScreen/lib/panels/utilitiesTab.py | 8 ++++---- .../lib/panels/widgets/{ => Common}/bannerPopup.py | 0 .../lib/panels/widgets/{ => Common}/basePopup.py | 0 .../lib/panels/widgets/{ => Common}/keyboardPage.py | 0 .../lib/panels/widgets/{ => Common}/loadWidget.py | 0 .../lib/panels/widgets/{ => Common}/numpadPage.py | 0 .../panels/widgets/{ => Common}/optionCardWidget.py | 0 .../panels/widgets/{ => Common}/popupDialogWidget.py | 0 .../widgets/{ => Common}/slider_selector_page.py | 0 BlocksScreen/lib/panels/widgets/ControlTab/fansPage.py | 2 +- .../lib/panels/widgets/ControlTab/probeHelperPage.py | 2 +- .../lib/panels/widgets/FilamentTab/addFilamentPage.py | 8 ++++---- .../lib/panels/widgets/FilamentTab/addSpoolPage.py | 8 ++++---- .../panels/widgets/FilamentTab/basicFilamentPanel.py | 2 +- .../widgets/{ => FilamentTab}/colorWheelWidget.py | 0 .../lib/panels/widgets/FilamentTab/spoolmanPage.py | 2 +- .../lib/panels/widgets/MainWindow/notificationPage.py | 2 +- .../lib/panels/widgets/MainWindow/updatePage.py | 10 +++++----- .../lib/panels/widgets/PrintTab/jobStatusPage.py | 2 +- .../widgets/{ => UtilitiesTab}/inputshaperPage.py | 0 .../widgets/{ => UtilitiesTab}/troubleshootPage.py | 0 27 files changed, 40 insertions(+), 40 deletions(-) rename BlocksScreen/lib/panels/widgets/{ => Common}/bannerPopup.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/basePopup.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/keyboardPage.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/loadWidget.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/numpadPage.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/optionCardWidget.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/popupDialogWidget.py (100%) rename BlocksScreen/lib/panels/widgets/{ => Common}/slider_selector_page.py (100%) rename BlocksScreen/lib/panels/widgets/{ => FilamentTab}/colorWheelWidget.py (100%) rename BlocksScreen/lib/panels/widgets/{ => UtilitiesTab}/inputshaperPage.py (100%) rename BlocksScreen/lib/panels/widgets/{ => UtilitiesTab}/troubleshootPage.py (100%) diff --git a/BlocksScreen/devices/storage/usb_controller.py b/BlocksScreen/devices/storage/usb_controller.py index a39ac100..ac27b395 100644 --- a/BlocksScreen/devices/storage/usb_controller.py +++ b/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"] diff --git a/BlocksScreen/lib/panels/controlTab.py b/BlocksScreen/lib/panels/controlTab.py index c3ff1213..a2122354 100644 --- a/BlocksScreen/lib/panels/controlTab.py +++ b/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 diff --git a/BlocksScreen/lib/panels/filamentTab.py b/BlocksScreen/lib/panels/filamentTab.py index 32121bfd..50f614db 100644 --- a/BlocksScreen/lib/panels/filamentTab.py +++ b/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 diff --git a/BlocksScreen/lib/panels/mainWindow.py b/BlocksScreen/lib/panels/mainWindow.py index 1afa77fb..636b52c8 100644 --- a/BlocksScreen/lib/panels/mainWindow.py +++ b/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 diff --git a/BlocksScreen/lib/panels/networkWindow.py b/BlocksScreen/lib/panels/networkWindow.py index 07c98bed..c5698278 100644 --- a/BlocksScreen/lib/panels/networkWindow.py +++ b/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 diff --git a/BlocksScreen/lib/panels/printTab.py b/BlocksScreen/lib/panels/printTab.py index 0e6bdc4c..df8c2a95 100644 --- a/BlocksScreen/lib/panels/printTab.py +++ b/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 diff --git a/BlocksScreen/lib/panels/utilitiesTab.py b/BlocksScreen/lib/panels/utilitiesTab.py index eaf85855..f2c74be4 100644 --- a/BlocksScreen/lib/panels/utilitiesTab.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/bannerPopup.py b/BlocksScreen/lib/panels/widgets/Common/bannerPopup.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/bannerPopup.py rename to BlocksScreen/lib/panels/widgets/Common/bannerPopup.py diff --git a/BlocksScreen/lib/panels/widgets/basePopup.py b/BlocksScreen/lib/panels/widgets/Common/basePopup.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/basePopup.py rename to BlocksScreen/lib/panels/widgets/Common/basePopup.py diff --git a/BlocksScreen/lib/panels/widgets/keyboardPage.py b/BlocksScreen/lib/panels/widgets/Common/keyboardPage.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/keyboardPage.py rename to BlocksScreen/lib/panels/widgets/Common/keyboardPage.py diff --git a/BlocksScreen/lib/panels/widgets/loadWidget.py b/BlocksScreen/lib/panels/widgets/Common/loadWidget.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/loadWidget.py rename to BlocksScreen/lib/panels/widgets/Common/loadWidget.py diff --git a/BlocksScreen/lib/panels/widgets/numpadPage.py b/BlocksScreen/lib/panels/widgets/Common/numpadPage.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/numpadPage.py rename to BlocksScreen/lib/panels/widgets/Common/numpadPage.py diff --git a/BlocksScreen/lib/panels/widgets/optionCardWidget.py b/BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/optionCardWidget.py rename to BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py diff --git a/BlocksScreen/lib/panels/widgets/popupDialogWidget.py b/BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/popupDialogWidget.py rename to BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py diff --git a/BlocksScreen/lib/panels/widgets/slider_selector_page.py b/BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/slider_selector_page.py rename to BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py diff --git a/BlocksScreen/lib/panels/widgets/ControlTab/fansPage.py b/BlocksScreen/lib/panels/widgets/ControlTab/fansPage.py index 0e008c50..96d33103 100644 --- a/BlocksScreen/lib/panels/widgets/ControlTab/fansPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/ControlTab/probeHelperPage.py b/BlocksScreen/lib/panels/widgets/ControlTab/probeHelperPage.py index 55aaa9ce..76c8d28d 100644 --- a/BlocksScreen/lib/panels/widgets/ControlTab/probeHelperPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py b/BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py index 08e4b09a..c713d131 100644 --- a/BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py b/BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py index 9c082991..283c9945 100644 --- a/BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py b/BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py index 440dac85..529bcd70 100644 --- a/BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/colorWheelWidget.py b/BlocksScreen/lib/panels/widgets/FilamentTab/colorWheelWidget.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/colorWheelWidget.py rename to BlocksScreen/lib/panels/widgets/FilamentTab/colorWheelWidget.py diff --git a/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py b/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py index 3cd977e8..3c868e8e 100644 --- a/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py b/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py index d21de8b9..d2adf0f6 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py +++ b/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 diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py b/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py index d08404fb..c169f8b0 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py +++ b/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py @@ -7,11 +7,11 @@ from PyQt6 import QtCore, QtGui, QtWidgets -from BlocksScreen.lib.panels.widgets.basePopup import BasePopup -from BlocksScreen.lib.panels.widgets.loadWidget import LoadingOverlayWidget -from BlocksScreen.lib.utils.blocks_button import BlocksCustomButton -from BlocksScreen.lib.utils.blocks_Scrollbar import CustomScrollBar -from BlocksScreen.lib.utils.icon_button import IconButton +from lib.panels.widgets.Common.basePopup import BasePopup +from lib.panels.widgets.Common.loadWidget import LoadingOverlayWidget +from lib.utils.blocks_button import BlocksCustomButton +from lib.utils.blocks_Scrollbar import CustomScrollBar +from lib.utils.icon_button import IconButton from updater.models import ComponentStatus _log = logging.getLogger(__name__) diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py index e479df6b..60f25f9b 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py @@ -7,7 +7,7 @@ calculate_max_layers, estimate_print_time, ) -from lib.panels.widgets.basePopup import BasePopup +from lib.panels.widgets.Common.basePopup import BasePopup from lib.utils.blocks_button import BlocksCustomButton from lib.utils.blocks_label import BlocksLabel from lib.utils.blocks_progressbar import CustomProgressBar diff --git a/BlocksScreen/lib/panels/widgets/inputshaperPage.py b/BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/inputshaperPage.py rename to BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py diff --git a/BlocksScreen/lib/panels/widgets/troubleshootPage.py b/BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py similarity index 100% rename from BlocksScreen/lib/panels/widgets/troubleshootPage.py rename to BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py From 22a5950832672926c53260868eb6230cf95360a0 Mon Sep 17 00:00:00 2001 From: Robert0Mart Date: Mon, 31 Aug 2026 11:51:14 +0100 Subject: [PATCH 2/3] upd: updated tests based on the new paths --- tests/network/conftest.py | 6 +++--- tests/panels/conftest.py | 8 ++++---- tests/util/test_keyboard_page_unit.py | 6 +++--- tests/widgets/conftest.py | 2 +- tests/widgets/test_job_status_page_unit.py | 4 ++-- tests/widgets/test_slider_page_request_unit.py | 5 +++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/network/conftest.py b/tests/network/conftest.py index 2825b801..45c43e6b 100644 --- a/tests/network/conftest.py +++ b/tests/network/conftest.py @@ -263,13 +263,13 @@ def set_value(self, val): "EntryListModel": _EntryListModelStub, "ListItem": _ListItemStub, }, - "lib.panels.widgets.keyboardPage": { + "lib.panels.widgets.Common.keyboardPage": { "CustomQwertyKeyboard": _KeyboardStub, }, - "lib.panels.widgets.loadWidget": { + "lib.panels.widgets.Common.loadWidget": { "LoadingOverlayWidget": _LoadingOverlayStub, }, - "lib.panels.widgets.popupDialogWidget": { + "lib.panels.widgets.Common.popupDialogWidget": { "Popup": _PopupStub, }, } diff --git a/tests/panels/conftest.py b/tests/panels/conftest.py index 69e6bbf8..75fc409e 100644 --- a/tests/panels/conftest.py +++ b/tests/panels/conftest.py @@ -41,10 +41,10 @@ "lib.panels.printTab", "lib.panels.utilitiesTab", "lib.panels.widgets", - "lib.panels.widgets.basePopup", + "lib.panels.widgets.Common.basePopup", "lib.panels.widgets.MainWindow.cancelPage", "lib.panels.widgets.MainWindow.connectionPage", - "lib.panels.widgets.loadWidget", + "lib.panels.widgets.Common.loadWidget", "lib.panels.widgets.MainWindow.notificationPage", "lib.panels.widgets.MainWindow.updatePage", "lib.printer", @@ -94,10 +94,10 @@ sys.modules["lib.panels.networkWindow"].PixmapCache = MagicMock sys.modules["lib.panels.printTab"].PrintTab = MagicMock sys.modules["lib.panels.utilitiesTab"].UtilitiesTab = MagicMock -sys.modules["lib.panels.widgets.basePopup"].BasePopup = MagicMock +sys.modules["lib.panels.widgets.Common.basePopup"].BasePopup = MagicMock sys.modules["lib.panels.widgets.MainWindow.cancelPage"].CancelPage = MagicMock sys.modules["lib.panels.widgets.MainWindow.connectionPage"].ConnectionPage = MagicMock -sys.modules["lib.panels.widgets.loadWidget"].LoadingOverlayWidget = MagicMock +sys.modules["lib.panels.widgets.Common.loadWidget"].LoadingOverlayWidget = MagicMock sys.modules["lib.panels.widgets.MainWindow.notificationPage"].NotificationPage = MagicMock sys.modules["lib.panels.widgets.MainWindow.updatePage"].UpdatePage = MagicMock sys.modules["lib.printer"].Printer = MagicMock diff --git a/tests/util/test_keyboard_page_unit.py b/tests/util/test_keyboard_page_unit.py index 3ca25291..00cc70dd 100644 --- a/tests/util/test_keyboard_page_unit.py +++ b/tests/util/test_keyboard_page_unit.py @@ -25,12 +25,12 @@ # Force-reload the real module — the network conftest registers a stub # that lacks the layout constants we need. for _key in [ - "lib.panels.widgets.keyboardPage", - "BlocksScreen.lib.panels.widgets.keyboardPage", + "lib.panels.widgets.Common.keyboardPage", + "BlocksScreen.lib.panels.widgets.Common.keyboardPage", ]: sys.modules.pop(_key, None) -from BlocksScreen.lib.panels.widgets.keyboardPage import ( # noqa: E402 +from BlocksScreen.lib.panels.widgets.Common.keyboardPage import ( # noqa: E402 _LOWERCASE, _NUM_KEYS, _NUMBERS, diff --git a/tests/widgets/conftest.py b/tests/widgets/conftest.py index 17b60b68..d819564f 100644 --- a/tests/widgets/conftest.py +++ b/tests/widgets/conftest.py @@ -44,7 +44,7 @@ @pytest.fixture(scope="module", autouse=True) def mock_heavy_deps(): with pytest.MonkeyPatch.context() as mp: - for key in ("configfile", "BlocksScreen.lib.panels.widgets.loadWidget"): + for key in ("configfile", "BlocksScreen.lib.panels.widgets.Common.loadWidget"): mp.delitem(sys.modules, key, raising=False) mp.setitem(sys.modules, "configfile", MagicMock()) yield diff --git a/tests/widgets/test_job_status_page_unit.py b/tests/widgets/test_job_status_page_unit.py index 4860b5a4..f15a3294 100644 --- a/tests/widgets/test_job_status_page_unit.py +++ b/tests/widgets/test_job_status_page_unit.py @@ -37,7 +37,7 @@ def set_progress(self, *a): # real CustomProgressBar takes a 0-1 float _blocks_label = types.ModuleType("lib.utils.blocks_label") _display_button = types.ModuleType("lib.utils.display_button") _progress_bar = types.ModuleType("lib.utils.blocks_progressbar") -_base_popup = types.ModuleType("lib.panels.widgets.basePopup") +_base_popup = types.ModuleType("lib.panels.widgets.Common.basePopup") _blocks_button.BlocksCustomButton = _make_stub(QtWidgets.QPushButton) _blocks_label.BlocksLabel = _make_stub(QtWidgets.QLabel) @@ -50,7 +50,7 @@ def set_progress(self, *a): # real CustomProgressBar takes a 0-1 float ("lib.utils.blocks_label", _blocks_label), ("lib.utils.display_button", _display_button), ("lib.utils.blocks_progressbar", _progress_bar), - ("lib.panels.widgets.basePopup", _base_popup), + ("lib.panels.widgets.Common.basePopup", _base_popup), ]: sys.modules[_name] = _mod # force-set so network conftest stubs don't win diff --git a/tests/widgets/test_slider_page_request_unit.py b/tests/widgets/test_slider_page_request_unit.py index d1eefaf1..380e4c92 100644 --- a/tests/widgets/test_slider_page_request_unit.py +++ b/tests/widgets/test_slider_page_request_unit.py @@ -41,11 +41,12 @@ sys.modules.pop("lib.panels.printTab", None) sys.modules.pop("lib.panels.controlTab", None) sys.modules.pop("lib.ui", None) -sys.modules.pop("lib.ui.controlStackedWidget_ui", None) +for _stubbed in [_m for _m in sys.modules if _m.startswith("lib.panels.widgets")]: + sys.modules.pop(_stubbed, None) from lib.panels.controlTab import ControlTab # noqa: E402 from lib.panels.printTab import PrintTab # noqa: E402 -from lib.panels.widgets.slider_selector_page import SliderPage # noqa: E402 +from lib.panels.widgets.Common.slider_selector_page import SliderPage # noqa: E402 @pytest.fixture From 8a61686363759f96faeb508263eeecc431695df6 Mon Sep 17 00:00:00 2001 From: Robert0Mart Date: Mon, 31 Aug 2026 12:02:27 +0100 Subject: [PATCH 3/3] refactor: standerize UI setups --- BlocksScreen/lib/panels/networkWindow.py | 4 ++-- BlocksScreen/lib/panels/widgets/Common/bannerPopup.py | 4 ++-- BlocksScreen/lib/panels/widgets/Common/loadWidget.py | 4 ++-- BlocksScreen/lib/panels/widgets/Common/numpadPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py | 4 ++-- BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py | 4 ++-- .../lib/panels/widgets/Common/slider_selector_page.py | 4 ++-- BlocksScreen/lib/panels/widgets/ControlTab/printcorePage.py | 4 ++-- BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py | 4 ++-- .../lib/panels/widgets/MainWindow/connectionPage.py | 4 ++-- .../lib/panels/widgets/MainWindow/notificationPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py | 4 ++-- BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py | 4 ++-- .../lib/panels/widgets/UtilitiesTab/inputshaperPage.py | 4 ++-- .../lib/panels/widgets/UtilitiesTab/troubleshootPage.py | 4 ++-- BlocksScreen/lib/utils/blocks_togglebutton.py | 4 ++-- tests/network/conftest.py | 2 +- tests/network/test_network_ui.py | 6 +++--- tests/widgets/test_update_page_unit.py | 2 +- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/BlocksScreen/lib/panels/networkWindow.py b/BlocksScreen/lib/panels/networkWindow.py index c5698278..9a314630 100644 --- a/BlocksScreen/lib/panels/networkWindow.py +++ b/BlocksScreen/lib/panels/networkWindow.py @@ -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) diff --git a/BlocksScreen/lib/panels/widgets/Common/bannerPopup.py b/BlocksScreen/lib/panels/widgets/Common/bannerPopup.py index 7db54547..6f2c2f32 100644 --- a/BlocksScreen/lib/panels/widgets/Common/bannerPopup.py +++ b/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) diff --git a/BlocksScreen/lib/panels/widgets/Common/loadWidget.py b/BlocksScreen/lib/panels/widgets/Common/loadWidget.py index 1119bd14..4590c319 100644 --- a/BlocksScreen/lib/panels/widgets/Common/loadWidget.py +++ b/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") diff --git a/BlocksScreen/lib/panels/widgets/Common/numpadPage.py b/BlocksScreen/lib/panels/widgets/Common/numpadPage.py index b904645c..98624ec4 100644 --- a/BlocksScreen/lib/panels/widgets/Common/numpadPage.py +++ b/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) diff --git a/BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py b/BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py index 6fbfe20d..1e7a23f4 100644 --- a/BlocksScreen/lib/panels/widgets/Common/optionCardWidget.py +++ b/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( diff --git a/BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py b/BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py index 39dfa293..1ce3111f 100644 --- a/BlocksScreen/lib/panels/widgets/Common/popupDialogWidget.py +++ b/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) diff --git a/BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py b/BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py index 2f6c89f7..8d4ca926 100644 --- a/BlocksScreen/lib/panels/widgets/Common/slider_selector_page.py +++ b/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)) diff --git a/BlocksScreen/lib/panels/widgets/ControlTab/printcorePage.py b/BlocksScreen/lib/panels/widgets/ControlTab/printcorePage.py index c2683cd1..6df7286f 100644 --- a/BlocksScreen/lib/panels/widgets/ControlTab/printcorePage.py +++ b/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) diff --git a/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py b/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py index 3c868e8e..f8187ca9 100644 --- a/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py +++ b/BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py @@ -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( diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py b/BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py index dd33b52e..c9b533b0 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py +++ b/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, diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/connectionPage.py b/BlocksScreen/lib/panels/widgets/MainWindow/connectionPage.py index 5921446e..6b35242b 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/connectionPage.py +++ b/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") diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py b/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py index d2adf0f6..bb0d81ae 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py +++ b/BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py @@ -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, diff --git a/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py b/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py index c169f8b0..825bd013 100644 --- a/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py +++ b/BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py @@ -54,7 +54,7 @@ def __init__(self) -> None: super().__init__() self._chevron_right: QtGui.QPixmap = QtGui.QPixmap() self._chevron_down: QtGui.QPixmap = QtGui.QPixmap() - self._setupUI() + self._setup_ui() self._statuses: dict[str, ComponentStatus] = {} self._font_cache: dict[int, QtGui.QFont] = {} self._chevron_btn: IconButton | None = None @@ -491,7 +491,7 @@ def show_loading(self, loading: bool = False) -> None: self.setUpdatesEnabled(True) self.disable_popups.emit(loading) - def _setupUI(self) -> None: + def _setup_ui(self) -> None: bold_id = QtGui.QFontDatabase.addApplicationFont( ":/font/media/fonts for text/Momcake-Bold.ttf" ) diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py index 1b632c17..f06a8411 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py @@ -40,7 +40,7 @@ def __init__(self, parent) -> None: self._z_offset_text: float = 0.0 self._pending_z_offset: float = 0.0 - self._setupUI() + self._setup_ui() self.bbp_mvup.clicked.connect(self.on_move_nozzle_close) self.bbp_mvdown.clicked.connect(self.on_move_nozzle_away) self.bbp_mvup.setEnabled(False) @@ -129,7 +129,7 @@ def _create_offset_button( btn.setObjectName(obj_name) return btn - def _setupUI(self) -> None: + def _setup_ui(self) -> None: """Setup babystep page UI.""" btn_group = QtWidgets.QButtonGroup(self) btn_group.setExclusive(True) diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py index 0f35ba39..4f8353a8 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py @@ -22,7 +22,7 @@ class ConfirmWidget(QtWidgets.QWidget): def __init__(self, parent) -> None: super().__init__(parent) - self._setupUI() + self._setup_ui() self.setMouseTracking(True) self.setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, True) self.thumbnail: QtGui.QImage = self._blocksthumbnail @@ -146,7 +146,7 @@ def showEvent(self, a0: QtGui.QShowEvent) -> None: self.cf_thumbnail.close() return super().showEvent(a0) - def _setupUI(self) -> None: + def _setup_ui(self) -> None: """Setup widget ui""" sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Policy.MinimumExpanding, diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py index 60f25f9b..b00c7a96 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py @@ -96,7 +96,7 @@ def __init__(self, parent) -> None: self._layer_frozen = False self._awaiting_resume = False self._resume_baseline = 0.0 - self._setupUI() + self._setup_ui() self.cancel_print_dialog = BasePopup(self, floating=True) self.tune_menu_btn.clicked.connect(self.tune_clicked.emit) self.pause_printing_btn.clicked.connect(self.pause_resume_print) @@ -466,7 +466,7 @@ def _compute_progress(self) -> float: return (self._file_position - start) / (end - start) return self._raw_progress - def _setupUI(self) -> None: + def _setup_ui(self) -> None: """Setup widget ui""" sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Policy.Expanding, diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py b/BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py index c479e5dc..7d166f0d 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py @@ -64,7 +64,7 @@ def __init__(self, parent, sensor_name: str): self.icon_pixmap_fnp: QtGui.QPixmap = QtGui.QPixmap( ":/filament_related/media/btn_icons/filament_sensor_off.svg" ) - self._setupUI() + self._setup_ui() self.toggle_button.stateChange.connect(self.toggle_sensor_state) @property @@ -188,7 +188,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None: ) style_painter.end() - def _setupUI(self): + def _setup_ui(self): _policy = QtWidgets.QSizePolicy.Policy.MinimumExpanding size_policy = QtWidgets.QSizePolicy(_policy, _policy) size_policy.setHeightForWidth(self.sizePolicy().hasHeightForWidth()) diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py b/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py index 03bc8285..59f0c87e 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py @@ -25,7 +25,7 @@ def __init__(self, parent): self.sensor_tracking_widget = {} self.current_widget = None self.sensor_list: list[SensorWidget] = [] - self._setupUi() + self._setup_ui() self.setAttribute(QtCore.Qt.WidgetAttribute.WA_TranslucentBackground, True) self.setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, True) self.setTabletTracking(True) @@ -128,7 +128,7 @@ def create_sensor_widget(self, name: str) -> SensorWidget: return _item_widget - def _setupUi(self) -> None: + def _setup_ui(self) -> None: """Setup UI for updatePage""" font_id = QtGui.QFontDatabase.addApplicationFont( ":/font/media/fonts for text/Momcake-Bold.ttf" diff --git a/BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py b/BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py index 03997315..28d08bea 100644 --- a/BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py +++ b/BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py @@ -45,7 +45,7 @@ def __init__(self, parent) -> None: super().__init__(parent) self.tune_display_buttons: dict = {} self.setObjectName("tune_page") - self._setupUI() + self._setup_ui() self.sensors_menu_btn.clicked.connect(self.request_sensorsPage.emit) self.tune_babystep_menu_btn.clicked.connect(self.request_bbpPage.emit) self.tune_back_btn.clicked.connect(self.request_back) @@ -242,7 +242,7 @@ def paintEvent(self, a0: QtGui.QPaintEvent) -> None: if self.isVisible(): self.speed_display.setText(str(f"{int(self.speed_factor_override * 100)}%")) - def _setupUI(self) -> None: + def _setup_ui(self) -> None: sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding, diff --git a/BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py b/BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py index c5d046a9..61bc7e87 100644 --- a/BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py +++ b/BlocksScreen/lib/panels/widgets/UtilitiesTab/inputshaperPage.py @@ -23,7 +23,7 @@ def __init__(self, parent=None) -> None: super().__init__(parent) else: super().__init__() - self._setupUI() + self._setup_ui() self.selected_item: ListItem | None = None self.ongoing_update: bool = False self.type_dict: dict = {} @@ -133,7 +133,7 @@ def add_type_entry(self, cli_name: str, recommended: str = "") -> None: ) self.model.add_item(item) - def _setupUI(self) -> None: + def _setup_ui(self) -> None: """Setup UI for updatePage""" font_id = QtGui.QFontDatabase.addApplicationFont( ":/font/media/fonts for text/Momcake-Bold.ttf" diff --git a/BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py b/BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py index 0c327ac7..1727b210 100644 --- a/BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py +++ b/BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py @@ -20,7 +20,7 @@ def __init__( self.setWindowFlags( QtCore.Qt.WindowType.Popup | QtCore.Qt.WindowType.FramelessWindowHint ) - self._setupUI() + self._setup_ui() self.label_4.setText( "For more information check our website \n www.blockstec.com \n or \nsupport@blockstec.com" ) @@ -47,7 +47,7 @@ def show(self) -> None: self.repaint() return super().show() - def _setupUI(self) -> None: + def _setup_ui(self) -> None: self.setObjectName("troubleshoot_page") self.verticalLayout = QtWidgets.QVBoxLayout(self) self.verticalLayout.setObjectName("verticalLayout") diff --git a/BlocksScreen/lib/utils/blocks_togglebutton.py b/BlocksScreen/lib/utils/blocks_togglebutton.py index c97e8f1f..f109887f 100644 --- a/BlocksScreen/lib/utils/blocks_togglebutton.py +++ b/BlocksScreen/lib/utils/blocks_togglebutton.py @@ -17,7 +17,7 @@ def __init__(self, parent): ":/filament_related/media/btn_icons/filament_sensor_turn_on.svg" ) - self._setupUI() + self._setup_ui() self.tb = self.toggle_button def text(self) -> str: @@ -84,7 +84,7 @@ def setDisabled(self, a0: bool) -> None: self.toggle_button.repaint() return super().setDisabled(a0) - def _setupUI(self): + def _setup_ui(self): _policy = QtWidgets.QSizePolicy.Policy.MinimumExpanding size_policy = QtWidgets.QSizePolicy(_policy, _policy) size_policy.setHeightForWidth(self.sizePolicy().hasHeightForWidth()) diff --git a/tests/network/conftest.py b/tests/network/conftest.py index 45c43e6b..3bfd5e1b 100644 --- a/tests/network/conftest.py +++ b/tests/network/conftest.py @@ -202,7 +202,7 @@ def setFlat(self, v: bool) -> None: class _BlocksCustomCheckButtonStub(QtWidgets.QCheckBox): - """BlocksCustomCheckButton stand-in — adds setFlat() used in _setupUI.""" + """BlocksCustomCheckButton stand-in — adds setFlat() used in _setup_ui.""" def setFlat(self, v: bool) -> None: pass diff --git a/tests/network/test_network_ui.py b/tests/network/test_network_ui.py index 9fd4e750..da30880c 100644 --- a/tests/network/test_network_ui.py +++ b/tests/network/test_network_ui.py @@ -936,13 +936,13 @@ def test_clears_loading(self, win): # ───────────────────────────────────────────────────────────────────────────── -# _setupUI smoke test — covers ~1 200 statements in _setupUI + page helpers +# _setup_ui smoke test — covers ~1 200 statements in _setup_ui + page helpers # ───────────────────────────────────────────────────────────────────────────── @pytest.mark.unit class TestSetupUIRunsWithoutError: - """Calling _setupUI() must not raise — covers the entire UI construction path.""" + """Calling _setup_ui() must not raise — covers the entire UI construction path.""" def test_setup_ui_completes(self, qapp): from unittest.mock import patch @@ -957,7 +957,7 @@ def _stub_init(self, *_a, **_kw): with patch.object(NetworkControlWindow, "__init__", _stub_init): w = NetworkControlWindow() - w._setupUI() + w._setup_ui() assert w.main_network_page is not None assert w.network_list_page is not None assert w.add_network_page is not None diff --git a/tests/widgets/test_update_page_unit.py b/tests/widgets/test_update_page_unit.py index 5ab72bf7..26980da0 100644 --- a/tests/widgets/test_update_page_unit.py +++ b/tests/widgets/test_update_page_unit.py @@ -40,7 +40,7 @@ def _mock_setup(self): self._chevron_right = MagicMock() self._chevron_down = MagicMock() - setup_patch = patch.object(UpdatePage, "_setupUI", _mock_setup) + setup_patch = patch.object(UpdatePage, "_setup_ui", _mock_setup) setup_patch.start() pg = UpdatePage() setup_patch.stop()