permanent deletion

fmd/clipboard.py

@@ -31,13 +31,14 @@ def copy(self, files):
     def cut(self, files):
         self._set_data(True, files)
 
-    def _paste_callback(self, clipboard, selection, target_dir):
+    def _paste_callback(self, clipboard, selection, callback):
         is_cut, files = eval(selection.data)
-        print files
         if is_cut:
             clipboard.clear()
 
-    def paste(self, target_dir):
+        callback(is_cut, files)
+
+    def paste(self, callback):
         if not self.is_empty():
             cb = self.get_clipboard()
-            cb.request_contents('fmd/files', self._paste_callback, target_dir)
+            cb.request_contents('fmd/files', self._paste_callback, callback)

fmd/filelist.py

@@ -333,9 +333,31 @@ def delete(self):
             self.feedback.show(str(e), 'error')
         else:
             if len(files) == 1:
-                self.feedback.show('File was deleted', 'done')
+                msg = 'File deletion was requested'
             else:
-                self.feedback.show('Files were deleted', 'done')
+                msg = 'Deletion of selected files was requested'
+
+            self.feedback.show(msg, 'info')
 
     def force_delete(self):
-        self.feedback.show('You are going to delete files', 'error')
+        import time
+        df = getattr(self, 'force_delete_feedback', None)
+        if df and df.is_active() and time.time() - df.start < 1:
+            df.cancel()
+            files = self.get_filelist_from_selection()
+            try:
+                for f in files:
+                    f.delete()
+            except gio.Error, e:
+                self.feedback.show(str(e), 'error')
+            else:
+                if len(files) == 1:
+                    msg = 'File deletion was requested'
+                else:
+                    msg = 'Deletion of selected files was requested'
+
+                self.feedback.show(msg, 'info')
+        else:
+            if df: df.cancel()
+            self.force_delete_feedback = self.feedback.show(
+                'Files will be deleted permanently', 'warn', 3000)