feat: separated utilities ui into pages

BlocksScreen/lib/panels/mainWindow.py

@@ -591,7 +591,7 @@ def _on_moonraker_connected_post_update(self) -> None:
     def on_update_available(self, state: bool = False):
         """Signal render for red dot on utilities tab icon and Update button"""
         self.main_content_widget.setNotification(3, state)
-        self.utilitiesPanel.panel.update_btn.setShowNotification(state)
+        self.utilitiesPanel.up_update_btn.setShowNotification(state)
         self.repaint()
 
     def enable_tab_bar(self) -> bool:

BlocksScreen/lib/panels/widgets/UtilitiesTab/axisMaintPage.py

@@ -0,0 +1,215 @@
+import typing
+
+from lib.panels.widgets.Common.basePopup import BasePopup
+from lib.utils.blocks_button import BlocksCustomButton
+from lib.utils.blocks_frame import BlocksCustomFrame
+from lib.utils.check_button import BlocksCustomCheckButton
+from lib.utils.icon_button import IconButton
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class AxisMaintPage(QtWidgets.QWidget):
+    """Axis Maintenance page of the utilities tab."""
+
+    request_back = QtCore.pyqtSignal(name="request-back-button")
+
+    run_gcode_signal: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
+        str, name="run-gcode"
+    )
+    call_load_panel = QtCore.pyqtSignal(bool, str, bool, name="call-load-panel")
+
+    def __init__(
+        self,
+        parent: typing.Optional["QtWidgets.QWidget"],
+    ) -> None:
+        super().__init__(parent)
+
+        self.answerPage = BasePopup(self, False, True)
+        self.answerPage.accepted.connect(self._run_AXIS_MAINTENANCE_gcode)
+
+        self._setup_ui()
+        self.axes_back_btn.clicked.connect(self.request_back.emit)
+        self.am_execute.clicked.connect(self.axis_maintenance)
+
+    def _run_AXIS_MAINTENANCE_gcode(self):
+        if self.current_object:
+            self.run_gcode_signal.emit(
+                f"AXIS_MAINTENANCE_FINISH_{self.current_object}\nM400"
+            )
+
+            self.call_load_panel.emit(
+                True,
+                f"Running maintenance cycle on {self.current_object.upper()} axis...",
+                False,
+            )
+
+            QtCore.QTimer.singleShot(
+                50000, lambda: self.call_load_panel.emit(False, "", False)
+            )
+
+        else:
+            self.answerPage.hide()
+
+    def axis_maintenance(self) -> None:
+        """Routine, checks axis movement for printer debugging"""
+        self.current_object = self.axis_maintenance_gb.checkedButton().text().lower()
+        self.run_gcode_signal.emit(f"AXIS_MAINTENANCE_{self.current_object}\nM400")
+
+        self.answerPage.set_message(
+            f"Apply oil to the {self.current_object.upper()} axis, then press Confirm.",
+        )
+
+        self.answerPage.show()
+        self.call_load_panel.emit(
+            True, f"Homing {self.current_object.upper()} axis...", False
+        )
+
+        QtCore.QTimer.singleShot(
+            10000,
+            lambda: {
+                self.call_load_panel.emit(False, "", False),
+                self.answerPage.show(),
+            },
+        )
+
+    def _setup_ui(self) -> None:
+        self.setObjectName("axes_page")
+
+        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self)
+        self.verticalLayout_7.setObjectName("verticalLayout_7")
+        spacerItem12 = QtWidgets.QSpacerItem(
+            20,
+            24,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+        self.verticalLayout_7.addItem(spacerItem12)
+        self.lcd_settings_header_layout = QtWidgets.QHBoxLayout()
+        self.lcd_settings_header_layout.setObjectName("lcd_settings_header_layout")
+        spacerItem13 = QtWidgets.QSpacerItem(
+            60,
+            20,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+        self.lcd_settings_header_layout.addItem(spacerItem13)
+
+        font = QtGui.QFont()
+        font.setFamily("Momcake")
+        font.setPointSize(24)
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum
+        )
+
+        self.lcd_settings_title_label = QtWidgets.QLabel(parent=self)
+        self.lcd_settings_title_label.setSizePolicy(sizePolicy)
+        self.lcd_settings_title_label.setMaximumSize(QtCore.QSize(16777215, 60))
+        self.lcd_settings_title_label.setFont(font)
+        self.lcd_settings_title_label.setStyleSheet(
+            "background: transparent; color: white;"
+        )
+        self.lcd_settings_title_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.lcd_settings_header_layout.addWidget(self.lcd_settings_title_label)
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.MinimumExpanding,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+
+        self.axes_back_btn = IconButton(parent=self)
+        self.axes_back_btn.setSizePolicy(sizePolicy)
+        self.axes_back_btn.setMinimumSize(QtCore.QSize(60, 60))
+        self.axes_back_btn.setMaximumSize(QtCore.QSize(60, 60))
+        self.axes_back_btn.setFont(font)
+        self.axes_back_btn.setProperty(
+            "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")
+        )
+        self.axes_back_btn.setObjectName("axes_back_btn")
+
+        self.lcd_settings_header_layout.addWidget(self.axes_back_btn)
+        self.verticalLayout_7.addLayout(self.lcd_settings_header_layout)
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.Expanding,
+            QtWidgets.QSizePolicy.Policy.Expanding,
+        )
+
+        self.frame_2 = BlocksCustomFrame(parent=self)
+        self.frame_2.setSizePolicy(sizePolicy)
+        self.frame_2.setMinimumSize(QtCore.QSize(650, 0))
+        self.frame_2.setObjectName("frame_2")
+
+        self.gridLayout = QtWidgets.QGridLayout(self.frame_2)
+        self.gridLayout.setObjectName("gridLayout")
+
+        self.axis_maintenance_gb = QtWidgets.QButtonGroup(self)
+        self.axis_maintenance_gb.setObjectName("axis_maintenance_gb")
+
+        self.am_execute = BlocksCustomButton(parent=self.frame_2)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding
+        )
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+
+        font = QtGui.QFont()
+        font.setFamily("Momcake")
+        font.setPointSize(19)
+
+        self.am_execute.setSizePolicy(sizePolicy)
+        self.am_execute.setMinimumSize(QtCore.QSize(250, 80))
+        self.am_execute.setMaximumSize(QtCore.QSize(250, 80))
+        self.am_execute.setFont(font)
+        self.am_execute.setProperty(
+            "icon_pixmap", QtGui.QPixmap(":/dialog/media/btn_icons/yes.svg")
+        )
+        self.am_execute.setObjectName("am_execute")
+        self.gridLayout.addWidget(self.am_execute, 2, 1, 1, 1)
+
+        font = QtGui.QFont()
+        font.setPointSize(20)
+
+        self.am_y = BlocksCustomCheckButton(parent=self.frame_2)
+        self.am_y.setMinimumSize(QtCore.QSize(60, 80))
+        self.am_y.setMaximumSize(QtCore.QSize(250, 80))
+        self.am_y.setFont(font)
+        self.am_y.setCheckable(True)
+        self.am_y.setChecked(True)
+        self.am_y.setAutoExclusive(True)
+        self.am_y.setFlat(True)
+        self.am_y.setObjectName("am_y")
+        self.axis_maintenance_gb.addButton(self.am_y)
+
+        self.gridLayout.addWidget(self.am_y, 1, 0, 1, 1)
+
+        self.am_z = BlocksCustomCheckButton(parent=self.frame_2)
+        self.am_z.setMinimumSize(QtCore.QSize(60, 80))
+        self.am_z.setMaximumSize(QtCore.QSize(250, 80))
+        self.am_z.setFont(font)
+        self.am_z.setCheckable(True)
+        self.am_z.setAutoExclusive(True)
+        self.axis_maintenance_gb.addButton(self.am_z)
+        self.gridLayout.addWidget(self.am_z, 2, 0, 1, 1)
+
+        self.am_x = BlocksCustomCheckButton(parent=self.frame_2)
+        self.am_x.setMinimumSize(QtCore.QSize(250, 80))
+        self.am_x.setMaximumSize(QtCore.QSize(250, 80))
+        self.am_x.setFont(font)
+        self.am_x.setCheckable(True)
+        self.am_x.setAutoExclusive(True)
+        self.axis_maintenance_gb.addButton(self.am_x)
+        self.gridLayout.addWidget(self.am_x, 0, 0, 1, 1)
+
+        self.verticalLayout_7.addWidget(
+            self.frame_2, 0, QtCore.Qt.AlignmentFlag.AlignHCenter
+        )
+
+        self.lcd_settings_title_label.setText("Axis Maintenance")
+
+        self.axes_back_btn.setText("Back")
+        self.am_execute.setText("Execute")
+
+        self.am_z.setText("Z")
+        self.am_x.setText("X")
+        self.am_y.setText("Y")

