Bugfix button text fix (#62)

* UPD: updated the left/center margin for blocks_button

* UPD: commented qr code widget , added text , incresed text font

* UPD: updated xyz format , hid printer settings , changed max bed temp. to 120

* UPD: updated popup messages

* UPD: uniformed size ,fonts and position for the buttons

* UPD: blocks_button now center on the whole white part of the button

* UPD: updated tittle on controlpanel

* UPD: fixed leds page layout

* BugFix: fixed ztilt without home before

Author: Robert0Mart

BlocksScreen/lib/panels/controlTab.py

@@ -240,7 +240,7 @@ def __init__(
                 int(round(float(self.panel.bed_temp_display.secondary_text))),
                 self.on_numpad_change,
                 0,
-                300,  # TODO: Get this value from printer objects
+                120,  # TODO: Get this value from printer objects
             )
         )
         self.request_numpad[str, int, "PyQt_PyObject", int, int].connect(
@@ -261,12 +261,13 @@ def __init__(
         self.printcores_page.pc_accept.clicked.connect(self.handle_swapcore)
 
         self.ws.klippy_state_signal.connect(self.on_klippy_status)
+        self.panel.cp_printer_settings_btn.hide()
 
     def handle_ztilt(self):
         """Handle Z-Tilt Adjustment"""
         self.loadpage.show()
         self.loadpage.set_status_message("Please wait, performing Z-axis calibration.")
-        self.run_gcode_signal.emit("Z_TILT_ADJUST")
+        self.run_gcode_signal.emit("G28\nM400\nZ_TILT_ADJUST")
         QtCore.QTimer.singleShot(30000, self.after_ztilt)  # should be a if here
 
     @QtCore.pyqtSlot(name="after-ztilt")
@@ -467,9 +468,9 @@ def handle_move_axis(self, axis: str) -> None:
     def on_toolhead_update(self, field: str, values: list) -> None:
         """Handles updated from toolhead printer object"""
         if field == "position":
-            self.panel.mva_x_value_label.setText(f"{values[0]}")
-            self.panel.mva_y_value_label.setText(f"{values[1]}")
-            self.panel.mva_z_value_label.setText(f"{values[2]}")
+            self.panel.mva_x_value_label.setText(f"{values[0]:.2f}")
+            self.panel.mva_y_value_label.setText(f"{values[1]:.2f}")
+            self.panel.mva_z_value_label.setText(f"{values[2]:.3f}")
         self.toolhead_info.update({f"{field}": values})
 
     @QtCore.pyqtSlot(str, str, float, name="on-extruder-update")

BlocksScreen/lib/panels/filamentTab.py

@@ -164,10 +164,10 @@ def on_unload_filament(self,status:bool):
     @QtCore.pyqtSlot(int, int, name="load_filament")
     def load_filament(self, toolhead: int = 0, temp: int = 220) -> None:
         if self._filament_state == self.FilamentStates.UNKNOWN:
-            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Cannot Find If Machine is Loadded or not",)
+            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Unable to detect whether the filament is loaded or unloaded.",)
 
         if self._filament_state == self.FilamentStates.LOADED:
-            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Allready Loaded",)
+            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Filament is already loaded.",)
             return  
         if toolhead == 0:
             self.run_gcode.emit(f"LOAD_FILAMENT TEMPERATURE={temp}")
@@ -179,10 +179,10 @@ def load_filament(self, toolhead: int = 0, temp: int = 220) -> None:
     @QtCore.pyqtSlot(str, int, name="unload_filament")
     def unload_filament(self, toolhead: int = 0, temp: int = 220) -> None:
         if self._filament_state == self.FilamentStates.UNKNOWN:
-            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Cannot Find If Machine is Loadded or not",)
-                
-        if  self._filament_state == self.FilamentStates.UNLOADED:
-            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Allready UnLoaded",)
+            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Unable to detect whether the filament is loaded or unloaded.",)
+
+        if self._filament_state == self.FilamentStates.UNLOADED:
+            self.popup.new_message(message_type=Popup.MessageType.ERROR , message="Filament is already unloaded.",)
             return  
 
         self.find_routine_objects()

BlocksScreen/lib/panels/widgets/troubleshootPage.py

@@ -20,6 +20,9 @@ def __init__(
             | QtCore.Qt.WindowType.FramelessWindowHint
         )
         self.setupUI()
+        self.label_4.setText("For more information check our website \n www.blockstec.com \n or \nsupport@blockstec.com")
+
+        
         self.repaint()
 
     def geometry_calc(self) -> None:
@@ -74,7 +77,7 @@ def setupUI(self) -> None:
         self.tb_back_btn.setMaximumSize(QtCore.QSize(60, 60))
         font = QtGui.QFont()
         font.setFamily("Momcake")
-        font.setPointSize(20)
+        font.setPointSize(24)
         font.setItalic(False)
         font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferAntialias)
         self.tb_back_btn.setFont(font)
@@ -100,18 +103,18 @@ def setupUI(self) -> None:
         sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
         self.label_4.setSizePolicy(sizePolicy)
         font = QtGui.QFont()
-        font.setPointSize(15)
+        font.setPointSize(24)
         self.label_4.setFont(font)
         self.label_4.setStyleSheet("color:white")
         self.label_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.label_4.setObjectName("label_4")
         self.verticalLayout_10.addWidget(self.label_4)
         self.horizontalLayout.addLayout(self.verticalLayout_10)
-        self.widget = QtWidgets.QWidget(parent=self)
-        self.widget.setMinimumSize(QtCore.QSize(300, 300))
-        self.widget.setMaximumSize(QtCore.QSize(300, 300))
-        self.widget.setAutoFillBackground(True)
-        self.widget.setStyleSheet("color:white")
-        self.widget.setObjectName("widget")
-        self.horizontalLayout.addWidget(self.widget)
+        # self.widget = QtWidgets.QWidget(parent=self)
+        # self.widget.setMinimumSize(QtCore.QSize(300, 300))
+        # self.widget.setMaximumSize(QtCore.QSize(300, 300))
+        # self.widget.setAutoFillBackground(True)
+        # self.widget.setStyleSheet("color:white")
+        # self.widget.setObjectName("widget")
+        # self.horizontalLayout.addWidget(self.widget)
         self.verticalLayout.addLayout(self.horizontalLayout)