@@ -866,7 +866,10 @@ def delete_files_callback(self, origin_path: str | Path):
866
866
pending .append (filepath )
867
867
868
868
if pending :
869
- if self .delete_file_confirmation (len (pending ), pending [0 ]) == 3 :
869
+ return_code = self .delete_file_confirmation (len (pending ), pending [0 ])
870
+ logging .info (return_code )
871
+ # If there was a confirmation and not a cancellation
872
+ if return_code == 2 and return_code != 3 :
870
873
for i , f in enumerate (pending ):
871
874
if (origin_path == f ) or (not origin_path ):
872
875
self .preview_panel .stop_file_use ()
@@ -887,18 +890,14 @@ def delete_files_callback(self, origin_path: str | Path):
887
890
self .preview_panel .update_widgets ()
888
891
889
892
if len (self .selected ) <= 1 and deleted_count == 0 :
890
- self .main_window .statusbar .showMessage (
891
- "No files deleted. Check if any of the files are currently in use."
892
- )
893
+ self .main_window .statusbar .showMessage ("No files deleted." )
893
894
elif len (self .selected ) <= 1 and deleted_count == 1 :
894
895
self .main_window .statusbar .showMessage (f"Deleted { deleted_count } file!" )
895
896
elif len (self .selected ) > 1 and deleted_count == 0 :
896
- self .main_window .statusbar .showMessage (
897
- "No files deleted! Check if any of the files are currently in use."
898
- )
897
+ self .main_window .statusbar .showMessage ("No files deleted." )
899
898
elif len (self .selected ) > 1 and deleted_count < len (self .selected ):
900
899
self .main_window .statusbar .showMessage (
901
- f"Only deleted { deleted_count } file{ '' if deleted_count == 1 else 's' } ! Check if any of the files are currently in use"
900
+ f"Only deleted { deleted_count } file{ '' if deleted_count == 1 else 's' } ! Check if any of the files are currently missing or in use. "
902
901
)
903
902
elif len (self .selected ) > 1 and deleted_count == len (self .selected ):
904
903
self .main_window .statusbar .showMessage (f"Deleted { deleted_count } files!" )
@@ -941,8 +940,10 @@ def delete_file_confirmation(self, count: int, filename: Path | None = None) ->
941
940
"<h4>This will remove them from TagStudio <i>AND</i> your file system!</h4>"
942
941
f"{ perm_warning } <br>"
943
942
)
943
+
944
+ yes_button : QPushButton = msg .addButton ("&Yes" , QMessageBox .ButtonRole .YesRole )
944
945
msg .addButton ("&No" , QMessageBox .ButtonRole .NoRole )
945
- msg .addButton ( "&Yes" , QMessageBox . ButtonRole . YesRole )
946
+ msg .setDefaultButton ( yes_button )
946
947
947
948
return msg .exec ()
948
949
0 commit comments