Ticket #9352: MoveTrash.diff

src/kits/tracker/Commands.h

@@ -140 +140 @@
 const uint32 kShowVolumeSpaceBar = 'ShSB';
 const uint32 kSpaceBarColorChanged = 'SBcc';
 
-const uint32 kDontMoveFilesToTrashChanged = 'STdm';
+const uint32 kMoveFilesToTrashChanged = 'STdm';
 const uint32 kAskBeforeDeleteFileChanged = 'STad';
 
 } // namespace BPrivate

src/kits/tracker/ContainerWindow.cpp

@@ -604 +604 @@
         app->StartWatching(this, kWindowsShowFullPathChanged);
         app->StartWatching(this, kSingleWindowBrowseChanged);
         app->StartWatching(this, kShowNavigatorChanged);
-        app->StartWatching(this, kDontMoveFilesToTrashChanged);
+        app->StartWatching(this, kMoveFilesToTrashChanged);
         app->Unlock();
     }
 
@@ -625 +625 @@
         app->StopWatching(this, kWindowsShowFullPathChanged);
         app->StopWatching(this, kSingleWindowBrowseChanged);
         app->StopWatching(this, kShowNavigatorChanged);
-        app->StopWatching(this, kDontMoveFilesToTrashChanged);
+        app->StopWatching(this, kMoveFilesToTrashChanged);
         app->Unlock();
     }
 
@@ -1687 +1687 @@
                             settings.SingleWindowBrowse());
                         break;
 
-                    case kDontMoveFilesToTrashChanged:
+                    case kMoveFilesToTrashChanged:
                         {
                             bool dontMoveToTrash
-                                = settings.DontMoveFilesToTrash();
+                                = settings.MoveFilesToTrash();
 
                             BMenuItem* item
                                 = fFileContextMenu->FindItem(kMoveToTrash);
@@ -1934 +1934 @@
         menu->AddItem(new BMenuItem(B_TRANSLATE("Duplicate"),
             new BMessage(kDuplicateSelection), 'D'));
 
-        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
-            ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
+        menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
+            ? B_TRANSLATE("Move to Trash")  : B_TRANSLATE("Delete"),
             new BMessage(kMoveToTrash), 'T'));
 
         menu->AddSeparatorItem();
@@ -2758 +2758 @@
     }
 
     if (!IsTrash() && !InTrash()) {
-        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
-            ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
+        menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
+            ? B_TRANSLATE("Move to Trash")  : B_TRANSLATE("Delete"),
             new BMessage(kMoveToTrash), 'T'));
 
         // add separator for copy to/move to items (navigation items)

src/kits/tracker/FSUtils.cpp

