Add: hiddent some buttons (#98)

* Add: hiddent some buttons

* bugfix: loadscreen not showing

---------

Co-authored-by: Hugo Costa <hugo.santos.costa@gmail.com>

Author: Robert0Mart

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):

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):

BlocksScreen/lib/ui/controlStackedWidget.ui

@@ -32,7 +32,7 @@
    <string>StackedWidget</string>
   </property>
   <property name="currentIndex">
-   <number>1</number>
+   <number>0</number>
   </property>
   <widget class="QWidget" name="control_page">
    <property name="sizePolicy">
@@ -345,8 +345,8 @@ Control</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="BlocksCustomButton" name="cp_printer_settings_btn">
+      <item row="2" column="0">
+       <widget class="BlocksCustomButton" name="cp_switch_print_core_btn">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -389,8 +389,8 @@ Control</string>
          <string notr="true"/>
         </property>
         <property name="text">
-         <string>Printer
-Settings</string>
+         <string>Swap
+Print Core</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@@ -402,12 +402,12 @@ Settings</string>
          <string>menu_btn</string>
         </property>
         <property name="icon_pixmap" stdset="0">
-         <pixmap resource="resources/icon_resources.qrc">:/ui/media/btn_icons/printer_settings.svg</pixmap>
+         <pixmap resource="resources/icon_resources.qrc">:/extruder_related/media/btn_icons/switch_print_core.svg</pixmap>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="BlocksCustomButton" name="cp_switch_print_core_btn">
+      <item row="2" column="1">
+       <widget class="QWidget" name="blank_2" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -426,45 +426,6 @@ Settings</string>
           <height>80</height>
          </size>
         </property>
-        <property name="font">
-         <font>
-          <family>Momcake</family>
-          <pointsize>19</pointsize>
-          <italic>false</italic>
-          <stylestrategy>PreferAntialias</stylestrategy>
-         </font>
-        </property>
-        <property name="mouseTracking">
-         <bool>false</bool>
-        </property>
-        <property name="tabletTracking">
-         <bool>true</bool>
-        </property>
-        <property name="contextMenuPolicy">
-         <enum>Qt::NoContextMenu</enum>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>Swap
-Print Core</string>
-        </property>
-        <property name="autoDefault">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-        <property name="class" stdset="0">
-         <string>menu_btn</string>
-        </property>
-        <property name="icon_pixmap" stdset="0">
-         <pixmap resource="resources/icon_resources.qrc">:/extruder_related/media/btn_icons/switch_print_core.svg</pixmap>
-        </property>
        </widget>
       </item>
      </layout>
@@ -5623,8 +5584,8 @@ Home</string>
  <connections/>
  <buttongroups>
   <buttongroup name="extrude_select_length_group"/>
-  <buttongroup name="axis_select_length_group"/>
   <buttongroup name="axis_select_speed_group"/>
+  <buttongroup name="axis_select_length_group"/>
   <buttongroup name="extrude_select_feedrate_group"/>
  </buttongroups>
 </ui>

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"))