[haiku-commits] haiku: hrev45265 - src/kits/tracker
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 10 Feb 2013 11:39:21 +0100 (CET)
hrev45265 adds 2 changesets to branch 'master'
old head: 64a1f5a020afbbb203b72bfb07e1b08d38431bfe
new head: 1baa2211739cd5b4d45a56868aedd57dedbe782c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1baa221+%5E64a1f5a
----------------------------------------------------------------------------
163a394: Revert "Renamed Tracker option "Don't move files to Trash" (#9352)"
This reverts commit 45f77dcd7029914ccd99178dfb333eb68c7af9e5.
1baa221: Removed Trash options from Tracker prefs.
As discussed [1][2], using a Trash is in the interest of the
vast majority of users. The setting is still present in the
Tracker settings file. SHIFT+DELETE will still bypass the
Trash.
[1]
//www.freelists.org/post/haiku-commits/haiku-hrev45134-srckitstracker,4
[2] //www.freelists.org/post/haiku/Removing-Trackers-Trash-options
Please enter the commit message for your changes. Lines starting
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
11 files changed, 26 insertions(+), 203 deletions(-)
src/kits/tracker/Commands.h | 2 +-
src/kits/tracker/ContainerWindow.cpp | 16 +--
src/kits/tracker/FSUtils.cpp | 4 +-
src/kits/tracker/FilePanelPriv.cpp | 6 +-
src/kits/tracker/PoseView.cpp | 4 +-
src/kits/tracker/PoseViewScripting.cpp | 2 +-
src/kits/tracker/SettingsViews.cpp | 148 -------------------------
src/kits/tracker/SettingsViews.h | 27 -----
src/kits/tracker/TrackerSettings.cpp | 14 +--
src/kits/tracker/TrackerSettings.h | 4 +-
src/kits/tracker/TrackerSettingsWindow.cpp | 2 -
############################################################################
Commit: 163a39483387c5db4156dfcf36e4b48156df30a6
URL: http://cgit.haiku-os.org/haiku/commit/?id=163a394
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Sun Feb 10 06:28:38 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/9352
Revert "Renamed Tracker option "Don't move files to Trash" (#9352)"
This reverts commit 45f77dcd7029914ccd99178dfb333eb68c7af9e5.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Commands.h b/src/kits/tracker/Commands.h
index a98d614..869270b 100644
--- a/src/kits/tracker/Commands.h
+++ b/src/kits/tracker/Commands.h
@@ -140,7 +140,7 @@ const uint32 kUpdateVolumeSpaceBar = 'UpSB';
const uint32 kShowVolumeSpaceBar = 'ShSB';
const uint32 kSpaceBarColorChanged = 'SBcc';
-const uint32 kMoveFilesToTrashChanged = 'STdm';
+const uint32 kDontMoveFilesToTrashChanged = 'STdm';
const uint32 kAskBeforeDeleteFileChanged = 'STad';
} // namespace BPrivate
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index bf3a7e5..35f12a9 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -604,7 +604,7 @@ BContainerWindow::BContainerWindow(LockingList<BWindow>*
list,
app->StartWatching(this, kWindowsShowFullPathChanged);
app->StartWatching(this, kSingleWindowBrowseChanged);
app->StartWatching(this, kShowNavigatorChanged);
- app->StartWatching(this, kMoveFilesToTrashChanged);
+ app->StartWatching(this, kDontMoveFilesToTrashChanged);
app->Unlock();
}
@@ -625,7 +625,7 @@ BContainerWindow::~BContainerWindow()
app->StopWatching(this, kWindowsShowFullPathChanged);
app->StopWatching(this, kSingleWindowBrowseChanged);
app->StopWatching(this, kShowNavigatorChanged);
- app->StopWatching(this, kMoveFilesToTrashChanged);
+ app->StopWatching(this, kDontMoveFilesToTrashChanged);
app->Unlock();
}
@@ -1687,10 +1687,10 @@ BContainerWindow::MessageReceived(BMessage* message)
settings.SingleWindowBrowse());
break;
- case kMoveFilesToTrashChanged:
+ case kDontMoveFilesToTrashChanged:
{
bool dontMoveToTrash
- =
settings.MoveFilesToTrash();
+ =
settings.DontMoveFilesToTrash();
BMenuItem* item
=
fFileContextMenu->FindItem(kMoveToTrash);
@@ -1934,8 +1934,8 @@ BContainerWindow::AddFileMenu(BMenu* menu)
menu->AddItem(new BMenuItem(B_TRANSLATE("Duplicate"),
new BMessage(kDuplicateSelection), 'D'));
- menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
- ? B_TRANSLATE("Move to Trash") : B_TRANSLATE("Delete"),
+ menu->AddItem(new
BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+ ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
new BMessage(kMoveToTrash), 'T'));
menu->AddSeparatorItem();
@@ -2758,8 +2758,8 @@ BContainerWindow::AddFileContextMenus(BMenu* menu)
}
if (!IsTrash() && !InTrash()) {
- menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
- ? B_TRANSLATE("Move to Trash") : B_TRANSLATE("Delete"),
+ menu->AddItem(new
BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+ ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
new BMessage(kMoveToTrash), 'T'));
// add separator for copy to/move to items (navigation items)
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index f001b29..8a75bbc 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -2842,9 +2842,9 @@ status_t
_DeleteTask(BObjectList<entry_ref>* list, bool confirm)
{
if (confirm) {
- bool MoveToTrash = TrackerSettings().MoveFilesToTrash();
+ bool dontMoveToTrash = TrackerSettings().DontMoveFilesToTrash();
- if (MoveToTrash) {
+ if (!dontMoveToTrash) {
BAlert* alert = new BAlert("",
B_TRANSLATE_NOCOLLECT(kDeleteConfirmationStr),
B_TRANSLATE("Cancel"), B_TRANSLATE("Move to
Trash"),
diff --git a/src/kits/tracker/FilePanelPriv.cpp
b/src/kits/tracker/FilePanelPriv.cpp
index 64cb132..70d8cc3 100644
--- a/src/kits/tracker/FilePanelPriv.cpp
+++ b/src/kits/tracker/FilePanelPriv.cpp
@@ -885,9 +885,9 @@ TFilePanel::AddFileContextMenus(BMenu* menu)
new BMessage(kGetInfo), 'I'));
menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
new BMessage(kEditItem), 'E'));
- menu->AddItem(new BMenuItem(TrackerSettings().MoveFilesToTrash()
- ? B_TRANSLATE("Move to Trash")
- : B_TRANSLATE("Delete"),
+ menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+ ? B_TRANSLATE("Delete")
+ : B_TRANSLATE("Move to Trash"),
new BMessage(kMoveToTrash), 'T'));
menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(B_TRANSLATE("Cut"),
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 87ea8b3..cda2c0e 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -2323,7 +2323,7 @@ BPoseView::MessageReceived(BMessage* message)
{
TrackerSettings settings;
- if ((modifiers() & B_SHIFT_KEY) != 0 ||
!settings.MoveFilesToTrash())
+ if ((modifiers() & B_SHIFT_KEY) != 0 ||
settings.DontMoveFilesToTrash())
DeleteSelection(true,
settings.AskBeforeDeleteFile());
else
MoveSelectionToTrash();
@@ -6461,7 +6461,7 @@ BPoseView::KeyDown(const char* bytes, int32 count)
} else {
TrackerSettings settings;
- if ((modifiers() & B_SHIFT_KEY) != 0 ||
!settings.MoveFilesToTrash())
+ if ((modifiers() & B_SHIFT_KEY) != 0 ||
settings.DontMoveFilesToTrash())
DeleteSelection(true,
settings.AskBeforeDeleteFile());
else
MoveSelectionToTrash();
diff --git a/src/kits/tracker/PoseViewScripting.cpp
b/src/kits/tracker/PoseViewScripting.cpp
index 94089a3..cb9d299 100644
--- a/src/kits/tracker/PoseViewScripting.cpp
+++ b/src/kits/tracker/PoseViewScripting.cpp
@@ -491,7 +491,7 @@ BPoseView::DeleteProperty(BMessage*
_SCRIPTING_ONLY(specifier),
if (error == B_OK) {
TrackerSettings settings;
- if (settings.MoveFilesToTrash()) {
+ if (!settings.DontMoveFilesToTrash()) {
// move the list we build into trash, don't
make the
// trashing task select the next item
MoveListToTrash(entryList, false, false);
diff --git a/src/kits/tracker/SettingsViews.cpp
b/src/kits/tracker/SettingsViews.cpp
index d44d767..5436978 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -956,12 +956,12 @@ TrashSettingsView::TrashSettingsView()
:
SettingsView("TrashSettingsView")
{
- fMoveFilesToTrashCheckBox = new BCheckBox("",
- B_TRANSLATE("Move deleted files to Trash first"),
- new BMessage(kMoveFilesToTrashChanged));
+ fDontMoveFilesToTrashCheckBox = new BCheckBox("",
+ B_TRANSLATE("Don't move files to Trash"),
+ new BMessage(kDontMoveFilesToTrashChanged));
fAskBeforeDeleteFileCheckBox = new BCheckBox("",
- B_TRANSLATE("Ask before deleting for good"),
+ B_TRANSLATE("Ask before delete"),
new BMessage(kAskBeforeDeleteFileChanged));
const float spacing = be_control_look->DefaultItemSpacing();
@@ -970,7 +970,7 @@ TrashSettingsView::TrashSettingsView()
layout->SetOrientation(B_VERTICAL);
layout->SetSpacing(0);
BGroupLayoutBuilder(layout)
- .Add(fMoveFilesToTrashCheckBox)
+ .Add(fDontMoveFilesToTrashCheckBox)
.Add(fAskBeforeDeleteFileCheckBox)
.AddGlue()
.SetInsets(spacing, spacing, spacing, spacing);
@@ -981,7 +981,7 @@ TrashSettingsView::TrashSettingsView()
void
TrashSettingsView::AttachedToWindow()
{
- fMoveFilesToTrashCheckBox->SetTarget(this);
+ fDontMoveFilesToTrashCheckBox->SetTarget(this);
fAskBeforeDeleteFileCheckBox->SetTarget(this);
}
@@ -995,11 +995,11 @@ TrashSettingsView::MessageReceived(BMessage* message)
TrackerSettings settings;
switch (message->what) {
- case kMoveFilesToTrashChanged:
- settings.SetMoveFilesToTrash(
- fMoveFilesToTrashCheckBox->Value() == 1);
+ case kDontMoveFilesToTrashChanged:
+ settings.SetDontMoveFilesToTrash(
+ fDontMoveFilesToTrashCheckBox->Value() == 1);
- tracker->SendNotices(kMoveFilesToTrashChanged);
+ tracker->SendNotices(kDontMoveFilesToTrashChanged);
Window()->PostMessage(kSettingsContentsModified);
break;
@@ -1023,7 +1023,7 @@ TrashSettingsView::SetDefaults()
{
TrackerSettings settings;
- settings.SetMoveFilesToTrash(true);
+ settings.SetDontMoveFilesToTrash(false);
settings.SetAskBeforeDeleteFile(true);
ShowCurrentSettings();
@@ -1036,7 +1036,7 @@ TrashSettingsView::IsDefaultable() const
{
TrackerSettings settings;
- return settings.MoveFilesToTrash() != true
+ return settings.DontMoveFilesToTrash() != false
|| settings.AskBeforeDeleteFile() != true;
}
@@ -1046,7 +1046,7 @@ TrashSettingsView::Revert()
{
TrackerSettings settings;
- settings.SetMoveFilesToTrash(fMoveFilesToTrash);
+ settings.SetDontMoveFilesToTrash(fDontMoveFilesToTrash);
settings.SetAskBeforeDeleteFile(fAskBeforeDeleteFile);
ShowCurrentSettings();
@@ -1061,7 +1061,7 @@ TrashSettingsView::_SendNotices()
if (!tracker)
return;
- tracker->SendNotices(kMoveFilesToTrashChanged);
+ tracker->SendNotices(kDontMoveFilesToTrashChanged);
tracker->SendNotices(kAskBeforeDeleteFileChanged);
}
@@ -1071,7 +1071,7 @@ TrashSettingsView::ShowCurrentSettings()
{
TrackerSettings settings;
- fMoveFilesToTrashCheckBox->SetValue(settings.MoveFilesToTrash());
+
fDontMoveFilesToTrashCheckBox->SetValue(settings.DontMoveFilesToTrash());
fAskBeforeDeleteFileCheckBox->SetValue(settings.AskBeforeDeleteFile());
}
@@ -1081,7 +1081,7 @@ TrashSettingsView::RecordRevertSettings()
{
TrackerSettings settings;
- fMoveFilesToTrash = settings.MoveFilesToTrash();
+ fDontMoveFilesToTrash = settings.DontMoveFilesToTrash();
fAskBeforeDeleteFile = settings.AskBeforeDeleteFile();
}
@@ -1089,8 +1089,8 @@ TrashSettingsView::RecordRevertSettings()
bool
TrashSettingsView::IsRevertable() const
{
- return fMoveFilesToTrash
- != (fMoveFilesToTrashCheckBox->Value() > 0)
+ return fDontMoveFilesToTrash
+ != (fDontMoveFilesToTrashCheckBox->Value() > 0)
|| fAskBeforeDeleteFile
!= (fAskBeforeDeleteFileCheckBox->Value() > 0);
}
diff --git a/src/kits/tracker/SettingsViews.h b/src/kits/tracker/SettingsViews.h
index f6c21be..bc3474b 100644
--- a/src/kits/tracker/SettingsViews.h
+++ b/src/kits/tracker/SettingsViews.h
@@ -181,10 +181,10 @@ class TrashSettingsView : public SettingsView {
private:
void _SendNotices();
- BCheckBox* fMoveFilesToTrashCheckBox;
+ BCheckBox* fDontMoveFilesToTrashCheckBox;
BCheckBox* fAskBeforeDeleteFileCheckBox;
- bool fMoveFilesToTrash;
+ bool fDontMoveFilesToTrash;
bool fAskBeforeDeleteFile;
typedef SettingsView _inherited;
diff --git a/src/kits/tracker/TrackerSettings.cpp
b/src/kits/tracker/TrackerSettings.cpp
index 5ee3ed2..7eebfa4 100644
--- a/src/kits/tracker/TrackerSettings.cpp
+++ b/src/kits/tracker/TrackerSettings.cpp
@@ -82,7 +82,7 @@ class TTrackerState : public Settings {
HexScalarValueSetting* fFreeSpaceColor;
HexScalarValueSetting* fWarningSpaceColor;
- BooleanValueSetting* fMoveFilesToTrash;
+ BooleanValueSetting* fDontMoveFilesToTrash;
BooleanValueSetting* fAskBeforeDeleteFile;
Benaphore fInitLock;
@@ -202,8 +202,8 @@ TTrackerState::LoadSettingsIfNeeded()
Add(fWarningSpaceColor
= new HexScalarValueSetting("WarningSpaceColor", 0xc0cb0000,
"", ""));
- Add(fMoveFilesToTrash
- = new BooleanValueSetting("MoveFilesToTrash", true));
+ Add(fDontMoveFilesToTrash
+ = new BooleanValueSetting("DontMoveFilesToTrash", false));
Add(fAskBeforeDeleteFile
= new BooleanValueSetting("AskBeforeDeleteFile", true));
@@ -509,16 +509,16 @@ TrackerSettings::SetRecentFoldersCount(int32 count)
bool
-TrackerSettings::MoveFilesToTrash()
+TrackerSettings::DontMoveFilesToTrash()
{
- return gTrackerState.fMoveFilesToTrash->Value();
+ return gTrackerState.fDontMoveFilesToTrash->Value();
}
void
-TrackerSettings::SetMoveFilesToTrash(bool enabled)
+TrackerSettings::SetDontMoveFilesToTrash(bool enabled)
{
- gTrackerState.fMoveFilesToTrash->SetValue(enabled);
+ gTrackerState.fDontMoveFilesToTrash->SetValue(enabled);
}
diff --git a/src/kits/tracker/TrackerSettings.h
b/src/kits/tracker/TrackerSettings.h
index da762eb..78f2f33 100644
--- a/src/kits/tracker/TrackerSettings.h
+++ b/src/kits/tracker/TrackerSettings.h
@@ -118,8 +118,8 @@ class TrackerSettings {
bool ClockIs24Hr();
void SetClockTo24Hr(bool);
- bool MoveFilesToTrash();
- void SetMoveFilesToTrash(bool);
+ bool DontMoveFilesToTrash();
+ void SetDontMoveFilesToTrash(bool);
bool AskBeforeDeleteFile();
void SetAskBeforeDeleteFile(bool);
############################################################################
Revision: hrev45265
Commit: 1baa2211739cd5b4d45a56868aedd57dedbe782c
URL: http://cgit.haiku-os.org/haiku/commit/?id=1baa221
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Sun Feb 10 10:02:38 2013 UTC
Removed Trash options from Tracker prefs.
As discussed [1][2], using a Trash is in the interest of the
vast majority of users. The setting is still present in the
Tracker settings file. SHIFT+DELETE will still bypass the
Trash.
[1]
//www.freelists.org/post/haiku-commits/haiku-hrev45134-srckitstracker,4
[2] //www.freelists.org/post/haiku/Removing-Trackers-Trash-options
Please enter the commit message for your changes. Lines starting
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/SettingsViews.cpp
b/src/kits/tracker/SettingsViews.cpp
index 5436978..3e645d4 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -947,151 +947,3 @@ SpaceBarSettingsView::IsRevertable() const
|| fFreeSpaceColor != settings.FreeSpaceColor()
|| fWarningSpaceColor != settings.WarningSpaceColor();
}
-
-
-// #pragma mark -
-
-
-TrashSettingsView::TrashSettingsView()
- :
- SettingsView("TrashSettingsView")
-{
- fDontMoveFilesToTrashCheckBox = new BCheckBox("",
- B_TRANSLATE("Don't move files to Trash"),
- new BMessage(kDontMoveFilesToTrashChanged));
-
- fAskBeforeDeleteFileCheckBox = new BCheckBox("",
- B_TRANSLATE("Ask before delete"),
- new BMessage(kAskBeforeDeleteFileChanged));
-
- const float spacing = be_control_look->DefaultItemSpacing();
-
- BGroupLayout* layout = GroupLayout();
- layout->SetOrientation(B_VERTICAL);
- layout->SetSpacing(0);
- BGroupLayoutBuilder(layout)
- .Add(fDontMoveFilesToTrashCheckBox)
- .Add(fAskBeforeDeleteFileCheckBox)
- .AddGlue()
- .SetInsets(spacing, spacing, spacing, spacing);
-
-}
-
-
-void
-TrashSettingsView::AttachedToWindow()
-{
- fDontMoveFilesToTrashCheckBox->SetTarget(this);
- fAskBeforeDeleteFileCheckBox->SetTarget(this);
-}
-
-
-void
-TrashSettingsView::MessageReceived(BMessage* message)
-{
- TTracker* tracker = dynamic_cast<TTracker*>(be_app);
- if (!tracker)
- return;
- TrackerSettings settings;
-
- switch (message->what) {
- case kDontMoveFilesToTrashChanged:
- settings.SetDontMoveFilesToTrash(
- fDontMoveFilesToTrashCheckBox->Value() == 1);
-
- tracker->SendNotices(kDontMoveFilesToTrashChanged);
- Window()->PostMessage(kSettingsContentsModified);
- break;
-
- case kAskBeforeDeleteFileChanged:
- settings.SetAskBeforeDeleteFile(
- fAskBeforeDeleteFileCheckBox->Value() == 1);
-
- tracker->SendNotices(kAskBeforeDeleteFileChanged);
- Window()->PostMessage(kSettingsContentsModified);
- break;
-
- default:
- _inherited::MessageReceived(message);
- break;
- }
-}
-
-
-void
-TrashSettingsView::SetDefaults()
-{
- TrackerSettings settings;
-
- settings.SetDontMoveFilesToTrash(false);
- settings.SetAskBeforeDeleteFile(true);
-
- ShowCurrentSettings();
- _SendNotices();
-}
-
-
-bool
-TrashSettingsView::IsDefaultable() const
-{
- TrackerSettings settings;
-
- return settings.DontMoveFilesToTrash() != false
- || settings.AskBeforeDeleteFile() != true;
-}
-
-
-void
-TrashSettingsView::Revert()
-{
- TrackerSettings settings;
-
- settings.SetDontMoveFilesToTrash(fDontMoveFilesToTrash);
- settings.SetAskBeforeDeleteFile(fAskBeforeDeleteFile);
-
- ShowCurrentSettings();
- _SendNotices();
-}
-
-
-void
-TrashSettingsView::_SendNotices()
-{
- TTracker* tracker = dynamic_cast<TTracker*>(be_app);
- if (!tracker)
- return;
-
- tracker->SendNotices(kDontMoveFilesToTrashChanged);
- tracker->SendNotices(kAskBeforeDeleteFileChanged);
-}
-
-
-void
-TrashSettingsView::ShowCurrentSettings()
-{
- TrackerSettings settings;
-
-
fDontMoveFilesToTrashCheckBox->SetValue(settings.DontMoveFilesToTrash());
- fAskBeforeDeleteFileCheckBox->SetValue(settings.AskBeforeDeleteFile());
-}
-
-
-void
-TrashSettingsView::RecordRevertSettings()
-{
- TrackerSettings settings;
-
- fDontMoveFilesToTrash = settings.DontMoveFilesToTrash();
- fAskBeforeDeleteFile = settings.AskBeforeDeleteFile();
-}
-
-
-bool
-TrashSettingsView::IsRevertable() const
-{
- return fDontMoveFilesToTrash
- != (fDontMoveFilesToTrashCheckBox->Value() > 0)
- || fAskBeforeDeleteFile
- != (fAskBeforeDeleteFileCheckBox->Value() > 0);
-}
-
diff --git a/src/kits/tracker/SettingsViews.h b/src/kits/tracker/SettingsViews.h
index bc3474b..68ce034 100644
--- a/src/kits/tracker/SettingsViews.h
+++ b/src/kits/tracker/SettingsViews.h
@@ -163,33 +163,6 @@ class SpaceBarSettingsView : public SettingsView {
typedef SettingsView _inherited;
};
-
-class TrashSettingsView : public SettingsView {
- public:
- TrashSettingsView();
-
- virtual void MessageReceived(BMessage* message);
- virtual void AttachedToWindow();
-
- virtual void SetDefaults();
- virtual bool IsDefaultable() const;
- virtual void Revert();
- virtual void ShowCurrentSettings();
- virtual void RecordRevertSettings();
- virtual bool IsRevertable() const;
-
- private:
- void _SendNotices();
-
- BCheckBox* fDontMoveFilesToTrashCheckBox;
- BCheckBox* fAskBeforeDeleteFileCheckBox;
-
- bool fDontMoveFilesToTrash;
- bool fAskBeforeDeleteFile;
-
- typedef SettingsView _inherited;
-};
-
} // namespace BPrivate
using namespace BPrivate;
diff --git a/src/kits/tracker/TrackerSettingsWindow.cpp
b/src/kits/tracker/TrackerSettingsWindow.cpp
index 66267a6..754ae65 100644
--- a/src/kits/tracker/TrackerSettingsWindow.cpp
+++ b/src/kits/tracker/TrackerSettingsWindow.cpp
@@ -114,8 +114,6 @@ TrackerSettingsWindow::TrackerSettingsWindow()
new DesktopSettingsView()));
fSettingsTypeListView->AddItem(new SettingsItem(B_TRANSLATE("Windows"),
new WindowsSettingsView()));
- fSettingsTypeListView->AddItem(new SettingsItem(B_TRANSLATE("Trash"),
- new TrashSettingsView()));
fSettingsTypeListView->AddItem(new SettingsItem(
B_TRANSLATE("Volume icons"), new SpaceBarSettingsView()));
Other related posts:
- » [haiku-commits] haiku: hrev45265 - src/kits/tracker - humdingerb