@@ -2842 +2842 @@
 _DeleteTask(BObjectList<entry_ref>* list, bool confirm)
 {
     if (confirm) {
-        bool dontMoveToTrash = TrackerSettings().DontMoveFilesToTrash();
+        bool MoveToTrash = TrackerSettings().MoveFilesToTrash();
 
-        if (!dontMoveToTrash) {
+        if (MoveToTrash) {
             BAlert* alert = new BAlert("",
                 B_TRANSLATE_NOCOLLECT(kDeleteConfirmationStr),
                 B_TRANSLATE("Cancel"), B_TRANSLATE("Move to Trash"),

src/kits/tracker/FilePanelPriv.cpp

@@ -885 +885 @@
         new BMessage(kGetInfo), 'I'));
     menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
         new BMessage(kEditItem), 'E'));
-    menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
-        ? B_TRANSLATE("Delete")
-        : B_TRANSLATE("Move to Trash"),
+    menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
+        ? B_TRANSLATE("Move to Trash")
+        : B_TRANSLATE("Delete"),
         new BMessage(kMoveToTrash), 'T'));
     menu->AddSeparatorItem();
     menu->AddItem(new BMenuItem(B_TRANSLATE("Cut"),

src/kits/tracker/PoseView.cpp

@@ -2323 +2323 @@
         {
             TrackerSettings settings;
 
-            if ((modifiers() & B_SHIFT_KEY) != 0 || settings.DontMoveFilesToTrash())
+            if ((modifiers() & B_SHIFT_KEY) != 0 || !settings.MoveFilesToTrash())
                 DeleteSelection(true, settings.AskBeforeDeleteFile());
             else
                 MoveSelectionToTrash();
@@ -6461 +6461 @@
             } else {
                 TrackerSettings settings;
 
-                if ((modifiers() & B_SHIFT_KEY) != 0 || settings.DontMoveFilesToTrash())
+                if ((modifiers() & B_SHIFT_KEY) != 0 || !settings.MoveFilesToTrash())
                     DeleteSelection(true, settings.AskBeforeDeleteFile());
                 else
                     MoveSelectionToTrash();

src/kits/tracker/PoseViewScripting.cpp

@@ -491 +491 @@
 
         if (error == B_OK) {
             TrackerSettings settings;
-            if (!settings.DontMoveFilesToTrash()) {
+            if (settings.MoveFilesToTrash()) {
                 // move the list we build into trash, don't make the
                 // trashing task select the next item
                 MoveListToTrash(entryList, false, false);

src/kits/tracker/SettingsViews.cpp

@@ -956 +956 @@
     :
     SettingsView("TrashSettingsView")
 {
-    fDontMoveFilesToTrashCheckBox = new BCheckBox("",
-        B_TRANSLATE("Don't move files to Trash"),
-            new BMessage(kDontMoveFilesToTrashChanged));
+    fMoveFilesToTrashCheckBox = new BCheckBox("",
+        B_TRANSLATE("Move deleted files to Trash"),
+            new BMessage(kMoveFilesToTrashChanged));
 
     fAskBeforeDeleteFileCheckBox = new BCheckBox("",
         B_TRANSLATE("Ask before delete"),
@@ -970 +970 @@
     layout->SetOrientation(B_VERTICAL);
     layout->SetSpacing(0);
     BGroupLayoutBuilder(layout)
-        .Add(fDontMoveFilesToTrashCheckBox)
+        .Add(fMoveFilesToTrashCheckBox)
         .Add(fAskBeforeDeleteFileCheckBox)
         .AddGlue()
         .SetInsets(spacing, spacing, spacing, spacing);
@@ -981 +981 @@
 void
 TrashSettingsView::AttachedToWindow()
 {
-    fDontMoveFilesToTrashCheckBox->SetTarget(this);
+    fMoveFilesToTrashCheckBox->SetTarget(this);
     fAskBeforeDeleteFileCheckBox->SetTarget(this);
 }
 
@@ -995 +995 @@
     TrackerSettings settings;
 
     switch (message->what) {
-        case kDontMoveFilesToTrashChanged:
-            settings.SetDontMoveFilesToTrash(
-                fDontMoveFilesToTrashCheckBox->Value() == 1);
+        case kMoveFilesToTrashChanged:
+            settings.SetMoveFilesToTrash(
+                fMoveFilesToTrashCheckBox->Value() == 1);
 
-            tracker->SendNotices(kDontMoveFilesToTrashChanged);
+            tracker->SendNotices(kMoveFilesToTrashChanged);
             Window()->PostMessage(kSettingsContentsModified);
             break;
 
@@ -1023 +1023 @@
 {
     TrackerSettings settings;
 
-    settings.SetDontMoveFilesToTrash(false);
+    settings.SetMoveFilesToTrash(true);
     settings.SetAskBeforeDeleteFile(true);
 
     ShowCurrentSettings();
@@ -1036 +1036 @@
 {
     TrackerSettings settings;
 
-    return settings.DontMoveFilesToTrash() != false
+    return settings.MoveFilesToTrash() != true
         || settings.AskBeforeDeleteFile() != true;
 }
 
@@ -1046 +1046 @@
 {
     TrackerSettings settings;
 
-    settings.SetDontMoveFilesToTrash(fDontMoveFilesToTrash);
+    settings.SetMoveFilesToTrash(fMoveFilesToTrash);
     settings.SetAskBeforeDeleteFile(fAskBeforeDeleteFile);
 
     ShowCurrentSettings();
@@ -1061 +1061 @@
     if (!tracker)
         return;
 
-    tracker->SendNotices(kDontMoveFilesToTrashChanged);
+    tracker->SendNotices(kMoveFilesToTrashChanged);
     tracker->SendNotices(kAskBeforeDeleteFileChanged);
 }
 
@@ -1071 +1071 @@
 {
     TrackerSettings settings;
 
-    fDontMoveFilesToTrashCheckBox->SetValue(settings.DontMoveFilesToTrash());
+    fMoveFilesToTrashCheckBox->SetValue(settings.MoveFilesToTrash());
     fAskBeforeDeleteFileCheckBox->SetValue(settings.AskBeforeDeleteFile());
 }
 
@@ -1081 +1081 @@
 {
     TrackerSettings settings;
 
-    fDontMoveFilesToTrash = settings.DontMoveFilesToTrash();
+    fMoveFilesToTrash = settings.MoveFilesToTrash();
     fAskBeforeDeleteFile = settings.AskBeforeDeleteFile();
 }
 
@@ -1089 +1089 @@
 bool
 TrashSettingsView::IsRevertable() const
 {
-    return fDontMoveFilesToTrash
-            != (fDontMoveFilesToTrashCheckBox->Value() > 0)
+    return fMoveFilesToTrash
+            != (fMoveFilesToTrashCheckBox->Value() > 0)
         || fAskBeforeDeleteFile
             != (fAskBeforeDeleteFileCheckBox->Value() > 0);
 }

src/kits/tracker/SettingsViews.h

@@ -181 +181 @@
     private:
         void _SendNotices();
 
-        BCheckBox* fDontMoveFilesToTrashCheckBox;
+        BCheckBox* fMoveFilesToTrashCheckBox;
         BCheckBox* fAskBeforeDeleteFileCheckBox;
 
-        bool fDontMoveFilesToTrash;
+        bool fMoveFilesToTrash;
         bool fAskBeforeDeleteFile;
 
         typedef SettingsView _inherited;

src/kits/tracker/TrackerSettings.cpp

@@ -82 +82 @@
         HexScalarValueSetting* fFreeSpaceColor;
         HexScalarValueSetting* fWarningSpaceColor;
 
-        BooleanValueSetting* fDontMoveFilesToTrash;
+        BooleanValueSetting* fMoveFilesToTrash;
         BooleanValueSetting* fAskBeforeDeleteFile;
 
         Benaphore fInitLock;
@@ -202 +202 @@
     Add(fWarningSpaceColor
         = new HexScalarValueSetting("WarningSpaceColor", 0xc0cb0000, "", ""));
 
-    Add(fDontMoveFilesToTrash
-        = new BooleanValueSetting("DontMoveFilesToTrash", false));
+    Add(fMoveFilesToTrash
+        = new BooleanValueSetting("MoveFilesToTrash", true));
     Add(fAskBeforeDeleteFile
         = new BooleanValueSetting("AskBeforeDeleteFile", true));
 
@@ -509 +509 @@
 
 
 bool
-TrackerSettings::DontMoveFilesToTrash()
+TrackerSettings::MoveFilesToTrash()
 {
-    return gTrackerState.fDontMoveFilesToTrash->Value();
+    return gTrackerState.fMoveFilesToTrash->Value();
 }
 
 
 void
-TrackerSettings::SetDontMoveFilesToTrash(bool enabled)
+TrackerSettings::SetMoveFilesToTrash(bool enabled)
 {
-    gTrackerState.fDontMoveFilesToTrash->SetValue(enabled);
+    gTrackerState.fMoveFilesToTrash->SetValue(enabled);
 }
 
 

src/kits/tracker/TrackerSettings.h

@@ -118 +118 @@
         bool ClockIs24Hr();
         void SetClockTo24Hr(bool);
 
-        bool DontMoveFilesToTrash();
-        void SetDontMoveFilesToTrash(bool);
+        bool MoveFilesToTrash();
+        void SetMoveFilesToTrash(bool);
         bool AskBeforeDeleteFile();
         void SetAskBeforeDeleteFile(bool);