diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp index 5436978f49..3e645d433e 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(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(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 bc3474bb26..68ce03484f 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 66267a60d3..754ae65bc3 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()));