From b2d483851de4ec86c7b29c456886d60054206733 Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Fri, 7 Nov 2025 11:55:41 +0000 Subject: [PATCH 1/2] Add: hiddent some buttons --- BlocksScreen/lib/panels/controlTab.py | 17 +++--- BlocksScreen/lib/ui/controlStackedWidget.ui | 57 +++---------------- .../lib/ui/controlStackedWidget_ui.py | 41 ++++--------- 3 files changed, 31 insertions(+), 84 deletions(-) diff --git a/BlocksScreen/lib/panels/controlTab.py b/BlocksScreen/lib/panels/controlTab.py index 519c86a9..a66ba1e6 100644 --- a/BlocksScreen/lib/panels/controlTab.py +++ b/BlocksScreen/lib/panels/controlTab.py @@ -108,12 +108,12 @@ def __init__( partial(self.change_page, self.indexOf(self.panel.temperature_page)) ) self.panel.cp_switch_print_core_btn.clicked.connect(self.show_swapcore) - self.panel.cp_printer_settings_btn.clicked.connect( - partial( - self.change_page, - self.indexOf(self.panel.printer_settings_page), - ) - ) + # self.panel.cp_printer_settings_btn.clicked.connect( + # partial( + # self.change_page, + # self.indexOf(self.panel.printer_settings_page), + # ) + # ) self.panel.cp_nozzles_calibration_btn.clicked.connect( partial(self.change_page, self.indexOf(self.probe_helper_page)) ) @@ -269,7 +269,10 @@ def __init__( self.printer.on_printcore_update.connect(self.handle_printcoreupdate) self.printer.gcode_response.connect(self._handle_gcode_response) - self.panel.cp_printer_settings_btn.hide() + # self.panel.cp_printer_settings_btn.hide() + self.panel.temperature_cooldown_btn.hide() + self.panel.cooldown_btn.hide() + self.panel.cp_switch_print_core_btn.hide() def handle_printcoreupdate(self, value:dict): diff --git a/BlocksScreen/lib/ui/controlStackedWidget.ui b/BlocksScreen/lib/ui/controlStackedWidget.ui index fdb9f068..949bf57e 100644 --- a/BlocksScreen/lib/ui/controlStackedWidget.ui +++ b/BlocksScreen/lib/ui/controlStackedWidget.ui @@ -32,7 +32,7 @@ StackedWidget - 1 + 0 @@ -345,8 +345,8 @@ Control - - + + 0 @@ -389,8 +389,8 @@ Control - Printer -Settings + Swap +Print Core false @@ -402,12 +402,12 @@ Settings menu_btn - :/ui/media/btn_icons/printer_settings.svg + :/extruder_related/media/btn_icons/switch_print_core.svg - - + + 0 @@ -426,45 +426,6 @@ Settings 80 - - - Momcake - 19 - false - PreferAntialias - - - - false - - - true - - - Qt::NoContextMenu - - - Qt::LeftToRight - - - - - - Swap -Print Core - - - false - - - true - - - menu_btn - - - :/extruder_related/media/btn_icons/switch_print_core.svg - @@ -5623,8 +5584,8 @@ Home - + diff --git a/BlocksScreen/lib/ui/controlStackedWidget_ui.py b/BlocksScreen/lib/ui/controlStackedWidget_ui.py index 86650df8..c4d67b04 100644 --- a/BlocksScreen/lib/ui/controlStackedWidget_ui.py +++ b/BlocksScreen/lib/ui/controlStackedWidget_ui.py @@ -1,4 +1,4 @@ -# Form implementation generated from reading ui file '/home/levi/main/Blocks_Screen/BlocksScreen/lib/ui/controlStackedWidget.ui' +# Form implementation generated from reading ui file '/home/levi/main/BlocksScreen/BlocksScreen/lib/ui/controlStackedWidget.ui' # # Created by: PyQt6 UI code generator 6.7.1 # @@ -150,30 +150,6 @@ def setupUi(self, controlStackedWidget): self.cp_z_tilt_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/z_levelling/media/btn_icons/bed_levelling.svg")) self.cp_z_tilt_btn.setObjectName("cp_z_tilt_btn") self.cp_content_layout.addWidget(self.cp_z_tilt_btn, 1, 1, 1, 1) - self.cp_printer_settings_btn = BlocksCustomButton(parent=self.control_page) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cp_printer_settings_btn.sizePolicy().hasHeightForWidth()) - self.cp_printer_settings_btn.setSizePolicy(sizePolicy) - self.cp_printer_settings_btn.setMinimumSize(QtCore.QSize(10, 80)) - self.cp_printer_settings_btn.setMaximumSize(QtCore.QSize(250, 80)) - font = QtGui.QFont() - font.setFamily("Momcake") - font.setPointSize(19) - font.setItalic(False) - font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferAntialias) - self.cp_printer_settings_btn.setFont(font) - self.cp_printer_settings_btn.setMouseTracking(False) - self.cp_printer_settings_btn.setTabletTracking(True) - self.cp_printer_settings_btn.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.NoContextMenu) - self.cp_printer_settings_btn.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight) - self.cp_printer_settings_btn.setStyleSheet("") - self.cp_printer_settings_btn.setAutoDefault(False) - self.cp_printer_settings_btn.setFlat(True) - self.cp_printer_settings_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/printer_settings.svg")) - self.cp_printer_settings_btn.setObjectName("cp_printer_settings_btn") - self.cp_content_layout.addWidget(self.cp_printer_settings_btn, 2, 1, 1, 1) self.cp_switch_print_core_btn = BlocksCustomButton(parent=self.control_page) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -198,6 +174,16 @@ def setupUi(self, controlStackedWidget): self.cp_switch_print_core_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/extruder_related/media/btn_icons/switch_print_core.svg")) self.cp_switch_print_core_btn.setObjectName("cp_switch_print_core_btn") self.cp_content_layout.addWidget(self.cp_switch_print_core_btn, 2, 0, 1, 1) + self.blank_2 = QtWidgets.QWidget(parent=self.control_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.blank_2.sizePolicy().hasHeightForWidth()) + self.blank_2.setSizePolicy(sizePolicy) + self.blank_2.setMinimumSize(QtCore.QSize(10, 80)) + self.blank_2.setMaximumSize(QtCore.QSize(250, 80)) + self.blank_2.setObjectName("blank_2") + self.cp_content_layout.addWidget(self.blank_2, 2, 1, 1, 1) self.verticalLayout.addLayout(self.cp_content_layout) controlStackedWidget.addWidget(self.control_page) self.motion_page = QtWidgets.QWidget() @@ -1997,7 +1983,7 @@ def setupUi(self, controlStackedWidget): controlStackedWidget.addWidget(self.printer_settings_page) self.retranslateUi(controlStackedWidget) - controlStackedWidget.setCurrentIndex(1) + controlStackedWidget.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(controlStackedWidget) def retranslateUi(self, controlStackedWidget): @@ -2016,9 +2002,6 @@ def retranslateUi(self, controlStackedWidget): self.cp_temperature_btn.setProperty("class", _translate("controlStackedWidget", "menu_btn")) self.cp_z_tilt_btn.setText(_translate("controlStackedWidget", "Z-Tilt")) self.cp_z_tilt_btn.setProperty("class", _translate("controlStackedWidget", "menu_btn")) - self.cp_printer_settings_btn.setText(_translate("controlStackedWidget", "Printer\n" -"Settings")) - self.cp_printer_settings_btn.setProperty("class", _translate("controlStackedWidget", "menu_btn")) self.cp_switch_print_core_btn.setText(_translate("controlStackedWidget", "Swap\n" "Print Core")) self.cp_switch_print_core_btn.setProperty("class", _translate("controlStackedWidget", "menu_btn")) From 7f255eb10dec8ef4328fee24c776f9e63feb0952 Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Fri, 7 Nov 2025 12:26:05 +0000 Subject: [PATCH 2/2] bugfix: loadscreen not showing --- BlocksScreen/lib/panels/filamentTab.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BlocksScreen/lib/panels/filamentTab.py b/BlocksScreen/lib/panels/filamentTab.py index fbaa0b7c..ceb77a2a 100644 --- a/BlocksScreen/lib/panels/filamentTab.py +++ b/BlocksScreen/lib/panels/filamentTab.py @@ -192,7 +192,7 @@ def load_filament(self, toolhead: int = 0, temp: int = 220) -> None: message="Filament is already loaded.", ) return - + self.loadscreen.show() self.run_gcode.emit(f"LOAD_FILAMENT TOOLHEAD=load_toolhead TEMPERATURE={temp}") @QtCore.pyqtSlot(str, int, name="unload_filament") @@ -214,6 +214,7 @@ def unload_filament(self, toolhead: int = 0, temp: int = 220) -> None: return self.find_routine_objects() + self.loadscreen.show() self.run_gcode.emit(f"UNLOAD_FILAMENT TEMPERATURE={temp}") def handle_filament_state(self):