Merge branch 'dev' into ref/network_window

Author: gmmcosta15

BlocksScreen/lib/files.py

@@ -54,6 +54,7 @@ def __init__(
 
     @property
     def file_list(self):
+        """Get the current list of files"""
         return self.files
 
     def handle_message_received(self, method: str, data, params: dict) -> None:
@@ -80,6 +81,19 @@ def handle_message_received(self, method: str, data, params: dict) -> None:
             self.on_file_list[list].emit(self.files)
             self.on_dirs[list].emit(self.directories)
 
+    @QtCore.pyqtSlot(str, str, name="on_request_delete_file")
+    def on_request_delete_file(self, filename: str, directory: str = "gcodes") -> None:
+        """Requests deletion of a file
+
+        Args:
+            filename (str): file to delete
+            directory (str): root directory where the file is located
+        """
+        if not directory:
+            self.ws.api.delete_file(filename)
+            return
+        self.ws.api.delete_file(filename, directory)  # Use the root directory 'gcodes'
+
     @QtCore.pyqtSlot(str, name="on_request_fileinfo")
     def on_request_fileinfo(self, filename: str) -> None:
         """Requests metadata for a file

BlocksScreen/lib/moonrakerComm.py

@@ -544,6 +544,7 @@ def get_gcode_thumbnail(self, filename_dir: str):
     def delete_file(self, filename: str, root_dir: str = "gcodes"):
         """Request file deletion"""
         filepath = f"{root_dir}/{filename}"
+        filepath = f"gcodes/{root_dir}/{filename}" if root_dir != "gcodes" else filepath
         return self._ws.send_request(
             method="server.files.delete_file",
             params={"path": filepath},

BlocksScreen/lib/panels/printTab.py

@@ -126,7 +126,6 @@ def __init__(
         self.file_data.on_file_list.connect(self.filesPage_widget.on_file_list)
         self.jobStatusPage_widget = JobStatusWidget(self)
         self.addWidget(self.jobStatusPage_widget)
-
         self.confirmPage_widget.on_accept.connect(
             self.jobStatusPage_widget.on_print_start
         )
@@ -167,19 +166,15 @@ def __init__(
         self.printer.print_stats_update[str, float].connect(
             self.jobStatusPage_widget.on_print_stats_update
         )
-
         self.printer.print_stats_update[str, str].connect(self.on_print_stats_update)
         self.printer.print_stats_update[str, dict].connect(self.on_print_stats_update)
         self.printer.print_stats_update[str, float].connect(self.on_print_stats_update)
-
         self.printer.gcode_move_update[str, list].connect(
             self.jobStatusPage_widget.on_gcode_move_update
         )
-
         self.babystepPage = BabystepPage(self)
         self.babystepPage.request_back.connect(self.back_button)
         self.addWidget(self.babystepPage)
-
         self.tune_page = TuneWidget(self)
         self.addWidget(self.tune_page)
         self.jobStatusPage_widget.tune_clicked.connect(
@@ -225,10 +220,8 @@ def __init__(
         self.tune_page.request_sensorsPage.connect(
             lambda: self.change_page(self.indexOf(self.sensorsPanel))
         )
-
         self.sensorsPanel = SensorsWindow(self)
         self.addWidget(self.sensorsPanel)
-
         self.printer.request_object_subscription_signal.connect(
             self.sensorsPanel.handle_available_fil_sensors
         )
@@ -245,11 +238,8 @@ def __init__(
             partial(self.change_page, self.indexOf(self.filesPage_widget))
         )
         self.babystepPage.run_gcode.connect(self.ws.api.run_gcode)
-
         self.run_gcode_signal.connect(self.ws.api.run_gcode)
-
         self.confirmPage_widget.on_delete.connect(self.delete_file)
-
         self.change_page(self.indexOf(self.print_page))  # force set the initial page
 
     @QtCore.pyqtSlot(str, dict, name="on_print_stats_update")
@@ -301,21 +291,22 @@ def on_slidePage_request(
         self.sliderPage.set_slider_maximum(max_value)
         self.change_page(self.indexOf(self.sliderPage))
 
-    def delete_file(self, direcotry: str, name: str):
-        """Handle Delete file button clicked"""
-        self.directory: str = direcotry
-        self.filename: str = name
+    @QtCore.pyqtSlot(str, str, name="delete_file")
+    @QtCore.pyqtSlot(str, name="delete_file")
+    def delete_file(self, filename: str, directory: str = "gcodes") -> None:
+        """Handle Delete file signal, shows confirmation dialog"""
         self.dialogPage.set_message("Are you sure you want to delete this file?")
-        self.dialogPage.button_clicked.connect(self.on_dialog_button_clicked)
-        self.dialogPage.show()
+        self.dialogPage.accepted.connect(
+            lambda: self._on_delete_file_confirmed(filename, directory)
+        )
+        self.dialogPage.open()
 
-    def on_dialog_button_clicked(self, button_name: str) -> None:
-        """Handle dialog button clicks"""
-        if button_name == "Confirm":
-            self.ws.api.delete_file(self.filename, self.directory)
-            self.dialogPage.hide()
-        else:
-            self.dialogPage.hide()
+    def _on_delete_file_confirmed(self, filename: str, directory: str) -> None:
+        """Handle confirmed file deletion after user accepted the dialog"""
+        self.file_data.on_request_delete_file(filename, directory)
+        self.request_back.emit()
+        self.filesPage_widget.reset_dir()
+        self.dialogPage.disconnect()
 
     def paintEvent(self, a0: QtGui.QPaintEvent) -> None:
         """Widget painting"""
@@ -349,6 +340,7 @@ def handle_cancel_print(self) -> None:
         self.ws.api.cancel_print()
         self.on_cancel_print.emit()
         self.loadscreen.show()
+        self.loadscreen.setModal(True)
         self.loadscreen.set_status_message("Cancelling print...\nPlease wait")
 
     def change_page(self, index: int) -> None:

BlocksScreen/lib/panels/widgets/confirmPage.py

@@ -1,44 +1,42 @@
+import os
 import typing
 
+import helper_methods
 from lib.utils.blocks_button import BlocksCustomButton
+from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.blocks_label import BlocksLabel
 from lib.utils.icon_button import IconButton
-from lib.utils.blocks_frame import BlocksCustomFrame
 from PyQt6 import QtCore, QtGui, QtWidgets
 
-import helper_methods
-
-
-import os
-
 
 class ConfirmWidget(QtWidgets.QWidget):
     on_accept: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
         str, list, name="on_accept"
     )
-    on_reject: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(name="on_reject")
-
+    request_back: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
+        name="request-back"
+    )
     on_delete: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
-        str, str, name="on_delete"
+        str, str, name="delete_file"
     )
 
     def __init__(self, parent) -> None:
         super().__init__(parent)
-        self.setupUI()
+        self._setupUI()
         self.setMouseTracking(True)
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, True)
         self.thumbnail: QtGui.QImage = QtGui.QImage()
         self._thumbnails: typing.List = []
-        self.directory = ""
+        self.directory = "gcodes"
         self.filename = ""
         self.confirm_button.clicked.connect(
             lambda: self.on_accept.emit(
                 str(os.path.join(self.directory, self.filename)), self._thumbnails
             )
         )
-        self.back_btn.clicked.connect(self.on_reject.emit)
-        self.reject_button.clicked.connect(
-            lambda: self.on_delete.emit(self.directory, self.filename)
+        self.back_btn.clicked.connect(self.request_back.emit)
+        self.delete_file_button.clicked.connect(
+            lambda: self.on_delete.emit(self.filename, self.directory)
         )
 
     @QtCore.pyqtSlot(str, dict, name="on_show_widget")
@@ -152,7 +150,7 @@ def showEvent(self, a0: QtGui.QShowEvent) -> None:
             self.cf_thumbnail.close()
         return super().showEvent(a0)
 
-    def setupUI(self) -> None:
+    def _setupUI(self) -> None:
         """Setup widget ui"""
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Policy.MinimumExpanding,
@@ -263,18 +261,18 @@ def setupUI(self) -> None:
             self.confirm_button, 0, QtCore.Qt.AlignmentFlag.AlignCenter
         )
 
-        self.reject_button = BlocksCustomButton(parent=self.info_frame)
-        self.reject_button.setMinimumSize(QtCore.QSize(250, 70))
-        self.reject_button.setMaximumSize(QtCore.QSize(250, 70))
-        self.reject_button.setFont(font)
-        self.reject_button.setFlat(True)
-        self.reject_button.setProperty(
+        self.delete_file_button = BlocksCustomButton(parent=self.info_frame)
+        self.delete_file_button.setMinimumSize(QtCore.QSize(250, 70))
+        self.delete_file_button.setMaximumSize(QtCore.QSize(250, 70))
+        self.delete_file_button.setFont(font)
+        self.delete_file_button.setFlat(True)
+        self.delete_file_button.setProperty(
             "icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/garbage-icon.svg")
         )
-        self.reject_button.setText("Delete")
+        self.delete_file_button.setText("Delete")
         # 2. Align buttons to the right
         self.cf_confirm_layout.addWidget(
-            self.reject_button, 0, QtCore.Qt.AlignmentFlag.AlignCenter
+            self.delete_file_button, 0, QtCore.Qt.AlignmentFlag.AlignCenter
         )
 
         self.info_layout.addLayout(self.cf_confirm_layout)