Ticket #1817: tracker-delete-options.patch

src/kits/tracker/Commands.h

@@ -140 +140 @@
 const uint32 kSpaceBarColorChanged = 'SBcc';
 
 const uint32 kDontMoveFilesToTrashChanged = 'STdm';
+const uint32 kAskBeforeTrashFileChanged = 'STat';
 const uint32 kAskBeforeDeleteFileChanged = 'STad';
 
 } // namespace BPrivate

src/kits/tracker/FSUtils.cpp

@@ -141 +141 @@
     B_TRANSLATE_MARK("Are you sure you want to delete the "
     "selected item(s)? This operation cannot be reverted.");
 
+static const char* kTrashConfirmationStr =
+    B_TRANSLATE_MARK("Are you sure you want to move the "
+    "selected item(s) to the trash?");
+
 static const char* kReplaceStr =
     B_TRANSLATE_MARK("You are trying to replace the item:\n"
     "\t%name%dest\n"
@@ -573 +577 @@
 
 
 void
-FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList, bool async)
+FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList, bool async,
+    bool confirm)
 {
     if (srcList->IsEmpty()) {
         delete srcList;
         delete pointList;
         return;
     }
+    
+    if (confirm && TrackerSettings().AskBeforeTrashFile()) {
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE_NOCOLLECT(kTrashConfirmationStr),
+            B_TRANSLATE("Cancel"), B_TRANSLATE("Move to Trash"), NULL,
+            B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
+        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetShortcut(1, 'm');
+        
+        if (!alert->Go())
+            return;
+    }
 
     if (async)
         LaunchInNewThread("MoveTask", B_NORMAL_PRIORITY, MoveTask, srcList,
@@ -2738 +2755 @@
 void
 FSEmptyTrash()
 {
+    if (TrackerSettings().AskBeforeDeleteFile()) {
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE_NOCOLLECT(kDeleteConfirmationStr),
+            B_TRANSLATE("Cancel"), B_TRANSLATE("Delete"), NULL,
+            B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
+
+        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetShortcut(1, 'd');
+        
+        if (!alert->Go())
+            return;
+    }
+    
     if (find_thread("_tracker_empty_trash_") != B_OK) {
         resume_thread(spawn_thread(empty_trash, "_tracker_empty_trash_",
             B_NORMAL_PRIORITY, NULL));
@@ -2835 +2865 @@
                     delete list;
                     return B_OK;
                 case 1:
-                    FSMoveToTrash(list, NULL, false);
+                    FSMoveToTrash(list, NULL, false, false);
                     return B_OK;
             }
         } else {

src/kits/tracker/FSUtils.h

@@ -174 +174 @@
 _IMPEXP_TRACKER bool FSIsHomeDir(const BEntry *);
 _IMPEXP_TRACKER bool FSIsRootDir(const BEntry *);
 _IMPEXP_TRACKER void FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList = NULL,
-    bool async = true);
+    bool async = true, bool confirm = true);
     // Deprecated
 
 void FSDeleteRefList(BObjectList<entry_ref> *, bool, bool confirm = true);

src/kits/tracker/FunctionObject.h

@@ -514 +514 @@
 }
 
 
+template<class Param1, class Param2, class Param3, class Param4>
+FourParamFunctionObject<Param1, Param2, Param3, Param4> *
+NewFunctionObject(void (*function)(Param1, Param2, Param3, Param4),
+    Param1 p1, Param2 p2, Param3 p3, Param4 p4)
+{
+    return new FourParamFunctionObject<Param1, Param2, Param3, Param4>(function, p1, p2, p3, p4);
+}
+
+
 template<class T>
 PlainMemberFunctionObject<T> *
 NewMemberFunctionObject(void (T::*function)(), T *onThis)

src/kits/tracker/PoseView.cpp

@@ -5605 +5605 @@
         taskList->AddItem(NewFunctionObject(FSDeleteRefList, list, false, true));
     else
         taskList->AddItem(NewFunctionObject(FSMoveToTrash, list,
-            (BList *)NULL, false));
+            (BList *)NULL, false, true));
 
     if (selectNext && ViewMode() == kListMode) {
         // next, if in list view mode try selecting the next item after

src/kits/tracker/SettingsViews.cpp

@@ -942 +942 @@
         B_TRANSLATE("Don't move files to Trash"),
             new BMessage(kDontMoveFilesToTrashChanged));
 
+    fAskBeforeTrashFileCheckBox = new BCheckBox("",
+        B_TRANSLATE("Ask before moving files into trash"),
+            new BMessage(kAskBeforeTrashFileChanged));
+    
     fAskBeforeDeleteFileCheckBox = new BCheckBox("",
-        B_TRANSLATE("Ask before delete"),
+        B_TRANSLATE("Ask before deleting files permanently"),
             new BMessage(kAskBeforeDeleteFileChanged));
 
     const float spacing = be_control_look->DefaultItemSpacing();
@@ -953 +957 @@
     layout->SetSpacing(0);
     BGroupLayoutBuilder(layout)
         .Add(fDontMoveFilesToTrashCheckBox)
+        .Add(fAskBeforeTrashFileCheckBox)
         .Add(fAskBeforeDeleteFileCheckBox)
         .AddGlue()
         .SetInsets(spacing, spacing, spacing, spacing);