BlocksScreen/lib/panels/widgets/UtilitiesTab/infoPage.py

@@ -0,0 +1,123 @@
+import typing
+
+from lib.utils.blocks_frame import BlocksCustomFrame
+from lib.utils.icon_button import IconButton
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class InfoPage(QtWidgets.QWidget):
+    """Info page of the utilities tab."""
+
+    request_back_button = QtCore.pyqtSignal(name="request-back-button")
+
+    def __init__(
+        self,
+        parent: typing.Optional["QtWidgets.QWidget"],
+    ) -> None:
+        super().__init__(parent)
+
+        self._setup_ui()
+        self.info_back_btn.clicked.connect(self.request_back_button.emit)
+
+    def _setup_ui(self) -> None:
+        self.setObjectName("info_page")
+
+        spacerItem = QtWidgets.QSpacerItem(
+            20,
+            24,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+
+        spacerItem1 = QtWidgets.QSpacerItem(
+            60,
+            60,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.verticalLayout_2.addItem(spacerItem)
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum
+        )
+
+        font = QtGui.QFont()
+        font.setFamily("Momcake")
+        font.setPointSize(24)
+
+        self.info_header_layout = QtWidgets.QHBoxLayout()
+        self.info_header_layout.setObjectName("info_header_layout")
+        self.info_header_layout.addItem(spacerItem1)
+
+        self.info_title_label = QtWidgets.QLabel(parent=self)
+        self.info_title_label.setSizePolicy(sizePolicy)
+        self.info_title_label.setMaximumSize(QtCore.QSize(16777215, 60))
+        self.info_title_label.setFont(font)
+        self.info_title_label.setStyleSheet("background: transparent; color: white;")
+        self.info_title_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.info_header_layout.addWidget(self.info_title_label)
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.MinimumExpanding,
+            QtWidgets.QSizePolicy.Policy.MinimumExpanding,
+        )
+
+        self.info_back_btn = IconButton(parent=self)
+        self.info_back_btn.setSizePolicy(sizePolicy)
+        self.info_back_btn.setMinimumSize(QtCore.QSize(60, 60))
+        self.info_back_btn.setMaximumSize(QtCore.QSize(60, 60))
+        self.info_back_btn.setProperty(
+            "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")
+        )
+        self.info_header_layout.addWidget(self.info_back_btn)
+        self.verticalLayout_2.addLayout(self.info_header_layout)
+
+        self.info_content_layout = QtWidgets.QVBoxLayout()
+        self.info_content_layout.setObjectName("info_content_layout")
+
+        self.frame = BlocksCustomFrame(parent=self)
+        self.frame.setMinimumSize(QtCore.QSize(350, 260))
+        self.frame.setMaximumSize(QtCore.QSize(350, 290))
+
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Policy.Preferred,
+            QtWidgets.QSizePolicy.Policy.Expanding,
+        )
+
+        font = QtGui.QFont()
+        font.setPointSize(20)
+
+        self.kv_label = QtWidgets.QLabel(parent=self.frame)
+        self.kv_label.setGeometry(QtCore.QRect(0, 10, 351, 81))
+        self.kv_label.setSizePolicy(sizePolicy)
+        self.kv_label.setFont(font)
+        self.kv_label.setStyleSheet("color:white")
+        self.kv_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.kv_label.setObjectName("kv_label")
+
+        font = QtGui.QFont()
+        font.setPointSize(20)
+
+        self.smth_label = QtWidgets.QLabel(parent=self.frame)
+        self.smth_label.setGeometry(QtCore.QRect(0, 110, 351, 81))
+        self.smth_label.setSizePolicy(sizePolicy)
+        self.smth_label.setFont(font)
+        self.smth_label.setStyleSheet("color:white")
+        self.smth_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.info_content_layout.addWidget(
+            self.frame, 0, QtCore.Qt.AlignmentFlag.AlignHCenter
+        )
+        self.verticalLayout_2.addLayout(self.info_content_layout)
+
+        _translate = QtCore.QCoreApplication.translate
+
+        self.info_title_label.setText(_translate("self", "Info"))
+        self.info_title_label.setProperty("class", _translate("self", "title_text"))
+        self.info_back_btn.setText(_translate("self", "Back"))
+        self.info_back_btn.setProperty("class", _translate("self", "menu_btn"))
+        self.info_back_btn.setProperty("button_type", _translate("self", "icon"))
+        self.kv_label.setText(_translate("self", "Model: Blocks RF50"))
+        self.smth_label.setText(_translate("self", "www.blockstec.com "))