Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Tracker option "Don't move files to Trash" (#9352)

Browse Source 
Renamed that option as it is the only negatively phrased to
"Move deleted files to Trash first" and also the option below
that to "Ask before deleting for good".
Also renamed every function name etc. in that regard and also
settings string of the Tracker settings file.
This commit is contained in:
Humdinger 2013-01-06 20:04:07 +01:00
parent c0bc9998d1
commit 45f77dcd70
10 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kits/tracker/Commands.h
View File

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

16
src/kits/tracker/ContainerWindow.cpp
View File

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

4
src/kits/tracker/FSUtils.cpp
View File

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

6
src/kits/tracker/FilePanelPriv.cpp
View File

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

4
src/kits/tracker/PoseView.cpp
View File

@ -2323,7 +2323,7 @@ BPoseView::MessageReceived(BMessage* message)
{ {
TrackerSettings settings; TrackerSettings settings;
if ((modifiers() & B_SHIFT_KEY) != 0 || settings.DontMoveFilesToTrash()) if ((modifiers() & B_SHIFT_KEY) != 0 || !settings.MoveFilesToTrash())
DeleteSelection(true, settings.AskBeforeDeleteFile()); DeleteSelection(true, settings.AskBeforeDeleteFile());
else else
MoveSelectionToTrash(); MoveSelectionToTrash();
@ -6461,7 +6461,7 @@ BPoseView::KeyDown(const char* bytes, int32 count)
} else { } else {
TrackerSettings settings; TrackerSettings settings;
if ((modifiers() & B_SHIFT_KEY) != 0 || settings.DontMoveFilesToTrash()) if ((modifiers() & B_SHIFT_KEY) != 0 || !settings.MoveFilesToTrash())
DeleteSelection(true, settings.AskBeforeDeleteFile()); DeleteSelection(true, settings.AskBeforeDeleteFile());
else else
MoveSelectionToTrash(); MoveSelectionToTrash();

2
src/kits/tracker/PoseViewScripting.cpp
View File

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

36
src/kits/tracker/SettingsViews.cpp
View File

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

4
src/kits/tracker/SettingsViews.h
View File

@ -181,10 +181,10 @@ class TrashSettingsView : public SettingsView {
private: private:
void _SendNotices(); void _SendNotices();
BCheckBox* fDontMoveFilesToTrashCheckBox; BCheckBox* fMoveFilesToTrashCheckBox;
BCheckBox* fAskBeforeDeleteFileCheckBox; BCheckBox* fAskBeforeDeleteFileCheckBox;
bool fDontMoveFilesToTrash; bool fMoveFilesToTrash;
bool fAskBeforeDeleteFile; bool fAskBeforeDeleteFile;
typedef SettingsView _inherited; typedef SettingsView _inherited;

14
src/kits/tracker/TrackerSettings.cpp
View File

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

4
src/kits/tracker/TrackerSettings.h
View File

@ -118,8 +118,8 @@ class TrackerSettings {
bool ClockIs24Hr(); bool ClockIs24Hr();
void SetClockTo24Hr(bool); void SetClockTo24Hr(bool);
bool DontMoveFilesToTrash(); bool MoveFilesToTrash();
void SetDontMoveFilesToTrash(bool); void SetMoveFilesToTrash(bool);
bool AskBeforeDeleteFile(); bool AskBeforeDeleteFile();
void SetAskBeforeDeleteFile(bool); void SetAskBeforeDeleteFile(bool);