@@ -964 +969 @@
 TrashSettingsView::AttachedToWindow()
 {
     fDontMoveFilesToTrashCheckBox->SetTarget(this);
+    fAskBeforeTrashFileCheckBox->SetTarget(this);
     fAskBeforeDeleteFileCheckBox->SetTarget(this);
 }
 
@@ -984 +990 @@
             Window()->PostMessage(kSettingsContentsModified);
             break;
 
+        case kAskBeforeTrashFileChanged:
+            settings.SetAskBeforeTrashFile(fAskBeforeTrashFileCheckBox->Value() == 1);
+
+            tracker->SendNotices(kAskBeforeTrashFileChanged);
+            Window()->PostMessage(kSettingsContentsModified);
+            break;
+
         case kAskBeforeDeleteFileChanged:
             settings.SetAskBeforeDeleteFile(fAskBeforeDeleteFileCheckBox->Value() == 1);
 
@@ -1017 +1030 @@
     TrackerSettings settings;
 
     return settings.DontMoveFilesToTrash() != false
+        || settings.AskBeforeTrashFile() != true
         || settings.AskBeforeDeleteFile() != true;
 }
 
@@ -1027 +1041 @@
     TrackerSettings settings;
 
     settings.SetDontMoveFilesToTrash(fDontMoveFilesToTrash);
+    settings.SetAskBeforeTrashFile(fAskBeforeTrashFile);
     settings.SetAskBeforeDeleteFile(fAskBeforeDeleteFile);
 
     ShowCurrentSettings();
@@ -1042 +1057 @@
         return;
 
     tracker->SendNotices(kDontMoveFilesToTrashChanged);
+    tracker->SendNotices(kAskBeforeTrashFileChanged);
     tracker->SendNotices(kAskBeforeDeleteFileChanged);
 }
 
@@ -1052 +1068 @@
     TrackerSettings settings;
 
     fDontMoveFilesToTrashCheckBox->SetValue(settings.DontMoveFilesToTrash());
+    fAskBeforeTrashFileCheckBox->SetValue(settings.AskBeforeTrashFile());
     fAskBeforeDeleteFileCheckBox->SetValue(settings.AskBeforeDeleteFile());
 }
 
@@ -1062 +1079 @@
     TrackerSettings settings;
 
     fDontMoveFilesToTrash = settings.DontMoveFilesToTrash();
+    fAskBeforeTrashFile = settings.AskBeforeTrashFile();
     fAskBeforeDeleteFile = settings.AskBeforeDeleteFile();
 }
 
@@ -1070 +1088 @@
 TrashSettingsView::IsRevertable() const
 {
     return fDontMoveFilesToTrash != (fDontMoveFilesToTrashCheckBox->Value() > 0)
+        || fAskBeforeTrashFile != (fAskBeforeTrashFileCheckBox->Value() > 0)
         || fAskBeforeDeleteFile != (fAskBeforeDeleteFileCheckBox->Value() > 0);
 }
 

src/kits/tracker/SettingsViews.h

@@ -180 +180 @@
         void _SendNotices();
 
         BCheckBox *fDontMoveFilesToTrashCheckBox;
+        BCheckBox *fAskBeforeTrashFileCheckBox;
         BCheckBox *fAskBeforeDeleteFileCheckBox;
 
         bool fDontMoveFilesToTrash;
+        bool fAskBeforeTrashFile;
         bool fAskBeforeDeleteFile;
 
         typedef SettingsView _inherited;

src/kits/tracker/TrackerSettings.cpp

@@ -82 +82 @@
         HexScalarValueSetting *fWarningSpaceColor;
 
         BooleanValueSetting *fDontMoveFilesToTrash;
+        BooleanValueSetting *fAskBeforeTrashFile;
         BooleanValueSetting *fAskBeforeDeleteFile;
 
         Benaphore fInitLock;
@@ -186 +187 @@
     Add(fWarningSpaceColor = new HexScalarValueSetting("WarningSpaceColor", 0xc0cb0000, "", ""));
 
     Add(fDontMoveFilesToTrash = new BooleanValueSetting("DontMoveFilesToTrash", false));
+    Add(fAskBeforeTrashFile = new BooleanValueSetting("AskBeforeTrashFile", true));
     Add(fAskBeforeDeleteFile = new BooleanValueSetting("AskBeforeDeleteFile", true));
 
     TryReadingSettings();
@@ -514 +516 @@
     gTrackerState.fAskBeforeDeleteFile->SetValue(enabled);
 }
 
+
+bool
+TrackerSettings::AskBeforeTrashFile()
+{
+    return gTrackerState.fAskBeforeTrashFile->Value();
+}
+
+
+void
+TrackerSettings::SetAskBeforeTrashFile(bool enabled)
+{
+    gTrackerState.fAskBeforeTrashFile->SetValue(enabled);
+}
+

src/kits/tracker/TrackerSettings.h

@@ -121 +121 @@
 
         bool DontMoveFilesToTrash();
         void SetDontMoveFilesToTrash(bool);
+        bool AskBeforeTrashFile();
+        void SetAskBeforeTrashFile(bool);
         bool AskBeforeDeleteFile();
         void SetAskBeforeDeleteFile(bool);