From 7bbaa8e839afea9489584976471f0d0fa3e77211 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 17 Apr 2016 17:46:41 +0200 Subject: [PATCH 01/10] Layout managed GUI, integration of AutoFiler preferences Use a tab view for Filer rules and AutoFiler settings. Add a tab with a zone for files to be dropped to be processed. --- sources/Filer/AutoFilerTab.cpp | 317 +++++++++++++++ sources/Filer/AutoFilerTab.h | 50 +++ sources/Filer/DropZoneTab.cpp | 78 ++++ sources/Filer/DropZoneTab.h | 32 ++ sources/Filer/MainWindow.cpp | 109 ++++++ sources/Filer/MainWindow.h | 50 +++ sources/Filer/Makefile | 11 +- sources/{AutoFiler => Filer}/RefStorage.cpp | 0 sources/{AutoFiler => Filer}/RefStorage.h | 0 sources/Filer/RuleTab.cpp | 368 ++++++++++++++++++ sources/Filer/RuleTab.h | 52 +++ .../{AutoFiler => Filer}/TypedRefFilter.cpp | 0 sources/{AutoFiler => Filer}/TypedRefFilter.h | 0 sources/Filer/main.cpp | 8 +- sources/Filer/main.h | 4 +- 15 files changed, 1068 insertions(+), 11 deletions(-) create mode 100644 sources/Filer/AutoFilerTab.cpp create mode 100644 sources/Filer/AutoFilerTab.h create mode 100644 sources/Filer/DropZoneTab.cpp create mode 100644 sources/Filer/DropZoneTab.h create mode 100644 sources/Filer/MainWindow.cpp create mode 100644 sources/Filer/MainWindow.h rename sources/{AutoFiler => Filer}/RefStorage.cpp (100%) rename sources/{AutoFiler => Filer}/RefStorage.h (100%) create mode 100644 sources/Filer/RuleTab.cpp create mode 100644 sources/Filer/RuleTab.h rename sources/{AutoFiler => Filer}/TypedRefFilter.cpp (100%) rename sources/{AutoFiler => Filer}/TypedRefFilter.h (100%) diff --git a/sources/Filer/AutoFilerTab.cpp b/sources/Filer/AutoFilerTab.cpp new file mode 100644 index 0000000..903c819 --- /dev/null +++ b/sources/Filer/AutoFilerTab.cpp @@ -0,0 +1,317 @@ +/* + * Copyright 2008, 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * DarkWyrm , Copyright 2008 + * Humdinger, humdingerb@gmail.com + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "AutoFilerTab.h" +#include "RefStorage.h" +#include "TypedRefFilter.h" + +enum +{ + M_SHOW_ADD_PANEL = 'shaw', + M_SHOW_EDIT_PANEL = 'shew', + M_REMOVE_FOLDER = 'rmfl', + M_FOLDER_SELECTED = 'flsl', + M_FOLDER_CHOSEN = 'flch' +}; + + +AutoFilerTab::AutoFilerTab() + : + BView("AutoFiler", B_SUPPORTS_LAYOUT) +{ + LoadFolders(); + _BuildLayout(); + +// fRefFilter = new TypedRefFilter("application/x-vnd.Be-directory",B_DIRECTORY_NODE); + fRefFilter = new TypedRefFilter("", B_DIRECTORY_NODE); + fFilePanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), NULL, + B_DIRECTORY_NODE, false, NULL, fRefFilter); + BMessage panelMsg(M_FOLDER_CHOSEN); + fFilePanel->SetMessage(&panelMsg); + + gRefLock.Lock(); + for (int32 i = 0; i < gRefStructList.CountItems(); i++) + { + RefStorage* refholder = (RefStorage*)gRefStructList.ItemAt(i); + fFolderList->AddItem(new BStringItem(BPath(&refholder->ref).Path())); + } + gRefLock.Unlock(); + + fFolderList->MakeFocus(); + if (fFolderList->CountItems() > 0) + fFolderList->Select(0L); +} + + +AutoFilerTab::~AutoFilerTab() +{ + delete fFilePanel; +} + + +void +AutoFilerTab::_BuildLayout() +{ + BStringView* folderLabel = new BStringView("folderlabel", + "Automatically run Filer on the contents of these folders:"); + + fFolderList = new BListView("rulelist", B_SINGLE_SELECTION_LIST, + B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); + fScrollView = new BScrollView("listscroll", fFolderList, + B_FRAME_EVENTS | B_WILL_DRAW, false, true); + fFolderList->SetSelectionMessage(new BMessage(M_FOLDER_SELECTED)); + fFolderList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_PANEL)); + + fAutorunBox = new BCheckBox("autorunbox", + "Run AutoFiler on system startup", new BMessage); + + BPath path; + find_directory(B_USER_SETTINGS_DIRECTORY, &path); + path.Append(gPrefsPath); + + BNode node(path.Path()); + bool autorun = true; + if (node.InitCheck() == B_OK) { + bool tmpbool; + if (node.ReadAttr("autorun", B_BOOL_TYPE, 0, (void*)&tmpbool, + sizeof(bool)) > 0) + autorun = tmpbool; + } + if (autorun) + fAutorunBox->SetValue(B_CONTROL_ON); + + fAddButton = new BButton("addbutton", "Add" B_UTF8_ELLIPSIS, + new BMessage(M_SHOW_ADD_PANEL)); + + fEditButton = new BButton("editbutton", "Edit" B_UTF8_ELLIPSIS, + new BMessage(M_SHOW_EDIT_PANEL)); + fEditButton->SetEnabled(false); + + fRemoveButton = new BButton("removebutton", "Remove", + new BMessage(M_REMOVE_FOLDER)); + fRemoveButton->SetEnabled(false); + + static const float spacing = be_control_look->DefaultItemSpacing(); + BLayoutBuilder::Group<>(this, B_HORIZONTAL, B_USE_DEFAULT_SPACING) + .SetInsets(spacing) + .AddGroup(B_VERTICAL) + .Add(fAutorunBox) + .Add(new BSeparatorView(B_HORIZONTAL)) + .Add(folderLabel) + .Add(fScrollView) + .AddGroup(B_HORIZONTAL) + .AddGlue() + .Add(fAddButton) + .Add(fEditButton) + .Add(fRemoveButton) + .AddGlue() + .End() + .End(); +} + + +void +AutoFilerTab::AttachedToWindow() +{ +// SetFlags(Flags() | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); + + fAddButton->SetTarget(this); + fEditButton->SetTarget(this); + fRemoveButton->SetTarget(this); + + fFolderList->SetTarget(this); + fFilePanel->SetTarget(this); + + if (fFolderList->CountItems() > 0) { + BMessenger messenger(this); + BMessage message(M_FOLDER_SELECTED); + messenger.SendMessage(&message); + } + BView::AttachedToWindow(); +} + + +void +AutoFilerTab::DetachedFromWindow() +{ + printf("AutoFilerTab: QuitRequested()\n"); + SaveFolders(); + + // save autorun value + bool autorun = (fAutorunBox->Value() == B_CONTROL_ON); + + BPath path; + find_directory(B_USER_SETTINGS_DIRECTORY, &path); + path.Append(gPrefsPath); + + BNode node(path.Path()); + if (node.InitCheck() == B_OK) + node.WriteAttr("autorun",B_BOOL_TYPE,0,(void*)&autorun,sizeof(bool)); + + if (autorun) + EnableAutorun(); + else + DisableAutorun(); + + // if AutoFiler is running, tell it to refresh its folders + if (be_roster->IsRunning("application/x-vnd.dw-AutoFiler")) + { + BMessage msg(M_REFRESH_FOLDERS); + BMessenger msgr("application/x-vnd.dw-AutoFiler"); + msgr.SendMessage(&msg); + } +} + + +void +AutoFilerTab::MessageReceived(BMessage *message) +{ + switch (message->what) + { + case M_SHOW_ADD_PANEL: + { + fFilePanel->Show(); + break; + } + case M_SHOW_EDIT_PANEL: + { + int32 selection = fFolderList->CurrentSelection(); + if (selection < 0) + break; + + BStringItem* item = (BStringItem*)fFolderList->ItemAt(selection); + fFilePanel->SetPanelDirectory(item->Text()); + + BMessage panelMsg(M_FOLDER_CHOSEN); + panelMsg.AddInt32("index", selection); + fFilePanel->SetMessage(&panelMsg); + fFilePanel->Show(); + break; + } + case M_REMOVE_FOLDER: + { + int32 selection = fFolderList->CurrentSelection(); + if (selection < 0) + break; + + BStringItem* item = (BStringItem*)fFolderList->RemoveItem(selection); + delete item; + + gRefLock.Lock(); + RefStorage* refholder = (RefStorage*)gRefStructList.RemoveItem(selection); + delete refholder; + gRefLock.Unlock(); + break; + } + case M_FOLDER_SELECTED: + { + int32 selection = fFolderList->CurrentSelection(); + bool value = (selection >= 0); + + fEditButton->SetEnabled(value); + fRemoveButton->SetEnabled(value); + break; + } + case M_FOLDER_CHOSEN: + { + int32 index; + if (message->FindInt32("index", &index) != B_OK) + index = -1; + + entry_ref ref; + if (message->FindRef("refs", &ref) != B_OK) + break; + + BStringItem* item = (BStringItem*)fFolderList->ItemAt(index); + if (item) { + gRefLock.Lock(); + RefStorage* refholder = (RefStorage*)gRefStructList.ItemAt(index); + refholder->SetData(ref); + gRefLock.Unlock(); + } else { + item = new BStringItem(""); + fFolderList->AddItem(item); + + gRefLock.Lock(); + gRefStructList.AddItem(new RefStorage(ref)); + gRefLock.Unlock(); + } + + item->SetText(BPath(&ref).Path()); + fFolderList->Invalidate(); + break; + } + default: + BView::MessageReceived(message); + } +} + + +void +AutoFilerTab::EnableAutorun() +{ + BDirectory destDir; + BPath destPath; + find_directory(B_USER_SETTINGS_DIRECTORY, &destPath); + + status_t ret = destPath.Append("boot"); + if (ret == B_OK) + ret = create_directory(destPath.Path(), 0777); + + ret = destPath.Append("launch"); + if (ret == B_OK) + ret = create_directory(destPath.Path(), 0777); + + if (ret == B_OK) { + destDir = BDirectory(destPath.Path()); + ret = destDir.InitCheck(); + } + + if (ret != B_OK) + return; + + destPath.Append("AutoFiler"); + + app_info info; + BPath linkPath; + be_roster->GetActiveAppInfo(&info); + BEntry entry(&info.ref); + + entry.GetPath(&linkPath); + linkPath.GetParent(&linkPath); + linkPath.Append("AutoFiler"); + destDir.CreateSymLink(destPath.Path(), linkPath.Path(), NULL); +} + + +void +AutoFilerTab::DisableAutorun() +{ + BPath path; + + if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) < B_OK) + return; + status_t ret = path.Append("boot/launch/AutoFiler"); + + if (ret == B_OK) { + BEntry entry(path.Path()); + entry.Remove(); + } +} diff --git a/sources/Filer/AutoFilerTab.h b/sources/Filer/AutoFilerTab.h new file mode 100644 index 0000000..cf78b74 --- /dev/null +++ b/sources/Filer/AutoFilerTab.h @@ -0,0 +1,50 @@ +/* + * Copyright 2008, 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * DarkWyrm , Copyright 2008 + * Humdinger, humdingerb@gmail.com + */ +#ifndef AUTOFILERTAB_H +#define AUTOFILERTAB_H + +#include +#include +#include +#include +#include +#include + +class TypedRefFilter; + +class AutoFilerTab : public BView +{ +public: + AutoFilerTab(); + ~AutoFilerTab(); + virtual void AttachedToWindow(); + virtual void DetachedFromWindow(); + void MessageReceived(BMessage* message); + +private: + void _BuildLayout(); + + void EnableAutorun(); + void DisableAutorun(); + + BListView* fFolderList; + BScrollView* fScrollView; + + BCheckBox* fAutorunBox; + + BButton* fAddButton; + BButton* fEditButton; + BButton* fRemoveButton; + + BFilePanel* fFilePanel; + TypedRefFilter* fRefFilter; +}; + + +#endif // AUTOFILERTAB_H diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp new file mode 100644 index 0000000..0403596 --- /dev/null +++ b/sources/Filer/DropZoneTab.cpp @@ -0,0 +1,78 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ +#include +#include +#include +#include + +#include "DropZoneTab.h" + +enum +{ + M_REPLICATE = 'repl' +}; + + +DropZoneTab::DropZoneTab() + : + BView("Drop zone", B_SUPPORTS_LAYOUT) +{ + _BuildLayout(); +} + + +DropZoneTab::~DropZoneTab() +{ +} + + +void +DropZoneTab::_BuildLayout() +{ + BStringView* zoneLabel = new BStringView("zonelabel", + "Drag and drop the files to be processed below."); + zoneLabel->SetAlignment(B_ALIGN_CENTER); + fDropzone = new BView("dropzone", B_SUPPORTS_LAYOUT); + + fRepliButton = new BButton("replibutton", + "Replicate!", new BMessage(M_REPLICATE)); + + static const float spacing = be_control_look->DefaultItemSpacing(); + BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING) + .SetInsets(spacing) + .Add(zoneLabel) + .Add(fDropzone) + .Add(fRepliButton); +} + + +void +DropZoneTab::AttachedToWindow() +{ +// SetFlags(Flags() | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); + + fRepliButton->SetTarget(this); +// fDropzone->SetTarget(this); + + BView::AttachedToWindow(); +} + + +void +DropZoneTab::MessageReceived(BMessage *message) +{ + switch (message->what) + { + case M_REPLICATE: + { + break; + } + default: + BView::MessageReceived(message); + } +} diff --git a/sources/Filer/DropZoneTab.h b/sources/Filer/DropZoneTab.h new file mode 100644 index 0000000..2ac4abf --- /dev/null +++ b/sources/Filer/DropZoneTab.h @@ -0,0 +1,32 @@ +/* + * Copyright 2008, 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * DarkWyrm , Copyright 2008 + * Humdinger, humdingerb@gmail.com + */ +#ifndef DROPZONETAB_H +#define DROPZONETAB_H + +#include +#include + +class DropZoneTab : public BView +{ +public: + DropZoneTab(); + ~DropZoneTab(); + + virtual void AttachedToWindow(); + void MessageReceived(BMessage* message); + +private: + void _BuildLayout(); + + BButton* fRepliButton; + BView* fDropzone; +}; + + +#endif // DROPZONETAB_H diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp new file mode 100644 index 0000000..9e6c47e --- /dev/null +++ b/sources/Filer/MainWindow.cpp @@ -0,0 +1,109 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "MainWindow.h" + +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "MainWindow" + + +MainWindow::MainWindow() + : + BWindow(BRect(50, 50, 400, 400), B_TRANSLATE_SYSTEM_NAME("Filer"), + B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) +{ + _BuildLayout(); +} + + +MainWindow::~MainWindow() +{ +} + + +bool +MainWindow::QuitRequested() +{ + be_app->PostMessage(B_QUIT_REQUESTED); + return true; +} + + +void +MainWindow::_BuildLayout() +{ + // The menu + BMenuBar* menuBar = new BMenuBar("menubar"); + BMenu* menu; + BMenuItem* item; + + menu = new BMenu(B_TRANSLATE("App")); + item = new BMenuItem(B_TRANSLATE("About Filer"), + new BMessage(B_ABOUT_REQUESTED)); + menu->AddItem(item); + item->SetTarget(be_app); + item = new BMenuItem(B_TRANSLATE("User documentation"), + new BMessage(DOCS)); + menu->AddItem(item); + item = new BMenuItem(B_TRANSLATE("Help on Rules"), + new BMessage(HELP)); + menu->AddItem(item); + item = new BMenuItem(B_TRANSLATE("Quit"), + new BMessage(B_QUIT_REQUESTED), 'Q'); + menu->AddItem(item); + menuBar->AddItem(menu); + + // The tabview + fTabView = new BTabView("tabview", B_WIDTH_FROM_WIDEST); + fTabView->SetBorder(B_NO_BORDER); + fTabView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); + + fDropZone = new DropZoneTab(); + fRules = new RuleTab(); + fAutoFiler = new AutoFilerTab(); + + fTabView->AddTab(fDropZone); + fTabView->AddTab(fRules); + fTabView->AddTab(fAutoFiler); + + // do the layouting + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .Add(menuBar) + .AddGroup(B_VERTICAL) + .SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0) + .Add(fTabView) + .End(); + + fTabView->SetViewColor(B_TRANSPARENT_COLOR); +} + + +void +MainWindow::MessageReceived(BMessage* message) +{ +// message->PrintToStream(); + switch (message->what) + { + default: + { + BWindow::MessageReceived(message); + break; + } + } +} diff --git a/sources/Filer/MainWindow.h b/sources/Filer/MainWindow.h new file mode 100644 index 0000000..983cedb --- /dev/null +++ b/sources/Filer/MainWindow.h @@ -0,0 +1,50 @@ +/* + * Copyright 2015. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#ifndef MAIN_WINDOW_H +#define MAIN_WINDOW_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "AutoFilerTab.h" +#include "DropZoneTab.h" +#include "RuleTab.h" + +#include + +#define DOCS 'docs' +#define HELP 'help' + +class MainWindow : public BWindow { +public: + MainWindow(); + virtual ~MainWindow(); + + bool QuitRequested(); + void MessageReceived(BMessage* message); + +private: + void _BuildLayout(); + + BTabView* fTabView; + DropZoneTab* fDropZone; + RuleTab* fRules; + AutoFilerTab* fAutoFiler; +}; + +#endif // MAIN_WINDOW_H diff --git a/sources/Filer/Makefile b/sources/Filer/Makefile index 5d3ae48..fb852f9 100644 --- a/sources/Filer/Makefile +++ b/sources/Filer/Makefile @@ -28,9 +28,10 @@ APP_MIME_SIG = application/x-vnd.dw-Filer # means this Makefile will not work correctly if two source files with the # same name (source.c or source.cpp) are included from different directories. # Also note that spaces in folder names do not work well with this Makefile. -SRCS = FilerRule.cpp FSUtils.cpp main.cpp PatternProcessor.cpp RuleRunner.cpp \ - ActionView.cpp AutoTextControl.cpp CppSQLite3.cpp Database.cpp \ - PrefsWindow.cpp RuleEditWindow.cpp RuleItem.cpp TestView.cpp +SRCS = AutoFilerTab.cpp FilerRule.cpp FSUtils.cpp main.cpp PatternProcessor.cpp \ + RuleRunner.cpp ActionView.cpp AutoTextControl.cpp CppSQLite3.cpp Database.cpp \ + DropZoneTab.cpp MainWindow.cpp RefStorage.cpp RuleEditWindow.cpp RuleItem.cpp \ + RuleTab.cpp TypedRefFilter.cpp TestView.cpp # Specify the resource definition files to use. Full or relative paths can be # used. @@ -56,7 +57,7 @@ RSRCS = # - if your library does not follow the standard library naming scheme, # you need to specify the path to the library and it's name. # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") -LIBS = be translation $(STDCPPLIBS) sqlite3 +LIBS = be localestub tracker translation $(STDCPPLIBS) sqlite3 # Specify additional paths to directories following the standard libXXX.so # or libXXX.a naming scheme. You can specify full paths or paths relative @@ -103,7 +104,7 @@ SYMBOLS := # Includes debug information, which allows the binary to be debugged easily. # If set to "TRUE", debug info will be created. -DEBUGGER := +DEBUGGER := TRUE # Specify any additional compiler flags to be used. COMPILER_FLAGS = -Woverloaded-virtual -funsigned-bitfields -Wwrite-strings diff --git a/sources/AutoFiler/RefStorage.cpp b/sources/Filer/RefStorage.cpp similarity index 100% rename from sources/AutoFiler/RefStorage.cpp rename to sources/Filer/RefStorage.cpp diff --git a/sources/AutoFiler/RefStorage.h b/sources/Filer/RefStorage.h similarity index 100% rename from sources/AutoFiler/RefStorage.h rename to sources/Filer/RefStorage.h diff --git a/sources/Filer/RuleTab.cpp b/sources/Filer/RuleTab.cpp new file mode 100644 index 0000000..54ad9f9 --- /dev/null +++ b/sources/Filer/RuleTab.cpp @@ -0,0 +1,368 @@ +/* + * Copyright 2008, 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * DarkWyrm , Copyright 2008 + * Humdinger, humdingerb@gmail.com + */ +#include +#include +#include +#include +#include +#include +#include + +#include "FilerRule.h" +#include "RuleEditWindow.h" +#include "RuleItem.h" +#include "RuleRunner.h" +#include "RuleTab.h" + +enum +{ + M_SHOW_ADD_WINDOW = 'shaw', + M_SHOW_EDIT_WINDOW = 'shew', + M_REMOVE_RULE = 'shrr', + M_REVERT = 'rvrt', + M_RULE_SELECTED = 'rlsl', + M_MOVE_RULE_UP = 'mvup', + M_MOVE_RULE_DOWN = 'mvdn' +}; + + +RuleTab::RuleTab() + : + BView("Rules", B_SUPPORTS_LAYOUT) +{ + _BuildLayout(); + + fRuleList = new BObjectList(20, true); + LoadRules(fRuleList); + + for (int32 i = 0; i < fRuleList->CountItems(); i++) + fRuleItemList->AddItem(new RuleItem(fRuleList->ItemAt(i))); + + fRuleItemList->MakeFocus(); + if (fRuleItemList->CountItems() > 0) + fRuleItemList->Select(0L); + else { + BAlert* alert = new BAlert("Filer", + "It appears that there aren't any rules for " + "organizing files. Would you like Filer to " + "add some basic ones for you?", + "No", "Yes"); + + if (alert->Go() == 1) { + FilerRule* rule = new FilerRule(); + + // NOTE: If actions + rule->AddTest(MakeTest("Type", "is", "text/plain")); + rule->AddAction(MakeAction("Move it to…", "/boot/home/Documents")); + rule->SetDescription("Store text files in my Documents folder"); + AddRule(rule); + + rule = new FilerRule(); + rule->AddTest(MakeTest("Type", "is", "application/pdf")); + rule->AddAction(MakeAction("Move it to…", "/boot/home/Documents")); + rule->SetDescription("Store PDF files in my Documents folder"); + AddRule(rule); + + rule = new FilerRule(); + rule->AddTest(MakeTest("Type", "starts with", "image/")); + rule->AddAction(MakeAction("Move it to…", "/boot/home/Pictures")); + rule->SetDescription("Store pictures in my Pictures folder"); + AddRule(rule); + + rule = new FilerRule(); + rule->AddTest(MakeTest("Type", "starts with","video/")); + rule->AddAction(MakeAction("Move it to…", "/boot/home/Videos")); + rule->SetDescription("Store movie files in my Videos folder"); + AddRule(rule); + + rule = new FilerRule(); + rule->AddTest(MakeTest("Name", "ends with", ".zip")); + rule->AddAction(MakeAction("Terminal command…", + "unzip %FULLPATH% -d /boot/home/Desktop")); + rule->SetDescription("Extract ZIP files to the Desktop"); + AddRule(rule); + +// rule = new FilerRule(); +// rule->AddTest(MakeTest("","","")); +// rule->AddAction(MakeAction("","")); +// rule->SetDescription(""); +// AddRule(rule); + } + SaveRules(fRuleList); + } +} + + +RuleTab::~RuleTab() +{ + delete fRuleList; +} + + +void +RuleTab::_BuildLayout() +{ + fRuleItemList = new BListView("rulelist", B_SINGLE_SELECTION_LIST, + B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); + fScrollView = new BScrollView("listscroll", fRuleItemList, + B_FRAME_EVENTS | B_WILL_DRAW, false, true); + + fRuleItemList->SetSelectionMessage(new BMessage(M_RULE_SELECTED)); + fRuleItemList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_WINDOW)); +// fScrollView->ScrollBar(B_HORIZONTAL)->SetRange(0.0, 0.0); + + fAddButton = new BButton("addbutton", "Add" B_UTF8_ELLIPSIS, + new BMessage(M_SHOW_ADD_WINDOW)); + + fEditButton = new BButton("editbutton", "Edit" B_UTF8_ELLIPSIS, + new BMessage(M_SHOW_EDIT_WINDOW)); + fEditButton->SetEnabled(false); + + fRemoveButton = new BButton("removebutton", "Remove", + new BMessage(M_REMOVE_RULE)); + fRemoveButton->SetEnabled(false); + + fMoveUpButton = new BButton("moveupbutton", "Move up", + new BMessage(M_MOVE_RULE_UP)); + fMoveUpButton->SetEnabled(false); + + fMoveDownButton = new BButton("movedownbutton", "Move down", + new BMessage(M_MOVE_RULE_DOWN)); + fMoveDownButton->SetEnabled(false); + + static const float spacing = be_control_look->DefaultItemSpacing(); + BLayoutBuilder::Group<>(this, B_HORIZONTAL, B_USE_DEFAULT_SPACING) + .SetInsets(spacing) + .AddGroup(B_VERTICAL, 10.0f) + .Add(fScrollView) + .AddGroup(B_HORIZONTAL) + .AddGlue() + .Add(fAddButton) + .Add(fEditButton) + .Add(fRemoveButton) + .AddGlue() + .End() + .End() + .AddGroup(B_VERTICAL) + .Add(fMoveUpButton) + .Add(fMoveDownButton) + .AddGlue() + .End(); +} + + +void +RuleTab::AttachedToWindow() +{ + fAddButton->SetTarget(this); + fEditButton->SetTarget(this); + fRemoveButton->SetTarget(this); + fMoveUpButton->SetTarget(this); + fMoveDownButton->SetTarget(this); + fRuleItemList->SetTarget(this); + + if (fRuleItemList->CountItems() > 0) { + BMessenger messenger(this); + BMessage message(M_RULE_SELECTED); + messenger.SendMessage(&message); + } + BView::AttachedToWindow(); +} + + +void +RuleTab::DetachedFromWindow() +{ + if (fChanges) + SaveRules(fRuleList); + MakeEmpty(); +} + + +void +RuleTab::MessageReceived(BMessage* message) +{ +// message->PrintToStream(); + switch(message->what) + { + case M_SHOW_ADD_WINDOW: + { + printf("Show Add Window\n"); + BRect frame(Frame()); + ConvertToScreen(&frame); + frame.right = frame.left + 400; + frame.bottom = frame.top + 300; + frame.OffsetBy(60, 30); + + RuleEditWindow* rulewin = new RuleEditWindow(frame, NULL); + rulewin->Show(); + break; + } + case M_SHOW_EDIT_WINDOW: + { + BRect frame(Frame()); + ConvertToScreen(&frame); + frame.right = frame.left + 400; + frame.bottom = frame.top + 300; + frame.OffsetBy(60, 30); + + FilerRule* rule = fRuleList->ItemAt( + fRuleItemList->CurrentSelection()); + + RuleEditWindow* rulewin = new RuleEditWindow(frame, rule); + rulewin->Show(); + break; + } + case M_ADD_RULE: + { + fChanges = true; + FilerRule* item; + if (message->FindPointer("item", (void**)&item) == B_OK) + AddRule(item); + break; + } + case M_REMOVE_RULE: + { + fChanges = true; + if (fRuleItemList->CurrentSelection() >= 0) + RemoveRule((RuleItem*)fRuleItemList->ItemAt( + fRuleItemList->CurrentSelection())); + break; + } + case M_UPDATE_RULE: + { + fChanges = true; + FilerRule* rule; + if (message->FindPointer("item", (void**)&rule) == B_OK) + { + int64 id; + if (message->FindInt64("id",&id) != B_OK) + debugger("Couldn't find update ID"); + + for (int32 i = 0; i < fRuleList->CountItems(); i++) + { + FilerRule* oldrule = fRuleList->ItemAt(i); + if (oldrule->GetID() == id) + { + *oldrule = *rule; + RuleItem* item = (RuleItem*)fRuleItemList->ItemAt(i); + item->SetText(rule->GetDescription()); + break; + } + } + delete rule; + } + break; + } + case M_REVERT: + { + while (fRuleItemList->CountItems() > 0) + RemoveRule((RuleItem*)fRuleItemList->ItemAt(0L)); + fRuleList->MakeEmpty(); + fEditButton->SetEnabled(false); + fRemoveButton->SetEnabled(false); + + LoadRules(fRuleList); + break; + } + case M_RULE_SELECTED: + { + bool value = (fRuleItemList->CurrentSelection() >= 0); + + fEditButton->SetEnabled(value); + fRemoveButton->SetEnabled(value); + + if (fRuleItemList->CountItems() > 1) { + fMoveUpButton->SetEnabled(value); + fMoveDownButton->SetEnabled(value); + } + break; + } + case M_MOVE_RULE_UP: + { + fChanges = true; + int32 selection = fRuleItemList->CurrentSelection(); + if (selection < 1) + break; + + fRuleItemList->SwapItems(selection, selection - 1); + fRuleList->SwapItems(selection, selection - 1); + break; + } + case M_MOVE_RULE_DOWN: + { + fChanges = true; + int32 selection = fRuleItemList->CurrentSelection(); + if (selection > fRuleItemList->CountItems() - 1) + break; + + fRuleItemList->SwapItems(selection, selection + 1); + fRuleList->SwapItems(selection, selection + 1); + break; + } + default: + BView::MessageReceived(message); + break; + } +} + + +void +RuleTab::AddRule(FilerRule* rule) +{ + fRuleList->AddItem(rule); + fRuleItemList->AddItem(new RuleItem(rule)); + + if (fRuleItemList->CurrentSelection() < 0) + fRuleItemList->Select(0L); +} + + +void +RuleTab::RemoveRule(RuleItem* item) +{ + // Select a new rule (if there is one) before removing the old one. BListView simply drops + // the selection if the selected item is removed. What a pain in the neck. :/ + int32 itemindex = fRuleItemList->IndexOf(item); + int32 selection = fRuleItemList->CurrentSelection(); + if (itemindex == selection && fRuleItemList->CountItems() > 1) { + if (selection == fRuleItemList->CountItems() - 1) + selection--; + else + selection++; + fRuleItemList->Select(selection); + } + + fRuleItemList->RemoveItem(item); + + FilerRule* rule = item->Rule(); + fRuleList->RemoveItem(rule); + delete item; + + if (fRuleItemList->CountItems() <= 0) { + fEditButton->SetEnabled(false); + fRemoveButton->SetEnabled(false); + } + + if (fRuleItemList->CountItems() < 2) { + fMoveUpButton->SetEnabled(false); + fMoveDownButton->SetEnabled(false); + } +} + + +void +RuleTab::MakeEmpty() +{ + for (int32 i = fRuleItemList->CountItems() - 1; i >= 0; i--) + { + RuleItem* item = (RuleItem*)fRuleItemList->RemoveItem(i); + delete item; + } +} diff --git a/sources/Filer/RuleTab.h b/sources/Filer/RuleTab.h new file mode 100644 index 0000000..0a877e5 --- /dev/null +++ b/sources/Filer/RuleTab.h @@ -0,0 +1,52 @@ +/* + * Copyright 2008, 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * DarkWyrm , Copyright 2008 + * Humdinger, humdingerb@gmail.com + */ +#ifndef RULETAB_H +#define RULETAB_H + +#include +#include +#include + +#include "ObjectList.h" + +class RuleItem; +class FilerRule; + +class RuleTab : public BView +{ +public: + RuleTab(); + ~RuleTab(); + + virtual void AttachedToWindow(); + virtual void DetachedFromWindow(); + void MessageReceived(BMessage* message); + +private: + void _BuildLayout(); + + void AddRule(FilerRule* rule); + void RemoveRule(RuleItem* item); + void MakeEmpty(); + + BObjectList*fRuleList; + + BButton* fAddButton; + BButton* fEditButton; + BButton* fRemoveButton; + BButton* fMoveUpButton; + BButton* fMoveDownButton; + + BListView* fRuleItemList; + BScrollView* fScrollView; + bool fChanges; +}; + + +#endif // RULETAB_H diff --git a/sources/AutoFiler/TypedRefFilter.cpp b/sources/Filer/TypedRefFilter.cpp similarity index 100% rename from sources/AutoFiler/TypedRefFilter.cpp rename to sources/Filer/TypedRefFilter.cpp diff --git a/sources/AutoFiler/TypedRefFilter.h b/sources/Filer/TypedRefFilter.h similarity index 100% rename from sources/AutoFiler/TypedRefFilter.h rename to sources/Filer/TypedRefFilter.h diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index 404fda3..6296871 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -13,7 +13,7 @@ #include "main.h" #include "FilerRule.h" -#include "PrefsWindow.h" +#include "MainWindow.h" #include "RuleRunner.h" // Created upon startup instead of when spawning a RuleEditWindow for @@ -27,7 +27,7 @@ App::App(void) : BApplication("application/x-vnd.dw-Filer"), fRefList(NULL), fRuleList(NULL), - fPrefsWin(NULL), + fMainWin(NULL), fQuitRequested(false) { fRefList = new BObjectList(20,true); @@ -123,8 +123,8 @@ App::ReadyToRun(void) } else { - fPrefsWin = new PrefsWindow(); - fPrefsWin->Show(); + fMainWin = new MainWindow(); + fMainWin->Show(); } } diff --git a/sources/Filer/main.h b/sources/Filer/main.h index 4ae743d..ab1416e 100644 --- a/sources/Filer/main.h +++ b/sources/Filer/main.h @@ -13,7 +13,7 @@ #include "ObjectList.h" class FilerRule; -class PrefsWindow; +class MainWindow; class App : public BApplication { @@ -32,7 +32,7 @@ class App : public BApplication private: BObjectList *fRefList; BObjectList *fRuleList; - PrefsWindow *fPrefsWin; + MainWindow *fMainWin; bool fQuitRequested; }; From 711dc0f1e893450c3546c844b6f88879f4e35f13 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 23 Apr 2016 11:09:50 +0200 Subject: [PATCH 02/10] Implement a drop zone. The start tab "Drop zone" has a view that accepts dropped files. The drop message gets forwarded to the main app which processes the files. Removed some cruft. --- sources/Filer/DropZone.cpp | 53 +++++++++++++++++++++++++++++++++++ sources/Filer/DropZone.h | 26 +++++++++++++++++ sources/Filer/DropZoneTab.cpp | 49 ++------------------------------ sources/Filer/DropZoneTab.h | 17 ++++------- sources/Filer/MainWindow.cpp | 2 +- sources/Filer/Makefile | 4 +-- sources/Filer/main.cpp | 26 ++++++++++------- sources/Filer/main.h | 2 ++ 8 files changed, 109 insertions(+), 70 deletions(-) create mode 100644 sources/Filer/DropZone.cpp create mode 100644 sources/Filer/DropZone.h diff --git a/sources/Filer/DropZone.cpp b/sources/Filer/DropZone.cpp new file mode 100644 index 0000000..926fb72 --- /dev/null +++ b/sources/Filer/DropZone.cpp @@ -0,0 +1,53 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#include + +#include "main.h" +#include "DropZone.h" + + +DropZone::DropZone() + : + BView("dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE) +{ +} + + +DropZone::~DropZone() +{ +} + + +void +DropZone::Draw(BRect rect) +{ + SetDrawingMode(B_OP_ALPHA); + + SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT)); + SetLowColor(0, 0, 0, 0); + + BRect bounds = Bounds(); + StrokeRect(bounds); + FillRect(bounds.InsetBySelf(3, 3), stripePattern); + + BView::Draw(rect); +} + + +void +DropZone::MessageReceived(BMessage* message) +{ + if (message->WasDropped()) { + BMessenger messenger(be_app); + message->what = B_REFS_RECEIVED; + messenger.SendMessage(message); + } + + BView::MessageReceived(message); +} diff --git a/sources/Filer/DropZone.h b/sources/Filer/DropZone.h new file mode 100644 index 0000000..4ef889c --- /dev/null +++ b/sources/Filer/DropZone.h @@ -0,0 +1,26 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ +#ifndef DROPZONE_H +#define DROPZONE_H + +#include + +const pattern stripePattern = {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}; + +class DropZone : public BView +{ +public: + DropZone(); + ~DropZone(); + + virtual void Draw(BRect rect); + void MessageReceived(BMessage* message); +}; + + +#endif // DROPZONE_H diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index 0403596..9af4974 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -12,67 +12,24 @@ #include "DropZoneTab.h" -enum -{ - M_REPLICATE = 'repl' -}; - DropZoneTab::DropZoneTab() : BView("Drop zone", B_SUPPORTS_LAYOUT) -{ - _BuildLayout(); -} - - -DropZoneTab::~DropZoneTab() -{ -} - - -void -DropZoneTab::_BuildLayout() { BStringView* zoneLabel = new BStringView("zonelabel", "Drag and drop the files to be processed below."); zoneLabel->SetAlignment(B_ALIGN_CENTER); - fDropzone = new BView("dropzone", B_SUPPORTS_LAYOUT); - - fRepliButton = new BButton("replibutton", - "Replicate!", new BMessage(M_REPLICATE)); + fDropzone = new DropZone(); static const float spacing = be_control_look->DefaultItemSpacing(); BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING) .SetInsets(spacing) .Add(zoneLabel) - .Add(fDropzone) - .Add(fRepliButton); + .Add(fDropzone); } -void -DropZoneTab::AttachedToWindow() -{ -// SetFlags(Flags() | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); - - fRepliButton->SetTarget(this); -// fDropzone->SetTarget(this); - - BView::AttachedToWindow(); -} - - -void -DropZoneTab::MessageReceived(BMessage *message) +DropZoneTab::~DropZoneTab() { - switch (message->what) - { - case M_REPLICATE: - { - break; - } - default: - BView::MessageReceived(message); - } } diff --git a/sources/Filer/DropZoneTab.h b/sources/Filer/DropZoneTab.h index 2ac4abf..3d21754 100644 --- a/sources/Filer/DropZoneTab.h +++ b/sources/Filer/DropZoneTab.h @@ -1,31 +1,26 @@ /* - * Copyright 2008, 2016. All rights reserved. + * Copyright 2016. All rights reserved. * Distributed under the terms of the MIT license. * - * Authors: - * DarkWyrm , Copyright 2008 + * Author: * Humdinger, humdingerb@gmail.com */ + #ifndef DROPZONETAB_H #define DROPZONETAB_H -#include #include +#include "DropZone.h" + class DropZoneTab : public BView { public: DropZoneTab(); ~DropZoneTab(); - - virtual void AttachedToWindow(); - void MessageReceived(BMessage* message); private: - void _BuildLayout(); - - BButton* fRepliButton; - BView* fDropzone; + DropZone* fDropzone; }; diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp index 9e6c47e..344a653 100644 --- a/sources/Filer/MainWindow.cpp +++ b/sources/Filer/MainWindow.cpp @@ -25,7 +25,7 @@ MainWindow::MainWindow() : - BWindow(BRect(50, 50, 400, 400), B_TRANSLATE_SYSTEM_NAME("Filer"), + BWindow(BRect(50, 50, 400, 350), B_TRANSLATE_SYSTEM_NAME("Filer"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) { _BuildLayout(); diff --git a/sources/Filer/Makefile b/sources/Filer/Makefile index fb852f9..b5bdf2e 100644 --- a/sources/Filer/Makefile +++ b/sources/Filer/Makefile @@ -30,8 +30,8 @@ APP_MIME_SIG = application/x-vnd.dw-Filer # Also note that spaces in folder names do not work well with this Makefile. SRCS = AutoFilerTab.cpp FilerRule.cpp FSUtils.cpp main.cpp PatternProcessor.cpp \ RuleRunner.cpp ActionView.cpp AutoTextControl.cpp CppSQLite3.cpp Database.cpp \ - DropZoneTab.cpp MainWindow.cpp RefStorage.cpp RuleEditWindow.cpp RuleItem.cpp \ - RuleTab.cpp TypedRefFilter.cpp TestView.cpp + DropZone.cpp DropZoneTab.cpp MainWindow.cpp RefStorage.cpp RuleEditWindow.cpp \ + RuleItem.cpp RuleTab.cpp TypedRefFilter.cpp TestView.cpp # Specify the resource definition files to use. Full or relative paths can be # used. diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index 6296871..59f6cc1 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -65,6 +65,7 @@ App::RefsReceived(BMessage *msg) int32 i = 0; while (msg->FindRef("refs",i, &tempRef) == B_OK) { + printf ("File dropped: %s\n", tempRef.name); BEntry entry(&tempRef); if (entry.Exists()) { @@ -82,6 +83,7 @@ App::RefsReceived(BMessage *msg) printf("No files given could be processed. Exiting.\n"); fQuitRequested = true; } + ProcessFiles(); } @@ -112,23 +114,27 @@ App::ArgvReceived(int32 argc, char **argv) void App::ReadyToRun(void) { - if (fRefList->CountItems() > 0 || fQuitRequested) - { - for (int32 i = 0; i < fRefList->CountItems(); i++) - { - entry_ref ref = *fRefList->ItemAt(i); - FileRef(ref); - } + if (fRefList->CountItems() > 0 || fQuitRequested) { + ProcessFiles(); PostMessage(B_QUIT_REQUESTED); - } - else - { + } else { fMainWin = new MainWindow(); fMainWin->Show(); } } +void +App::ProcessFiles() +{ + for (int32 i = 0; i < fRefList->CountItems(); i++) + { + entry_ref ref = *fRefList->ItemAt(i); + FileRef(ref); + } +} + + void App::FileRef(entry_ref ref) { diff --git a/sources/Filer/main.h b/sources/Filer/main.h index ab1416e..97bc76d 100644 --- a/sources/Filer/main.h +++ b/sources/Filer/main.h @@ -30,6 +30,8 @@ class App : public BApplication void FileRef(entry_ref ref); private: + void ProcessFiles(); + BObjectList *fRefList; BObjectList *fRuleList; MainWindow *fMainWin; From 910b387697a25bcdab641a7dc47582ce539d7e1e Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 23 Apr 2016 18:06:56 +0200 Subject: [PATCH 03/10] Consistent coding style Removed no longer in use files. --- sources/Filer/ActionView.cpp | 161 +++-- sources/Filer/ActionView.h | 40 +- sources/Filer/AutoFilerTab.cpp | 25 +- sources/Filer/AutoFilerTab.h | 5 +- sources/Filer/AutoTextControl.cpp | 111 ++-- sources/Filer/AutoTextControl.h | 64 +- sources/Filer/Database.cpp | 113 ++-- sources/Filer/Database.h | 15 +- sources/Filer/DropZone.cpp | 2 +- sources/Filer/DropZone.h | 2 +- sources/Filer/DropZoneTab.cpp | 1 + sources/Filer/DropZoneTab.h | 7 +- sources/Filer/EscapeCancelFilter.h | 54 -- sources/Filer/FSUtils.cpp | 181 +++--- sources/Filer/FSUtils.h | 19 +- sources/Filer/FilerRule.cpp | 85 +-- sources/Filer/FilerRule.h | 50 +- sources/Filer/FilerTypes.h | 2 +- sources/Filer/MainWindow.cpp | 8 +- sources/Filer/MainWindow.h | 2 +- sources/Filer/PatternProcessor.cpp | 124 ++-- sources/Filer/PatternProcessor.h | 5 +- sources/Filer/PrefsWindow.cpp | 374 ------------ sources/Filer/PrefsWindow.h | 48 -- sources/Filer/RefStorage.cpp | 51 +- sources/Filer/RefStorage.h | 14 +- sources/Filer/RuleEditWindow.cpp | 292 +++++---- sources/Filer/RuleEditWindow.h | 65 +- sources/Filer/RuleItem.cpp | 17 +- sources/Filer/RuleItem.h | 17 +- sources/Filer/RuleRunner.cpp | 945 ++++++++++++++--------------- sources/Filer/RuleRunner.h | 45 +- sources/Filer/RuleTab.cpp | 7 +- sources/Filer/TestView.cpp | 459 +++++++------- sources/Filer/TestView.h | 52 +- sources/Filer/TypedRefFilter.cpp | 40 +- sources/Filer/TypedRefFilter.h | 31 +- sources/Filer/main.cpp | 93 ++- sources/Filer/main.h | 32 +- 39 files changed, 1584 insertions(+), 2074 deletions(-) delete mode 100644 sources/Filer/EscapeCancelFilter.h delete mode 100644 sources/Filer/PrefsWindow.cpp delete mode 100644 sources/Filer/PrefsWindow.h diff --git a/sources/Filer/ActionView.cpp b/sources/Filer/ActionView.cpp index 5c3a6b6..122dc90 100644 --- a/sources/Filer/ActionView.cpp +++ b/sources/Filer/ActionView.cpp @@ -3,15 +3,16 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ -#include "ActionView.h" + #include -#include -#include #include +#include +#include #include -#include "RuleRunner.h" -#include "AutoTextControl.h" +#include "ActionView.h" +#include "AutoTextControl.h" +#include "RuleRunner.h" enum { @@ -21,111 +22,110 @@ enum }; -ActionView::ActionView(const BRect &frame,const char *name, BMessage *action, - const int32 &resize,const int32 &flags) - : BView(frame,name,resize,flags | B_FRAME_EVENTS), +ActionView::ActionView(const BRect& frame, const char* name, BMessage* action, + const int32& resize, const int32& flags) + : + BView(frame, name, resize, flags | B_FRAME_EVENTS), fAction(NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - + // Find the longest name in all the actions RuleRunner::GetActions(fActions); int32 i = 0; BString actionstr, wideststr; - while (fActions.FindString("actions",i,&actionstr) == B_OK) + while (fActions.FindString("actions", i, &actionstr) == B_OK) { i++; if (actionstr.CountChars() > wideststr.CountChars()) wideststr = actionstr; } - - fActionButton = new BButton(BRect(0,0,1,1),"actionbutton",wideststr.String(), - new BMessage(M_SHOW_ACTION_MENU)); + + fActionButton = new BButton(BRect(0, 0, 1, 1), "actionbutton", + wideststr.String(), new BMessage(M_SHOW_ACTION_MENU)); fActionButton->ResizeToPreferred(); AddChild(fActionButton); - + BRect rect = fActionButton->Frame(); - rect.OffsetBy(rect.Width() + 5,0); + rect.OffsetBy(rect.Width() + 5, 0); rect.right = Bounds().Width() - 10.0; if (rect.right < rect.left) rect.right = rect.left + 10; - - fValueBox = new AutoTextControl(rect,"valuebox",NULL,NULL, - new BMessage(M_VALUE_CHANGED), - B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + + fValueBox = new AutoTextControl(rect, "valuebox", NULL, NULL, + new BMessage(M_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); AddChild(fValueBox); fValueBox->SetDivider(0); - + bool usedefaults = false; - if (action) - { + if (action) { fAction = new BMessage(*action); - + BString str; - if (fAction->FindString("name",&str) == B_OK) + if (fAction->FindString("name", &str) == B_OK) SetAction(str.String()); else usedefaults = true; - - if (!usedefaults && fAction->FindString("value",&str) == B_OK) + + if (!usedefaults && fAction->FindString("value", &str) == B_OK) fValueBox->SetText(str.String()); else usedefaults = true; - } - else + } else usedefaults = true; - - if (usedefaults) - { + + if (usedefaults) { if (!fAction) fAction = new BMessage; - + BString str; - if (fActions.FindString("actions",0,&str) == B_OK) + if (fActions.FindString("actions", 0, &str) == B_OK) SetAction(str.String()); else SetAction("Nothing"); - + fValueBox->SetText(""); } } -ActionView::~ActionView(void) +ActionView::~ActionView() { delete fAction; } void -ActionView::AttachedToWindow(void) +ActionView::AttachedToWindow() { fActionButton->SetTarget(this); fValueBox->SetTarget(this); - + // This seems stupid, but without it, fValueBox is *never* resized and I // can't find the cause of it. :( fValueBox->ResizeTo(Bounds().Width() - fValueBox->Frame().left, - fValueBox->Bounds().Height()); - if (fValueBox->Bounds().Height() < fActionButton->Bounds().Height()) - fValueBox->MoveBy(0.0,(fActionButton->Bounds().Height() - fValueBox->Bounds().Height()) / 2.0); + fValueBox->Bounds().Height()); + if (fValueBox->Bounds().Height() < fActionButton->Bounds().Height()) { + fValueBox->MoveBy(0.0, (fActionButton->Bounds().Height() + - fValueBox->Bounds().Height()) / 2.0); + } } BRect -ActionView::GetPreferredSize(void) +ActionView::GetPreferredSize() { - BRect rect(0.0,0.0,10.0,10.0); - + BRect rect(0.0, 0.0, 10.0, 10.0); + rect.bottom = fActionButton->Frame().Height(); rect.right = StringWidth("Move it to the Trash") + 5.0 + 100; - + return rect; } void -ActionView::ResizeToPreferred(void) +ActionView::ResizeToPreferred() { BRect rect = GetPreferredSize(); ResizeTo(rect.Width(),rect.Height()); @@ -133,7 +133,7 @@ ActionView::ResizeToPreferred(void) void -ActionView::MessageReceived(BMessage *msg) +ActionView::MessageReceived(BMessage* msg) { switch (msg->what) { @@ -145,17 +145,17 @@ ActionView::MessageReceived(BMessage *msg) case M_ACTION_CHOSEN: { BString name; - if (msg->FindString("name",&name) == B_OK) + if (msg->FindString("name", &name) == B_OK) SetAction(name.String()); break; } case M_VALUE_CHANGED: { BString str; - if (fAction->FindString("value",&str) == B_OK) - fAction->ReplaceString("value",fValueBox->Text()); + if (fAction->FindString("value", &str) == B_OK) + fAction->ReplaceString("value", fValueBox->Text()); else - fAction->AddString("value",fValueBox->Text()); + fAction->AddString("value", fValueBox->Text()); break; } default: @@ -166,33 +166,30 @@ ActionView::MessageReceived(BMessage *msg) } -BMessage * -ActionView::GetAction(void) const +BMessage* +ActionView::GetAction() const { return fAction; } void -ActionView::SetAction(const char *name) +ActionView::SetAction(const char* name) { BString namestr(name); - if (fAction->FindString("name",&namestr) == B_OK) - fAction->ReplaceString("name",name); + if (fAction->FindString("name", &namestr) == B_OK) + fAction->ReplaceString("name", name); else - fAction->AddString("name",name); + fAction->AddString("name", name); fActionButton->SetLabel(name); - + namestr = name; - - if (namestr.FindFirst("…") >= 0) - { + + if (namestr.FindFirst("…") >= 0) { if (fValueBox->IsHidden()) fValueBox->Show(); - } - else - { + } else { if (!fValueBox->IsHidden()) fValueBox->Hide(); } @@ -200,35 +197,35 @@ ActionView::SetAction(const char *name) void -ActionView::ShowActionMenu(void) +ActionView::ShowActionMenu() { - BPopUpMenu *menu = new BPopUpMenu(""); - BMessage *msg; + BPopUpMenu* menu = new BPopUpMenu(""); + BMessage* msg; int32 i = 0; BString name; - while (fActions.FindString("actions",i,&name) == B_OK) + while (fActions.FindString("actions", i, &name) == B_OK) { i++; msg = new BMessage(M_ACTION_CHOSEN); - msg->AddString("name",name.String()); + msg->AddString("name", name.String()); menu->AddItem(new BMenuItem(name.String(), msg)); } - + menu->SetTargetForItems(this); - - BPoint pt; + + BPoint point; uint32 buttons; - GetMouse(&pt,&buttons); - ConvertToScreen(&pt); - pt.x -= 10.0; - if (pt.x < 0.0) - pt.x = 0.0; - - pt.y -= 10.0; - if (pt.y < 0.0) - pt.y = 0.0; - + GetMouse(&point, &buttons); + ConvertToScreen(&point); + point.x -= 10.0; + if (point.x < 0.0) + point.x = 0.0; + + point.y -= 10.0; + if (point.y < 0.0) + point.y = 0.0; + menu->SetAsyncAutoDestruct(true); - menu->Go(pt,true,true,true); + menu->Go(point, true, true, true); } diff --git a/sources/Filer/ActionView.h b/sources/Filer/ActionView.h index 5b5b411..a1ab48b 100644 --- a/sources/Filer/ActionView.h +++ b/sources/Filer/ActionView.h @@ -3,11 +3,12 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef ACTIONVIEW_H #define ACTIONVIEW_H -#include #include +#include class AutoTextControl; @@ -16,28 +17,29 @@ class AutoTextControl; class ActionView : public BView { public: - ActionView(const BRect &frame,const char *name, - BMessage *test = NULL, - const int32 &resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, - const int32 &flags = B_WILL_DRAW); - ~ActionView(void); - void AttachedToWindow(void); - BRect GetPreferredSize(void); - void ResizeToPreferred(void); - void MessageReceived(BMessage *msg); - BMessage * GetAction(void) const; - + ActionView(const BRect& frame, const char* name, + BMessage* test = NULL, + const int32& resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, + const int32& flags = B_WILL_DRAW); + ~ActionView(); + + void AttachedToWindow(); + BRect GetPreferredSize(); + void ResizeToPreferred(); + void MessageReceived(BMessage* msg); + + BMessage* GetAction() const; + private: - void ShowActionMenu(void); - void SetAction(const char *name -); + void ShowActionMenu(); + void SetAction(const char* name); - BButton *fActionButton; + BButton* fActionButton; - AutoTextControl *fValueBox; + AutoTextControl* fValueBox; - BMessage *fAction; + BMessage* fAction; BMessage fActions; }; -#endif +#endif // ACTIONVIEW_H diff --git a/sources/Filer/AutoFilerTab.cpp b/sources/Filer/AutoFilerTab.cpp index 903c819..c981df1 100644 --- a/sources/Filer/AutoFilerTab.cpp +++ b/sources/Filer/AutoFilerTab.cpp @@ -6,6 +6,7 @@ * DarkWyrm , Copyright 2008 * Humdinger, humdingerb@gmail.com */ + #include #include #include @@ -39,7 +40,8 @@ AutoFilerTab::AutoFilerTab() LoadFolders(); _BuildLayout(); -// fRefFilter = new TypedRefFilter("application/x-vnd.Be-directory",B_DIRECTORY_NODE); +// fRefFilter = new TypedRefFilter("application/x-vnd.Be-directory", +// B_DIRECTORY_NODE); fRefFilter = new TypedRefFilter("", B_DIRECTORY_NODE); fFilePanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), NULL, B_DIRECTORY_NODE, false, NULL, fRefFilter); @@ -141,8 +143,8 @@ AutoFilerTab::AttachedToWindow() if (fFolderList->CountItems() > 0) { BMessenger messenger(this); - BMessage message(M_FOLDER_SELECTED); - messenger.SendMessage(&message); + BMessage msg(M_FOLDER_SELECTED); + messenger.SendMessage(&msg); } BView::AttachedToWindow(); } @@ -162,9 +164,10 @@ AutoFilerTab::DetachedFromWindow() path.Append(gPrefsPath); BNode node(path.Path()); - if (node.InitCheck() == B_OK) - node.WriteAttr("autorun",B_BOOL_TYPE,0,(void*)&autorun,sizeof(bool)); - + if (node.InitCheck() == B_OK) { + node.WriteAttr("autorun", B_BOOL_TYPE, 0, + (void*)&autorun, sizeof(bool)); + } if (autorun) EnableAutorun(); else @@ -181,9 +184,9 @@ AutoFilerTab::DetachedFromWindow() void -AutoFilerTab::MessageReceived(BMessage *message) +AutoFilerTab::MessageReceived(BMessage* msg) { - switch (message->what) + switch (msg->what) { case M_SHOW_ADD_PANEL: { @@ -232,11 +235,11 @@ AutoFilerTab::MessageReceived(BMessage *message) case M_FOLDER_CHOSEN: { int32 index; - if (message->FindInt32("index", &index) != B_OK) + if (msg->FindInt32("index", &index) != B_OK) index = -1; entry_ref ref; - if (message->FindRef("refs", &ref) != B_OK) + if (msg->FindRef("refs", &ref) != B_OK) break; BStringItem* item = (BStringItem*)fFolderList->ItemAt(index); @@ -259,7 +262,7 @@ AutoFilerTab::MessageReceived(BMessage *message) break; } default: - BView::MessageReceived(message); + BView::MessageReceived(msg); } } diff --git a/sources/Filer/AutoFilerTab.h b/sources/Filer/AutoFilerTab.h index cf78b74..2e9e0c9 100644 --- a/sources/Filer/AutoFilerTab.h +++ b/sources/Filer/AutoFilerTab.h @@ -6,6 +6,7 @@ * DarkWyrm , Copyright 2008 * Humdinger, humdingerb@gmail.com */ + #ifndef AUTOFILERTAB_H #define AUTOFILERTAB_H @@ -23,9 +24,10 @@ class AutoFilerTab : public BView public: AutoFilerTab(); ~AutoFilerTab(); + virtual void AttachedToWindow(); virtual void DetachedFromWindow(); - void MessageReceived(BMessage* message); + void MessageReceived(BMessage* msg); private: void _BuildLayout(); @@ -46,5 +48,4 @@ class AutoFilerTab : public BView TypedRefFilter* fRefFilter; }; - #endif // AUTOFILERTAB_H diff --git a/sources/Filer/AutoTextControl.cpp b/sources/Filer/AutoTextControl.cpp index de35229..50b6cd8 100644 --- a/sources/Filer/AutoTextControl.cpp +++ b/sources/Filer/AutoTextControl.cpp @@ -3,6 +3,7 @@ Written by DarkWyrm , Copyright 2007 Released under the MIT license. */ + #include "AutoTextControl.h" #include #include @@ -12,19 +13,23 @@ static property_info sProperties[] = { { "CharacterLimit", { B_GET_PROPERTY, 0 }, { B_DIRECT_SPECIFIER, 0 }, - "Returns the maximum number of characters that the AutoTextControl will allow.", + "Returns the maximum number of characters " + "that the AutoTextControl will allow.", 0, { B_INT32_TYPE } }, { "CharacterLimit", { B_SET_PROPERTY, 0 }, { B_DIRECT_SPECIFIER, 0}, - "Sets the maximum number of characters that the AutoTextControl will allow.", + "Sets the maximum number of characters " + "that the AutoTextControl will allow.", 0, { B_INT32_TYPE } }, }; -AutoTextControl::AutoTextControl(const BRect &frame, const char *name, const char *label, - const char *text, BMessage *msg, uint32 resize, uint32 flags) - : BTextControl(frame,name,label,text,msg,resize,flags), +AutoTextControl::AutoTextControl(const BRect& frame, const char* name, + const char* label, const char* text, BMessage* msg, uint32 resize, + uint32 flags) + : + BTextControl(frame ,name, label, text, msg, resize, flags), fFilter(NULL), fCharLimit(0) { @@ -32,7 +37,7 @@ AutoTextControl::AutoTextControl(const BRect &frame, const char *name, const cha } -AutoTextControl::~AutoTextControl(void) +AutoTextControl::~AutoTextControl() { if (Window()) Window()->RemoveCommonFilter(fFilter); @@ -41,16 +46,17 @@ AutoTextControl::~AutoTextControl(void) } -AutoTextControl::AutoTextControl(BMessage *data) - : BTextControl(data) +AutoTextControl::AutoTextControl(BMessage* data) + : + BTextControl(data) { - if (data->FindInt32("_charlimit",(int32*)&fCharLimit) != B_OK) + if (data->FindInt32("_charlimit", (int32*)&fCharLimit) != B_OK) fCharLimit = 0; } -BArchivable * -AutoTextControl::Instantiate(BMessage *data) +BArchivable* +AutoTextControl::Instantiate(BMessage* data) { if (validate_instantiation(data, "AutoTextControl")) return new AutoTextControl(data); @@ -60,41 +66,41 @@ AutoTextControl::Instantiate(BMessage *data) status_t -AutoTextControl::Archive(BMessage *data, bool deep) const +AutoTextControl::Archive(BMessage* data, bool deep) const { - status_t status = BTextControl::Archive(data,deep); - + status_t status = BTextControl::Archive(data, deep); + if (status == B_OK) - status = data->AddInt32("_charlimit",fCharLimit); - + status = data->AddInt32("_charlimit", fCharLimit); + if (status == B_OK) - status = data->AddString("class","AutoTextControl"); - + status = data->AddString("class", "AutoTextControl"); + return status; } status_t -AutoTextControl::GetSupportedSuites(BMessage *msg) +AutoTextControl::GetSupportedSuites(BMessage* msg) { - msg->AddString("suites","suite/vnd.DW-autotextcontrol"); - + msg->AddString("suites", "suite/vnd.DW-autotextcontrol"); + BPropertyInfo prop_info(sProperties); - msg->AddFlat("messages",&prop_info); + msg->AddFlat("messages", &prop_info); return BTextControl::GetSupportedSuites(msg); } -BHandler * -AutoTextControl::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier, - int32 form, const char *property) +BHandler* +AutoTextControl::ResolveSpecifier(BMessage* msg, int32 index, + BMessage* specifier, int32 form, const char* property) { return BControl::ResolveSpecifier(msg, index, specifier, form, property); } void -AutoTextControl::AttachedToWindow(void) +AutoTextControl::AttachedToWindow() { BTextControl::AttachedToWindow(); if (fFilter) @@ -103,95 +109,98 @@ AutoTextControl::AttachedToWindow(void) void -AutoTextControl::DetachedFromWindow(void) +AutoTextControl::DetachedFromWindow() { if (fFilter) Window()->RemoveCommonFilter(fFilter); + BTextControl::DetachedFromWindow(); } void -AutoTextControl::SetCharacterLimit(const uint32 &limit) +AutoTextControl::SetCharacterLimit(const uint32& limit) { fCharLimit = limit; } uint32 -AutoTextControl::GetCharacterLimit(const uint32 &limit) +AutoTextControl::GetCharacterLimit(const uint32& limit) { return fCharLimit; } void -AutoTextControl::SetFilter(AutoTextControlFilter *filter) +AutoTextControl::SetFilter(AutoTextControlFilter* filter) { if (fFilter) { if (Window()) Window()->RemoveCommonFilter(fFilter); delete fFilter; } - + fFilter = filter; if (Window()) Window()->AddCommonFilter(fFilter); } -AutoTextControlFilter::AutoTextControlFilter(AutoTextControl *box) - : BMessageFilter(B_PROGRAMMED_DELIVERY, B_ANY_SOURCE,B_KEY_DOWN), + +AutoTextControlFilter::AutoTextControlFilter(AutoTextControl* box) + : + BMessageFilter(B_PROGRAMMED_DELIVERY, B_ANY_SOURCE, B_KEY_DOWN), fBox(box), fCurrentMessage(NULL) { } -AutoTextControlFilter::~AutoTextControlFilter(void) +AutoTextControlFilter::~AutoTextControlFilter() { } filter_result -AutoTextControlFilter::Filter(BMessage *msg, BHandler **target) +AutoTextControlFilter::Filter(BMessage* msg, BHandler** target) { - int32 rawchar,mod; - msg->FindInt32("raw_char",&rawchar); - msg->FindInt32("modifiers",&mod); - - BView *view = dynamic_cast(*target); - if (!view || strcmp("_input_",view->Name()) != 0) + int32 rawchar, mod; + msg->FindInt32("raw_char", &rawchar); + msg->FindInt32("modifiers", &mod); + + BView* view = dynamic_cast(*target); + if (!view || strcmp("_input_", view->Name()) != 0) return B_DISPATCH_MESSAGE; - AutoTextControl *text = dynamic_cast(view->Parent()); + AutoTextControl* text = dynamic_cast(view->Parent()); if (!text || text != fBox) return B_DISPATCH_MESSAGE; - + fCurrentMessage = msg; - filter_result result = KeyFilter(rawchar,mod); + filter_result result = KeyFilter(rawchar, mod); fCurrentMessage = NULL; - + if (fBox->fCharLimit && result == B_DISPATCH_MESSAGE) { // See to it that we still allow shortcut keys if (mod & B_COMMAND_KEY) return B_DISPATCH_MESSAGE; - - // We don't use strlen() because it is not UTF-8 aware, which can affect - // how many characters can be typed. + + // We don't use strlen() because it is not UTF-8 aware, which can + // affect how many characters can be typed. if (isprint(rawchar) && (uint32)BString(text->Text()).CountChars() == text->fCharLimit) return B_SKIP_MESSAGE; } - + return result; } filter_result -AutoTextControlFilter::KeyFilter(const int32 &rawchar, const int32 &mod) +AutoTextControlFilter::KeyFilter(const int32& rawchar, const int32& mod) { if (fBox) fBox->Invoke(); - + return B_DISPATCH_MESSAGE; } diff --git a/sources/Filer/AutoTextControl.h b/sources/Filer/AutoTextControl.h index a69df79..63d5d2f 100644 --- a/sources/Filer/AutoTextControl.h +++ b/sources/Filer/AutoTextControl.h @@ -3,11 +3,12 @@ Written by DarkWyrm , Copyright 2007 Released under the MIT license. */ + #ifndef AUTO_TEXT_CONTROL_H #define AUTO_TEXT_CONTROL_H -#include #include +#include class AutoTextControlFilter; @@ -23,36 +24,37 @@ class AutoTextControlFilter; class AutoTextControl : public BTextControl { public: - AutoTextControl(const BRect &frame, const char *name, - const char *label, const char *text, - BMessage *msg, - uint32 resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, - uint32 flags = B_WILL_DRAW | B_NAVIGABLE); - - AutoTextControl(BMessage *data); - static BArchivable * Instantiate(BMessage *data); - virtual status_t Archive(BMessage *data, bool deep = true) const; + AutoTextControl(const BRect& frame, const char* name, + const char* label, const char* text, + BMessage* msg, + uint32 resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, + uint32 flags = B_WILL_DRAW | B_NAVIGABLE); + AutoTextControl(BMessage* data); + virtual ~AutoTextControl(); + + static BArchivable* Instantiate(BMessage* data); + virtual status_t Archive(BMessage* data, bool deep = true) const; - virtual status_t GetSupportedSuites(BMessage *msg); - virtual BHandler * ResolveSpecifier(BMessage *msg, int32 index, - BMessage *specifier, int32 form, - const char *property); + virtual status_t GetSupportedSuites(BMessage* msg); + virtual BHandler* ResolveSpecifier(BMessage* msg, int32 index, + BMessage* specifier, int32 form, + const char* property); - virtual ~AutoTextControl(void); + - virtual void AttachedToWindow(void); - virtual void DetachedFromWindow(void); + virtual void AttachedToWindow(); + virtual void DetachedFromWindow(); - void SetFilter(AutoTextControlFilter *filter); - AutoTextControlFilter * GetFilter(void) { return fFilter; } + void SetFilter(AutoTextControlFilter* filter); + AutoTextControlFilter* GetFilter() { return fFilter; } - void SetCharacterLimit(const uint32 &limit); - uint32 GetCharacterLimit(const uint32 &limit); + void SetCharacterLimit(const uint32& limit); + uint32 GetCharacterLimit(const uint32& limit); private: friend AutoTextControlFilter; - AutoTextControlFilter *fFilter; + AutoTextControlFilter* fFilter; uint32 fCharLimit; }; @@ -68,16 +70,16 @@ class AutoTextControl : public BTextControl class AutoTextControlFilter : public BMessageFilter { public: - AutoTextControlFilter(AutoTextControl *checkview); - ~AutoTextControlFilter(void); - virtual filter_result Filter(BMessage *msg, BHandler **target); - virtual filter_result KeyFilter(const int32 &key, const int32 &mod); + AutoTextControlFilter(AutoTextControl* checkview); + ~AutoTextControlFilter(); + virtual filter_result Filter(BMessage* msg, BHandler** target); + virtual filter_result KeyFilter(const int32& key, const int32& mod); - AutoTextControl * TextControl(void) const { return fBox; } - BMessage * GetCurrentMessage(void) { return fCurrentMessage; } + AutoTextControl* TextControl() const { return fBox; } + BMessage* GetCurrentMessage() { return fCurrentMessage; } private: - AutoTextControl *fBox; - BMessage *fCurrentMessage; + AutoTextControl* fBox; + BMessage* fCurrentMessage; }; -#endif +#endif // AUTO_TEXT_CONTROL_H diff --git a/sources/Filer/Database.cpp b/sources/Filer/Database.cpp index 3b0d07c..6f383ba 100644 --- a/sources/Filer/Database.cpp +++ b/sources/Filer/Database.cpp @@ -3,95 +3,104 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #include "CppSQLite3.h" #include "Database.h" -static const char *sIllegalCharacters[] = +static const char* sIllegalCharacters[] = { "!","@","#","$","%","^","&","*","(",")","-","+","=","{","}","[","]","\\", "|",";",":","'","\"","<",">",",",".","/","?","`","~"," ", NULL }; -static const char *sReplacementCharacters[] = - { "£21£","£40£","£23£","£24£","£25£","£5e£","£26£","£2a£","£28£","£29£","£2d£", - "£2b£","£3d£","£7b£","£7d£","£5b£","£5d£","£5c£","£7c£","£3b£","£3a£","£27£", - "£22£","£3c£","£3e£","£2c£","£2e£","£2f£","£3f£","£60£","£7e£","£20£", NULL +static const char* sReplacementCharacters[] = + { "£21£","£40£","£23£","£24£","£25£","£5e£","£26£","£2a£","£28£","£29£", + "£2d£","£2b£","£3d£","£7b£","£7d£","£5b£","£5d£","£5c£","£7c£","£3b£", + "£3a£","£27£","£22£","£3c£","£3e£","£2c£","£2e£","£2f£","£3f£","£60£", + "£7e£","£20£", NULL }; -static const char *sIllegalWords[]= - { " select "," drop "," create "," delete "," where "," update "," order "," by ", - " and "," or "," in "," between "," aliases "," join "," union "," alter ", - " functions "," group "," into ", " view ", NULL }; -static const char *sReplacementWords[]= - { " ¥select "," ¥drop "," ¥create "," ¥delete "," ¥where "," ¥update "," ¥order "," ¥by ", - " ¥and "," ¥or "," ¥in "," ¥between "," ¥aliases "," ¥join "," ¥union "," ¥alter ", - " ¥functions "," ¥group "," ¥into ", " ¥view ", NULL }; - -BString EscapeIllegalCharacters(const char *instr) +static const char* sIllegalWords[] = + { " select "," drop "," create "," delete "," where "," update "," order ", + " by "," and "," or "," in "," between "," aliases "," join "," union ", + " alter "," functions "," group "," into ", " view ", NULL }; +static const char* sReplacementWords[] = + { " ¥select "," ¥drop "," ¥create "," ¥delete "," ¥where "," ¥update ", + " ¥order "," ¥by "," ¥and "," ¥or "," ¥in "," ¥between "," ¥aliases ", + " ¥join "," ¥union "," ¥alter "," ¥functions "," ¥group "," ¥into ", + " ¥view ", NULL + }; + + +BString +EscapeIllegalCharacters(const char* instr) { - // Because the £ symbol isn't allowed in a category but is a valid database character, - // we'll use it as the escape character for illegal characters - + // Because the £ symbol isn't allowed in a category but is a valid database, + // characterwe'll use it as the escape character for illegal characters + BString string(instr); - if(string.CountChars()<1) + if (string.CountChars() < 1) return string; - + string.RemoveAll("£"); string.RemoveAll("¥"); - - int32 i=0; - while(sIllegalCharacters[i]) + + int32 i = 0; + while (sIllegalCharacters[i]) { - string.ReplaceAll(sIllegalCharacters[i],sReplacementCharacters[i]); + string.ReplaceAll(sIllegalCharacters[i], sReplacementCharacters[i]); i++; } - - // Just to make sure that reserved words aren't used, we'll prefix them with the ¥ character - // for the same reasons that we used £ with bad characters - i=0; - while(sIllegalWords[i]) + + // Just to make sure that reserved words aren't used, we'll prefix them with + // the ¥ character for the same reasons that we used £ with bad characters + i = 0; + while (sIllegalWords[i]) { - string.ReplaceAll(sIllegalWords[i],sReplacementWords[i]); + string.ReplaceAll(sIllegalWords[i], sReplacementWords[i]); i++; } return string; } -BString DeescapeIllegalCharacters(const char *instr) + +BString +DeescapeIllegalCharacters(const char* instr) { BString string(instr); - if(string.CountChars()<1) + if (string.CountChars() < 1) return string; - - int32 i=0; - while(sIllegalCharacters[i]) + + int32 i = 0; + while (sIllegalCharacters[i]) { - string.ReplaceAll(sReplacementCharacters[i],sIllegalCharacters[i]); + string.ReplaceAll(sReplacementCharacters[i], sIllegalCharacters[i]); i++; } - // Just to make sure that reserved words aren't used, we'll prefix them with the ¥ character - // for the same reasons that we used £ with bad characters - i=0; - while(sIllegalWords[i]) + // Just to make sure that reserved words aren't used, we'll prefix them with + // the ¥ character for the same reasons that we used £ with bad characters + i = 0; + while (sIllegalWords[i]) { - string.ReplaceAll(sReplacementWords[i],sIllegalWords[i]); + string.ReplaceAll(sReplacementWords[i], sIllegalWords[i]); i++; } return string; } -void DBCommand(CppSQLite3DB &db, const char *command, const char *functionname) +void +DBCommand(CppSQLite3DB& db, const char* command, const char* functionname) { - if(!command) + if (!command) printf("NULL database command in Database::DBCommand"); - if(!functionname) + if (!functionname) printf("NULL function name in Database::DBCommand"); - + try { db.execDML(command); } - catch(CppSQLite3Exception &e) + catch(CppSQLite3Exception& e) { BString msg("Database Exception in "); msg << functionname << ".\n\n" << e.errorMessage() @@ -100,18 +109,20 @@ void DBCommand(CppSQLite3DB &db, const char *command, const char *functionname) } } -CppSQLite3Query DBQuery(CppSQLite3DB &db, const char *query, const char *functionname) + +CppSQLite3Query +DBQuery(CppSQLite3DB& db, const char* query, const char* functionname) { - if(!query) + if (!query) printf("NULL database command in Database::DBQuery"); - if(!functionname) + if (!functionname) printf("NULL function name in Database::DBQuery"); - + try { return db.execQuery(query); } - catch(CppSQLite3Exception &e) + catch(CppSQLite3Exception& e) { BString msg("Database Exception in "); msg << functionname << ".\n\n" << e.errorMessage() diff --git a/sources/Filer/Database.h b/sources/Filer/Database.h index 46db23f..3f96b08 100644 --- a/sources/Filer/Database.h +++ b/sources/Filer/Database.h @@ -3,17 +3,18 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef DATABASE_H #define DATABASE_H #include -BString EscapeIllegalCharacters(const char *string); -BString DeescapeIllegalCharacters(const char *string); +BString EscapeIllegalCharacters(const char* string); +BString DeescapeIllegalCharacters(const char* string); -void DBCommand(CppSQLite3DB &db, const char *command, - const char *functionname); -CppSQLite3Query DBQuery(CppSQLite3DB &db, const char *query, - const char *functionname); +void DBCommand(CppSQLite3DB& db, const char* command, + const char* functionname); +CppSQLite3Query DBQuery(CppSQLite3DB& db, const char* query, + const char* functionname); -#endif +#endif // DATABASE_H diff --git a/sources/Filer/DropZone.cpp b/sources/Filer/DropZone.cpp index 926fb72..fd02d0b 100644 --- a/sources/Filer/DropZone.cpp +++ b/sources/Filer/DropZone.cpp @@ -8,8 +8,8 @@ #include -#include "main.h" #include "DropZone.h" +#include "main.h" DropZone::DropZone() diff --git a/sources/Filer/DropZone.h b/sources/Filer/DropZone.h index 4ef889c..1332dbb 100644 --- a/sources/Filer/DropZone.h +++ b/sources/Filer/DropZone.h @@ -5,6 +5,7 @@ * Author: * Humdinger, humdingerb@gmail.com */ + #ifndef DROPZONE_H #define DROPZONE_H @@ -22,5 +23,4 @@ class DropZone : public BView void MessageReceived(BMessage* message); }; - #endif // DROPZONE_H diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index 9af4974..2e4a4b7 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -5,6 +5,7 @@ * Author: * Humdinger, humdingerb@gmail.com */ + #include #include #include diff --git a/sources/Filer/DropZoneTab.h b/sources/Filer/DropZoneTab.h index 3d21754..ed884ba 100644 --- a/sources/Filer/DropZoneTab.h +++ b/sources/Filer/DropZoneTab.h @@ -16,12 +16,11 @@ class DropZoneTab : public BView { public: - DropZoneTab(); - ~DropZoneTab(); + DropZoneTab(); + ~DropZoneTab(); private: - DropZone* fDropzone; + DropZone* fDropzone; }; - #endif // DROPZONETAB_H diff --git a/sources/Filer/EscapeCancelFilter.h b/sources/Filer/EscapeCancelFilter.h deleted file mode 100644 index 3d6d145..0000000 --- a/sources/Filer/EscapeCancelFilter.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - EscapeCancelFilter.h: An easy way to quit with the Escape key - Written by DarkWyrm , Copyright 2007 - Released under the MIT license. -*/ -#ifndef ESCAPE_CANCEL_FILTER_H -#define ESCAPE_CANCEL_FILTER_H - -/* - This filter is most often useful in dialog windows where you would - like to allow the user to effectively hit the Cancel button just by - hitting the Escape key. Pass one of these to BWindow::AddCommonFilter - and that is all that is necessary. -*/ - -#include -#include - -class EscapeCancelFilter : public BMessageFilter -{ -public: - EscapeCancelFilter(void) - : BMessageFilter(B_PROGRAMMED_DELIVERY, - B_ANY_SOURCE,B_KEY_DOWN) - { - } - - ~EscapeCancelFilter(void) - { - } - - filter_result Filter(BMessage *msg, BHandler **target) - { - int32 rawchar,mod; - msg->FindInt32("raw_char",&rawchar); - msg->FindInt32("modifiers",&mod); - - if (rawchar == B_ESCAPE && (mod & (B_SHIFT_KEY | B_COMMAND_KEY | - B_OPTION_KEY | B_CONTROL_KEY)) == 0) { - BLooper *loop = (*target)->Looper(); - if (loop) { - BMessenger msgr(loop); - msgr.SendMessage(B_QUIT_REQUESTED); - return B_SKIP_MESSAGE; - } - } - return B_DISPATCH_MESSAGE; - } - -}; - - -#endif - diff --git a/sources/Filer/FSUtils.cpp b/sources/Filer/FSUtils.cpp index b2f85d4..b637750 100644 --- a/sources/Filer/FSUtils.cpp +++ b/sources/Filer/FSUtils.cpp @@ -3,86 +3,88 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ -#include -#include + +#include #include -#include #include +#include +#include +#include #include -#include +#include +#include + +#include #include #include -#include -#include + #include -#include + #include "FSUtils.h" #define COPY_BUFFER_SIZE 1024000 -status_t CheckCopiable(BEntry *src,BEntry *dest) +status_t CheckCopiable(BEntry* src, BEntry* dest) { // Checks to see if we can copy the src to dest. - if(!src || !dest) + if (!src || !dest) return B_ERROR; - - if(!src->Exists()) + + if (!src->Exists()) return B_FILE_NOT_FOUND; // Ensure that when we want the destination directory, that is exactly // what we're working with. If we've been given an entry which is a file, // extract the destination directory. BEntry destdir; - if(dest->IsDirectory()) - destdir=*dest; + if (dest->IsDirectory()) + destdir = *dest; else dest->GetParent(&destdir); - + // check existence of target directory - if(!destdir.Exists()) + if (!destdir.Exists()) return B_NAME_NOT_FOUND; - + // check space entry_ref ref; off_t src_bytes; - dest->GetRef(&ref); BVolume dvolume(ref.device); src->GetSize(&src_bytes); - if(src_bytes>dvolume.FreeBytes()) + if (src_bytes > dvolume.FreeBytes()) return B_DEVICE_FULL; - + // check permissions - if(dvolume.IsReadOnly()) + if (dvolume.IsReadOnly()) return B_READ_ONLY; // check existing name BPath path; destdir.GetPath(&path); - char name[B_FILE_NAME_LENGTH]; src->GetName(name); - BString newpath=path.Path(); - newpath+=name; + BString newpath = path.Path(); + newpath += name; BFile file; - if(file.SetTo(newpath.String(),B_READ_WRITE | B_FAIL_IF_EXISTS)==B_FILE_EXISTS) - { + if (file.SetTo(newpath.String(), + B_READ_WRITE | B_FAIL_IF_EXISTS) == B_FILE_EXISTS) { // We have an existing file, so query the user what to do. status_t returncode; - newpath="The file "; - newpath+=name; - newpath+=" exists. Do you want to replace it?"; - - BAlert *alert=new BAlert("Error",newpath.String(),"Replace file", - "Skip file", "Stop"); - returncode=alert->Go(); - switch(returncode) + newpath = "The file "; + newpath += name; + newpath += " exists. Do you want to replace it?"; + + BAlert* alert = new BAlert("Error", newpath.String(), "Replace file", + "Skip file", "Stop"); + returncode = alert->Go(); + switch (returncode) { case 0: return FS_CLOBBER; @@ -95,157 +97,160 @@ status_t CheckCopiable(BEntry *src,BEntry *dest) return B_OK; } -status_t CopyFile(BEntry *srcentry, BEntry *destentry, bool clobber) + +status_t CopyFile(BEntry* srcentry, BEntry* destentry, bool clobber) { - if(!srcentry || !destentry) + if (!srcentry || !destentry) return B_ERROR; - + if (!destentry->IsDirectory()) return B_ERROR; - + entry_ref ref; srcentry->GetRef(&ref); - + BPath srcpath; srcentry->GetPath(&srcpath); - + BString srcstring(srcpath.Path()); - srcstring.CharacterEscape("'",'\\'); - + srcstring.CharacterEscape("'", '\\'); + BPath destpath; destentry->GetPath(&destpath); - + BString deststring(destpath.Path()); - deststring.CharacterEscape("'",'\\'); - + deststring.CharacterEscape("'", '\\'); + BString command("copyattr -r -d "); command << "'" << srcstring << "' '" << deststring << "/'"; int code = system(command.String()); - - if (!code) - { + + if (!code) { entry_ref ref; srcentry->GetRef(&ref); - + deststring << "/" << ref.name; return srcentry->SetTo(deststring.String()); } - + return code; } -status_t MoveFile(BEntry *srcentry,BEntry *destentry, bool clobber) + +status_t MoveFile(BEntry* srcentry, BEntry* destentry, bool clobber) { - if(!srcentry || !destentry) + if (!srcentry || !destentry) return B_ERROR; - + if (!destentry->IsDirectory()) return B_ERROR; - + BPath srcpath; srcentry->GetPath(&srcpath); - + BString srcstring(srcpath.Path()); - srcstring.CharacterEscape("'",'\\'); - + srcstring.CharacterEscape("'", '\\'); + BPath destpath; destentry->GetPath(&destpath); - + BString deststring(destpath.Path()); - deststring.CharacterEscape("'",'\\'); - + deststring.CharacterEscape("'", '\\'); + BString command("mv "); if (clobber) command << "-f "; command << "'" << srcstring << "' '" << deststring << "/'"; int code = system(command.String()); - if (!code) - { + if (!code) { entry_ref ref; srcentry->GetRef(&ref); - + deststring << "/" << ref.name; return srcentry->SetTo(deststring.String()); } - + return code; } -const char *GetValidName(BEntry *entry) + +const char* GetValidName(BEntry* entry) { // given a particular location, this will (1) check to see if said entry // exists and if it does, generates a filename which will work complete with // the full path. The entry is also set to this new, valid path - + BPath path; entry->GetPath(&path); - if(entry->Exists()) - { + if (entry->Exists()) { // separate into path and leaf char leafbase[B_FILE_NAME_LENGTH]; char newpath[B_PATH_NAME_LENGTH]; strcpy(leafbase, path.Leaf()); path.GetParent(&path); + + int32 attempt = 1; - int32 attempt=1; - - do - { - if(attempt>1) - sprintf(newpath, "%s/%s copy %ld", path.Path(),leafbase, attempt); - else + do { + if (attempt > 1) { + sprintf(newpath, "%s/%s copy %ld", path.Path(),leafbase, + attempt); + } else sprintf(newpath, "%s/%s copy", path.Path(),leafbase); entry->SetTo(newpath); attempt++; } while (entry->Exists()); - + return newpath; } - + return path.Path(); } + bool IsFilenameChar(char c) { // const char validstring[]="1234567890-_ ~.,+=!@#$%^&[]{}"; const char validstring[]="1234567890-_~.,+=!@#$%^&[]{}"; - if( (c>64 && c<91) || (c>96 && c<123)) + if ((c>64 && c < 91) || (c > 96 && c < 123)) return true; - int validlen=strlen(validstring); - for(int i=0;i96 && c1<123) - c1-=32; - if(c2>96 && c2<123) - c2-=32; + if (c1 > 96 && c1 < 123) + c1 -= 32; + if (c2 > 96 && c2 < 123) + c2 -= 32; - if(c1, Copyright 2008 Released under the MIT license. */ + #ifndef FSUTILS_H_ #define FSUTILS_H_ @@ -11,11 +12,13 @@ #define FS_CLOBBER 'fscl' #define FS_SKIP 'fssk' -status_t CheckCopiable(BEntry *src, BEntry *dest); -status_t CopyFile(BEntry *src,BEntry *dest, bool clobber); -status_t MoveFile(BEntry *src,BEntry *dest, bool clobber); -const char *GetValidName(BEntry *entry); -bool IsFilenameChar(char c); -int charcmp(char c1, char c2); -int charncmp(char c1, char c2); -#endif \ No newline at end of file +status_t CheckCopiable(BEntry* src, BEntry* dest); +status_t CopyFile(BEntry* src, BEntry* dest, bool clobber); +status_t MoveFile(BEntry* src, BEntry* dest, bool clobber); + +const char* GetValidName(BEntry* entry); +bool IsFilenameChar(char c); +int charcmp(char c1, char c2); +int charncmp(char c1, char c2); + +#endif // FSUTILS_H_ diff --git a/sources/Filer/FilerRule.cpp b/sources/Filer/FilerRule.cpp index 422aa5a..a8c50d4 100644 --- a/sources/Filer/FilerRule.cpp +++ b/sources/Filer/FilerRule.cpp @@ -5,37 +5,40 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #include "FilerRule.h" static int64 sIDCounter = 0; -FilerRule::FilerRule(void) - : fTestList(NULL), +FilerRule::FilerRule() + : + fTestList(NULL), fActionList(NULL), fMode(FILER_RULE_ALL) { - fTestList = new BObjectList(20,true); - fActionList = new BObjectList(20,true); - + fTestList = new BObjectList(20, true); + fActionList = new BObjectList(20, true); + fID = sIDCounter++; } -FilerRule::FilerRule(FilerRule &rule) - : fTestList(NULL), +FilerRule::FilerRule(FilerRule& rule) + : + fTestList(NULL), fActionList(NULL), fMode(FILER_RULE_ALL) { - fTestList = new BObjectList(20,true); - fActionList = new BObjectList(20,true); - + fTestList = new BObjectList(20, true); + fActionList = new BObjectList(20, true); + fID = sIDCounter++; - + *this = rule; } -FilerRule::~FilerRule(void) +FilerRule::~FilerRule() { delete fTestList; delete fActionList; @@ -43,90 +46,90 @@ FilerRule::~FilerRule(void) void -FilerRule::SetRuleMode(const filer_rule_mode &mode) +FilerRule::SetRuleMode(const filer_rule_mode& mode) { fMode = mode; } -const char * -FilerRule::GetDescription(void) const +const char* +FilerRule::GetDescription() const { return fDescription.String(); } void -FilerRule::SetDescription(const char *desc) +FilerRule::SetDescription(const char* desc) { fDescription = desc; } void -FilerRule::AddTest(BMessage *item, const int32 &index) +FilerRule::AddTest(BMessage* item, const int32& index) { if (index < 0) fTestList->AddItem(item); else - fTestList->AddItem(item,index); + fTestList->AddItem(item, index); } -BMessage * -FilerRule::RemoveTest(const int32 &index) +BMessage* +FilerRule::RemoveTest(const int32& index) { return fTestList->RemoveItemAt(index); } -BMessage * -FilerRule::TestAt(const int32 &index) +BMessage* +FilerRule::TestAt(const int32& index) { return fTestList->ItemAt(index); } int32 -FilerRule::CountTests(void) const +FilerRule::CountTests() const { return fTestList->CountItems(); } void -FilerRule::AddAction(BMessage *item, const int32 &index) +FilerRule::AddAction(BMessage* item, const int32& index) { if (index < 0) fActionList->AddItem(item); else - fActionList->AddItem(item,index); + fActionList->AddItem(item, index); } -BMessage * -FilerRule::RemoveAction(const int32 &index) +BMessage* +FilerRule::RemoveAction(const int32& index) { return fActionList->RemoveItemAt(index); } -BMessage * -FilerRule::ActionAt(const int32 &index) +BMessage* +FilerRule::ActionAt(const int32& index) { return fActionList->ItemAt(index); } int32 -FilerRule::CountActions(void) const +FilerRule::CountActions() const { return fActionList->CountItems(); } void -FilerRule::MakeEmpty(void) +FilerRule::MakeEmpty() { fTestList->MakeEmpty(); fActionList->MakeEmpty(); @@ -134,39 +137,39 @@ FilerRule::MakeEmpty(void) void -FilerRule::PrintToStream(void) +FilerRule::PrintToStream() { - printf("Filer Rule '%s':\n",GetDescription()); + printf("Filer Rule '%s':\n", GetDescription()); for (int32 i = 0; i < fTestList->CountItems(); i++) fTestList->ItemAt(i)->PrintToStream(); - + for (int32 i = 0; i < fActionList->CountItems(); i++) fActionList->ItemAt(i)->PrintToStream(); } -FilerRule & -FilerRule::operator=(FilerRule &from) +FilerRule& +FilerRule::operator=(FilerRule& from) { MakeEmpty(); for (int32 i = 0; i < from.CountTests(); i++) { - BMessage *test = from.TestAt(i); + BMessage* test = from.TestAt(i); if (test) AddTest(new BMessage(*test)); } - + for (int32 i = 0; i < from.CountActions(); i++) { - BMessage *action = from.ActionAt(i); + BMessage* action = from.ActionAt(i); if (action) AddAction(new BMessage(*action)); } - + SetDescription(from.GetDescription()); SetRuleMode(from.GetRuleMode()); - + return *this; } diff --git a/sources/Filer/FilerRule.h b/sources/Filer/FilerRule.h index f982eba..7dd1a31 100644 --- a/sources/Filer/FilerRule.h +++ b/sources/Filer/FilerRule.h @@ -5,13 +5,15 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef FILER_RULE_H #define FILER_RULE_H -#include -#include #include +#include #include +#include + #include "ObjectList.h" typedef enum @@ -24,38 +26,38 @@ typedef enum class FilerRule : public BArchivable { public: - FilerRule(void); - FilerRule(FilerRule &rule); - ~FilerRule(void); + FilerRule(); + FilerRule(FilerRule& rule); + ~FilerRule(); - void SetRuleMode(const filer_rule_mode &mode); - filer_rule_mode GetRuleMode(void) const { return fMode; } + void SetRuleMode(const filer_rule_mode& mode); + filer_rule_mode GetRuleMode() const { return fMode; } - const char * GetDescription(void) const; - void SetDescription(const char *desc); + const char* GetDescription() const; + void SetDescription(const char* desc); - void AddTest(BMessage *item, const int32 &index = -1); - BMessage * RemoveTest(const int32 &index); - BMessage * TestAt(const int32 &index); - int32 CountTests(void) const; + void AddTest(BMessage* item, const int32& index = -1); + BMessage* RemoveTest(const int32& index); + BMessage* TestAt(const int32& index); + int32 CountTests() const; - void AddAction(BMessage *action, const int32 &index = -1); - BMessage * RemoveAction(const int32 &index); - BMessage * ActionAt(const int32 &index); - int32 CountActions(void) const; + void AddAction(BMessage* action, const int32& index = -1); + BMessage* RemoveAction(const int32& index); + BMessage* ActionAt(const int32& index); + int32 CountActions() const; - void MakeEmpty(void); - virtual void PrintToStream(void); - FilerRule & operator=(FilerRule &from); + void MakeEmpty(); + virtual void PrintToStream(); + FilerRule& operator=(FilerRule& from); - int64 GetID(void) const { return fID; } + int64 GetID() const { return fID; } private: - BObjectList *fTestList; - BObjectList *fActionList; + BObjectList* fTestList; + BObjectList* fActionList; filer_rule_mode fMode; BString fDescription; int64 fID; }; -#endif +#endif // FILER_RULE_H diff --git a/sources/Filer/FilerTypes.h b/sources/Filer/FilerTypes.h index 9828cbf..fd16a4e 100644 --- a/sources/Filer/FilerTypes.h +++ b/sources/Filer/FilerTypes.h @@ -8,4 +8,4 @@ typedef enum FILER_NULL_TYPE } filer_data_type; -#endif +#endif // FILER_TYPES_H diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp index 344a653..14fd291 100644 --- a/sources/Filer/MainWindow.cpp +++ b/sources/Filer/MainWindow.cpp @@ -95,14 +95,14 @@ MainWindow::_BuildLayout() void -MainWindow::MessageReceived(BMessage* message) +MainWindow::MessageReceived(BMessage* msg) { -// message->PrintToStream(); - switch (message->what) +// msg->PrintToStream(); + switch (msg->what) { default: { - BWindow::MessageReceived(message); + BWindow::MessageReceived(msg); break; } } diff --git a/sources/Filer/MainWindow.h b/sources/Filer/MainWindow.h index 983cedb..63a973e 100644 --- a/sources/Filer/MainWindow.h +++ b/sources/Filer/MainWindow.h @@ -36,7 +36,7 @@ class MainWindow : public BWindow { virtual ~MainWindow(); bool QuitRequested(); - void MessageReceived(BMessage* message); + void MessageReceived(BMessage* msg); private: void _BuildLayout(); diff --git a/sources/Filer/PatternProcessor.cpp b/sources/Filer/PatternProcessor.cpp index 274dc24..1e89444 100644 --- a/sources/Filer/PatternProcessor.cpp +++ b/sources/Filer/PatternProcessor.cpp @@ -3,13 +3,16 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #include "PatternProcessor.h" -#include -#include + #include #include #include + #include +#include +#include /* Patterns in Filer @@ -33,71 +36,62 @@ %TIME% - The current time %ATTR:xxxx% - An attribute of the file. Note that this needs to be the internal name of the attributes, such as META:email - - */ BString -ProcessPatterns(const char *instr, const entry_ref &ref) +ProcessPatterns(const char* instr, const entry_ref& ref) { if (!instr) return BString(); - + BString outstr(instr); - - + // Handle filename-based patterns - BString basename(ref.name), extension; - + int32 strpos = basename.FindFirst("."); - if (strpos >= 0) - { + if (strpos >= 0) { extension = basename.String() + strpos; basename.Truncate(strpos); } - - outstr.ReplaceAll("%FILENAME%",ref.name); - outstr.ReplaceAll("%BASENAME%",basename.String()); - outstr.ReplaceAll("%EXTENSION%",extension.String()); - + + outstr.ReplaceAll("%FILENAME%", ref.name); + outstr.ReplaceAll("%BASENAME%", basename.String()); + outstr.ReplaceAll("%EXTENSION%", extension.String()); + BString pathstr = BPath(&ref).Path(); - outstr.ReplaceAll("%FULLPATH%",pathstr.String()); - + outstr.ReplaceAll("%FULLPATH%", pathstr.String()); + pathstr.ReplaceLast(BPath(&ref).Leaf(),""); - outstr.ReplaceAll("%FOLDER%",pathstr.String()); - + outstr.ReplaceAll("%FOLDER%", pathstr.String()); + // Date-based patterns time_t currenttime = time(NULL); struct tm timedata = *localtime(¤ttime); - + char timestr[64]; - if (outstr.FindFirst("%DATE%") >= 0) - { - sprintf(timestr,"%.2d-%.2d-%d",timedata.tm_mday,timedata.tm_mon + 1, - timedata.tm_year + 1900); - outstr.ReplaceAll("%DATE%",timestr); + if (outstr.FindFirst("%DATE%") >= 0) { + sprintf(timestr,"%.2d-%.2d-%d",timedata.tm_mday, timedata.tm_mon + 1, + timedata.tm_year + 1900); + outstr.ReplaceAll("%DATE%", timestr); } - - if (outstr.FindFirst("%EURODATE%") >= 0) - { - sprintf(timestr,"%.2d-%.2d-%d",timedata.tm_mon + 1,timedata.tm_mday, - timedata.tm_year + 1900); - outstr.ReplaceAll("%EURODATE%",timestr); + + if (outstr.FindFirst("%EURODATE%") >= 0) { + sprintf(timestr,"%.2d-%.2d-%d",timedata.tm_mon + 1, timedata.tm_mday, + timedata.tm_year + 1900); + outstr.ReplaceAll("%EURODATE%", timestr); } - - if (outstr.FindFirst("%REVERSEDATE%") >= 0) - { - sprintf(timestr,"%d-%.2d-%.2d",timedata.tm_year + 1900,timedata.tm_mon + 1, - timedata.tm_mday); - outstr.ReplaceAll("%REVERSEDATE%",timestr); + + if (outstr.FindFirst("%REVERSEDATE%") >= 0) { + sprintf(timestr,"%d-%.2d-%.2d",timedata.tm_year + 1900, + timedata.tm_mon + 1, timedata.tm_mday); + outstr.ReplaceAll("%REVERSEDATE%", timestr); } - - if (outstr.FindFirst("%TIME%") >= 0) - { - sprintf(timestr,"%.2d:%.2d:%.2d",timedata.tm_hour,timedata.tm_min, - timedata.tm_sec); - outstr.ReplaceAll("%TIME%",timestr); + + if (outstr.FindFirst("%TIME%") >= 0) { + sprintf(timestr,"%.2d:%.2d:%.2d",timedata.tm_hour, timedata.tm_min, + timedata.tm_sec); + outstr.ReplaceAll("%TIME%", timestr); } // Attribute-based patterns @@ -105,48 +99,40 @@ ProcessPatterns(const char *instr, const entry_ref &ref) while (strpos >= 0) { int32 strendpos = outstr.FindFirst("%",strpos + 1); - if (strendpos >= 0) - { - BString string,attrname, attrpattern; + if (strendpos >= 0) { + BString string, attrname, attrpattern; attrname = outstr.String() + strpos; - + attrpattern = attrname; - + attrname.RemoveFirst("%ATTR:"); attrname.RemoveFirst("%"); - + attr_info info; BNode node(&ref); - if (node.InitCheck() != B_OK) - { + if (node.InitCheck() != B_OK) { outstr.RemoveAll(attrpattern.String()); strpos = outstr.FindFirst("%ATTR:"); continue; } - - if (node.GetAttrInfo(attrname.String(),&info) == B_OK) - { - if (info.type == B_STRING_TYPE) - { - node.ReadAttrString(attrname.String(),&string); - outstr.ReplaceAll(attrpattern.String(),string.String()); - } - else if (info.type == B_INT32_TYPE) - { + + if (node.GetAttrInfo(attrname.String(), &info) == B_OK) { + if (info.type == B_STRING_TYPE) { + node.ReadAttrString(attrname.String(), &string); + outstr.ReplaceAll(attrpattern.String(), string.String()); + } else if (info.type == B_INT32_TYPE) { int32 attrdata; - if (node.ReadAttr(attrname.String(),B_INT32_TYPE,0, - (void*)&attrdata,sizeof(int32)) == B_OK) - { + if (node.ReadAttr(attrname.String(), B_INT32_TYPE, 0, + (void*)&attrdata, sizeof(int32)) == B_OK) { string = ""; string << attrdata; - outstr.ReplaceAll(attrpattern.String(),string.String()); + outstr.ReplaceAll(attrpattern.String(), + string.String()); } } } } strpos = outstr.FindFirst("%ATTR:"); } - return outstr; } - diff --git a/sources/Filer/PatternProcessor.h b/sources/Filer/PatternProcessor.h index e499f7b..a92582f 100644 --- a/sources/Filer/PatternProcessor.h +++ b/sources/Filer/PatternProcessor.h @@ -3,12 +3,13 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef PATTERN_PROCESSOR_H #define PATTERN_PROCESSOR_H #include #include -BString ProcessPatterns(const char *instr, const entry_ref &ref); +BString ProcessPatterns(const char* instr, const entry_ref& ref); -#endif +#endif // PATTERN_PROCESSOR_H diff --git a/sources/Filer/PrefsWindow.cpp b/sources/Filer/PrefsWindow.cpp deleted file mode 100644 index b618537..0000000 --- a/sources/Filer/PrefsWindow.cpp +++ /dev/null @@ -1,374 +0,0 @@ -/* - PrefsWindow.cpp: Window class to show and edit settings for the Filer - Released under the MIT license. - Written by DarkWyrm , Copyright 2008 - Contributed by: Humdinger , 2016 -*/ -#include -#include -#include -#include - -#include "FilerRule.h" -#include "PrefsWindow.h" -#include "RuleEditWindow.h" -#include "RuleItem.h" -#include "RuleRunner.h" - -enum -{ - M_SHOW_ADD_WINDOW = 'shaw', - M_SHOW_EDIT_WINDOW = 'shew', - M_REMOVE_RULE = 'shrr', - M_REVERT = 'rvrt', - M_RULE_SELECTED = 'rlsl', - M_MOVE_RULE_UP = 'mvup', - M_MOVE_RULE_DOWN = 'mvdn' -}; - - -PrefsWindow::PrefsWindow(void) - : BWindow(BRect(100,100,450,350),"Filer settings",B_TITLED_WINDOW, - B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE), - fChanges(false) -{ - fRuleList = new BObjectList(20,true); - - AddShortcut('a',B_COMMAND_KEY,new BMessage(M_SHOW_ADD_WINDOW)); - AddShortcut('e',B_COMMAND_KEY,new BMessage(M_SHOW_EDIT_WINDOW)); - - BView *top = new BView(Bounds(),"top",B_FOLLOW_ALL,B_WILL_DRAW); - top->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - AddChild(top); - - BRect rect(Bounds().InsetByCopy(10,10)); - rect.right -= B_V_SCROLL_BAR_WIDTH; - - fRuleItemList = new BListView(rect,"rulelist",B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL); - fScrollView = new BScrollView("listscroll",fRuleItemList, - B_FOLLOW_ALL,0,true,true); - fScrollView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - top->AddChild(fScrollView); - fRuleItemList->SetSelectionMessage(new BMessage(M_RULE_SELECTED)); - fRuleItemList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_WINDOW)); - fScrollView->ScrollBar(B_HORIZONTAL)->SetRange(0.0,0.0); - - fAddButton = new BButton(BRect(0,0,1,1),"addbutton","Add…", - new BMessage(M_SHOW_ADD_WINDOW), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fAddButton->ResizeToPreferred(); - fAddButton->MoveTo(10,Bounds().bottom - 20 - (fAddButton->Bounds().IntegerHeight() * 2)); - top->AddChild(fAddButton); - - fScrollView->ResizeBy(0,(fAddButton->Bounds().IntegerHeight() * -2) - 20 - B_H_SCROLL_BAR_HEIGHT); - - fEditButton = new BButton(BRect(0,0,1,1),"editbutton","Edit…", - new BMessage(M_SHOW_EDIT_WINDOW), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fEditButton->ResizeToPreferred(); - fEditButton->MoveTo((Bounds().Width() - fEditButton->Bounds().Width()) / 2.0, - fAddButton->Frame().top); - top->AddChild(fEditButton); - fEditButton->SetEnabled(false); - - - fRemoveButton = new BButton(BRect(0,0,1,1),"removebutton","Remove", - new BMessage(M_REMOVE_RULE), - B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); - fRemoveButton->ResizeToPreferred(); - fRemoveButton->MoveTo(Bounds().Width() - fRemoveButton->Bounds().Width() - 10, - fAddButton->Frame().top); - top->AddChild(fRemoveButton); - fRemoveButton->SetEnabled(false); - - - fMoveDownButton = new BButton(BRect(0,0,1,1),"movedownbutton","Move down", - new BMessage(M_MOVE_RULE_DOWN), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fMoveDownButton->ResizeToPreferred(); - fMoveDownButton->MoveTo((Bounds().Width() / 2.0) + 10.0, - fAddButton->Frame().bottom + 10.0); - - - fMoveUpButton = new BButton(BRect(0,0,1,1),"moveupbutton","Move up", - new BMessage(M_MOVE_RULE_UP), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fMoveUpButton->ResizeTo(fMoveDownButton->Bounds().Width(), fMoveDownButton->Bounds().Height()); - fMoveUpButton->MoveTo((Bounds().Width() / 2.0) - fMoveUpButton->Bounds().Width() - 10.0, - fAddButton->Frame().bottom + 10.0); - - top->AddChild(fMoveUpButton); - top->AddChild(fMoveDownButton); - - fMoveUpButton->SetEnabled(false); - fMoveDownButton->SetEnabled(false); - - - float minwidth = (fRemoveButton->Bounds().Width() * 3.0) + 40; - SetSizeLimits(minwidth, 30000, 200, 30000); - - LoadRules(fRuleList); - - for (int32 i = 0; i < fRuleList->CountItems(); i++) - fRuleItemList->AddItem(new RuleItem(fRuleList->ItemAt(i))); - - fRuleItemList->MakeFocus(); - if (fRuleItemList->CountItems() > 0) - fRuleItemList->Select(0L); - else - { - BAlert *alert = new BAlert("Filer","It appears that there aren't any rules for " - "organizing files. Would you like Filer to " - "add some basic ones for you?","No","Yes"); - if (alert->Go() == 1) - { - FilerRule *rule = new FilerRule(); - - // NOTE: If actions - rule->AddTest(MakeTest("Type","is","text/plain")); - rule->AddAction(MakeAction("Move it to…","/boot/home/Documents")); - rule->SetDescription("Store text files in my Documents folder"); - AddRule(rule); - - rule = new FilerRule(); - rule->AddTest(MakeTest("Type","is","application/pdf")); - rule->AddAction(MakeAction("Move it to…","/boot/home/Documents")); - rule->SetDescription("Store PDF files in my Documents folder"); - AddRule(rule); - - rule = new FilerRule(); - rule->AddTest(MakeTest("Type","starts with","image/")); - rule->AddAction(MakeAction("Move it to…","/boot/home/Pictures")); - rule->SetDescription("Store pictures in my Pictures folder"); - AddRule(rule); - - rule = new FilerRule(); - rule->AddTest(MakeTest("Type","starts with","video/")); - rule->AddAction(MakeAction("Move it to…","/boot/home/Videos")); - rule->SetDescription("Store movie files in my Videos folder"); - AddRule(rule); - - rule = new FilerRule(); - rule->AddTest(MakeTest("Name","ends with",".zip")); - rule->AddAction(MakeAction("Terminal command…","unzip %FULLPATH% -d /boot/home/Desktop")); - rule->SetDescription("Extract ZIP files to the Desktop"); - AddRule(rule); - -// rule = new FilerRule(); -// rule->AddTest(MakeTest("","","")); -// rule->AddAction(MakeAction("","")); -// rule->SetDescription(""); -// AddRule(rule); - } - SaveRules(fRuleList); - } -} - - -PrefsWindow::~PrefsWindow(void) -{ - delete fRuleList; -} - - -bool -PrefsWindow::QuitRequested(void) -{ - if (fChanges) - SaveRules(fRuleList); - MakeEmpty(); - be_app->PostMessage(B_QUIT_REQUESTED); - return true; -} - - -void -PrefsWindow::MessageReceived(BMessage *msg) -{ - switch(msg->what) - { - case M_SHOW_ADD_WINDOW: - { - BRect frame(Frame()); - frame.right = frame.left + 400; - frame.bottom = frame.top + 300; - frame.OffsetBy(20,20); - - RuleEditWindow *rulewin = new RuleEditWindow(frame,NULL); - rulewin->Show(); - break; - } - case M_SHOW_EDIT_WINDOW: - { - BRect frame(Frame()); - frame.right = frame.left + 400; - frame.bottom = frame.top + 300; - frame.OffsetBy(20,20); - - FilerRule *rule = fRuleList->ItemAt(fRuleItemList->CurrentSelection()); - - RuleEditWindow *rulewin = new RuleEditWindow(frame,rule); - rulewin->Show(); - break; - } - case M_ADD_RULE: - { - fChanges = true; - FilerRule *item; - if (msg->FindPointer("item",(void**)&item) == B_OK) - AddRule(item); - break; - } - case M_REMOVE_RULE: - { - fChanges = true; - if (fRuleItemList->CurrentSelection() >= 0) - RemoveRule((RuleItem*)fRuleItemList->ItemAt(fRuleItemList->CurrentSelection())); - break; - } - case M_UPDATE_RULE: - { - fChanges = true; - FilerRule *rule; - if (msg->FindPointer("item",(void**)&rule) == B_OK) - { - int64 id; - if (msg->FindInt64("id",&id) != B_OK) - debugger("Couldn't find update ID"); - - for (int32 i = 0; i < fRuleList->CountItems(); i++) - { - FilerRule *oldrule = fRuleList->ItemAt(i); - if (oldrule->GetID() == id) - { - *oldrule = *rule; - RuleItem *item = (RuleItem*)fRuleItemList->ItemAt(i); - item->SetText(rule->GetDescription()); - break; - } - } - - delete rule; - } - break; - } - case M_REVERT: - { - while (fRuleItemList->CountItems() > 0) - RemoveRule((RuleItem*)fRuleItemList->ItemAt(0L)); - fRuleList->MakeEmpty(); - fEditButton->SetEnabled(false); - fRemoveButton->SetEnabled(false); - - LoadRules(fRuleList); - break; - } - case M_RULE_SELECTED: - { - bool value = (fRuleItemList->CurrentSelection() >= 0); - - fEditButton->SetEnabled(value); - fRemoveButton->SetEnabled(value); - - if (fRuleItemList->CountItems() > 1) - { - fMoveUpButton->SetEnabled(value); - fMoveDownButton->SetEnabled(value); - } - break; - } - case M_MOVE_RULE_UP: - { - fChanges = true; - int32 selection = fRuleItemList->CurrentSelection(); - if (selection < 1) - break; - - fRuleItemList->SwapItems(selection, selection - 1); - fRuleList->SwapItems(selection, selection - 1); - break; - } - case M_MOVE_RULE_DOWN: - { - fChanges = true; - int32 selection = fRuleItemList->CurrentSelection(); - if (selection > fRuleItemList->CountItems() - 1) - break; - - fRuleItemList->SwapItems(selection, selection + 1); - fRuleList->SwapItems(selection, selection + 1); - break; - } - default: - BWindow::MessageReceived(msg); - break; - } -} - - -void -PrefsWindow::FrameResized(float width, float height) -{ - float x = fAddButton->Frame().right + ((fRemoveButton->Frame().left - - fAddButton->Frame().right) / 2.0); - fEditButton->MoveTo(x - (fEditButton->Bounds().Width() / 2.0), - fAddButton->Frame().top); -} - - -void -PrefsWindow::AddRule(FilerRule *rule) -{ - fRuleList->AddItem(rule); - fRuleItemList->AddItem(new RuleItem(rule)); - - if (fRuleItemList->CurrentSelection() < 0) - fRuleItemList->Select(0L); -} - - -void -PrefsWindow::RemoveRule(RuleItem *item) -{ - // Select a new rule (if there is one) before removing the old one. BListView simply drops - // the selection if the selected item is removed. What a pain in the neck. :/ - int32 itemindex = fRuleItemList->IndexOf(item); - int32 selection = fRuleItemList->CurrentSelection(); - if (itemindex == selection && fRuleItemList->CountItems() > 1) - { - if (selection == fRuleItemList->CountItems() - 1) - selection--; - else - selection++; - fRuleItemList->Select(selection); - } - - fRuleItemList->RemoveItem(item); - - FilerRule *rule = item->Rule(); - fRuleList->RemoveItem(rule); - delete item; - - if (fRuleItemList->CountItems() <= 0) - { - fEditButton->SetEnabled(false); - fRemoveButton->SetEnabled(false); - } - - if (fRuleItemList->CountItems() < 2) - { - fMoveUpButton->SetEnabled(false); - fMoveDownButton->SetEnabled(false); - } -} - - -void -PrefsWindow::MakeEmpty(void) -{ - for (int32 i = fRuleItemList->CountItems() - 1; i >= 0; i--) - { - RuleItem *item = (RuleItem*)fRuleItemList->RemoveItem(i); - delete item; - } -} diff --git a/sources/Filer/PrefsWindow.h b/sources/Filer/PrefsWindow.h deleted file mode 100644 index cf8b6c6..0000000 --- a/sources/Filer/PrefsWindow.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - PrefsWindow.h: Window class to show and edit settings for the Filer - Written by DarkWyrm , Copyright 2008 - Released under the MIT license. -*/ -#ifndef PREFS_WIN_H -#define PREFS_WIN_H - -#include -#include -#include -#include "ObjectList.h" - -class RuleItem; -class FilerRule; - -#define M_CLOSE_APP 'clar' - - -class PrefsWindow : public BWindow -{ -public: - PrefsWindow(void); - ~PrefsWindow(void); - bool QuitRequested(void); - void MessageReceived(BMessage *msg); - void FrameResized(float width, float height); - -private: - void AddRule(FilerRule *rule); - void RemoveRule(RuleItem *item); - void MakeEmpty(void); - - BObjectList *fRuleList; - - BListView *fRuleItemList; - - BButton *fAddButton, - *fEditButton, - *fRemoveButton, - *fMoveUpButton, - *fMoveDownButton; - - BScrollView *fScrollView; - bool fChanges; -}; - -#endif diff --git a/sources/Filer/RefStorage.cpp b/sources/Filer/RefStorage.cpp index e1f3e06..3067da5 100644 --- a/sources/Filer/RefStorage.cpp +++ b/sources/Filer/RefStorage.cpp @@ -3,6 +3,7 @@ Written by DarkWyrm , Copyright 2008 Contributed by: Humdinger , 2016 */ + #include #include #include @@ -16,18 +17,17 @@ BLocker gRefLock; const char gPrefsPath[] = "Filer/AutoFilerFolders"; -RefStorage::RefStorage(const entry_ref &fileref) +RefStorage::RefStorage(const entry_ref& fileref) { SetData(fileref); } void -RefStorage::SetData(const entry_ref &fileref) +RefStorage::SetData(const entry_ref& fileref) { BEntry entry(&fileref); - if (entry.Exists()) - { + if (entry.Exists()) { entry.GetRef(&ref); entry.GetNodeRef(&nref); } @@ -35,7 +35,7 @@ RefStorage::SetData(const entry_ref &fileref) status_t -LoadFolders(void) +LoadFolders() { BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); @@ -43,80 +43,79 @@ LoadFolders(void) if (!BEntry(path.Path()).Exists()) return B_OK; - + BAutolock autolock(&gRefLock); if (!autolock.IsLocked()) return B_BUSY; - + BMessage msg; - + BFile file(path.Path(), B_READ_ONLY); status_t status = file.InitCheck(); if (status != B_OK) return status; - + status = msg.Unflatten(&file); if (status != B_OK) return status; - + entry_ref tempRef; int32 i = 0; while (msg.FindRef("refs",i,&tempRef) == B_OK) { i++; - RefStorage *refholder = new RefStorage(tempRef); + RefStorage* refholder = new RefStorage(tempRef); if (refholder) gRefStructList.AddItem(refholder); } - + return status; } status_t -ReloadFolders(void) +ReloadFolders() { BAutolock autolock(&gRefLock); if (!autolock.IsLocked()) return B_BUSY; - + for (int32 i = 0; i < gRefStructList.CountItems(); i++) { - RefStorage *refholder = (RefStorage*)gRefStructList.ItemAt(i); + RefStorage* refholder = (RefStorage*)gRefStructList.ItemAt(i); delete refholder; } gRefStructList.MakeEmpty(); - + LoadFolders(); - + return B_OK; } + status_t -SaveFolders(void) +SaveFolders() { BAutolock autolock(&gRefLock); if (!autolock.IsLocked()) return B_BUSY; - + BMessage msg; - + for (int32 i = 0; i < gRefStructList.CountItems(); i++) { - RefStorage *refholder = (RefStorage*)gRefStructList.ItemAt(i); - - msg.AddRef("refs",&refholder->ref);; + RefStorage* refholder = (RefStorage*)gRefStructList.ItemAt(i); + msg.AddRef("refs", &refholder->ref);; } BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); path.Append(gPrefsPath); - + BFile file(path.Path(),B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); status_t status = file.InitCheck(); if (status != B_OK) return status; - + status = msg.Flatten(&file); return status; - } diff --git a/sources/Filer/RefStorage.h b/sources/Filer/RefStorage.h index 6912405..16a1237 100644 --- a/sources/Filer/RefStorage.h +++ b/sources/Filer/RefStorage.h @@ -19,15 +19,15 @@ enum class RefStorage { public: - RefStorage(const entry_ref &ref); - void SetData(const entry_ref &ref); - + RefStorage(const entry_ref& ref); + void SetData(const entry_ref& ref); + entry_ref ref; node_ref nref; }; -status_t LoadFolders(void); -status_t ReloadFolders(void); -status_t SaveFolders(void); +status_t LoadFolders(); +status_t ReloadFolders(); +status_t SaveFolders(); -#endif +#endif // REFSTORAGE_H diff --git a/sources/Filer/RuleEditWindow.cpp b/sources/Filer/RuleEditWindow.cpp index 21084c3..15fd281 100644 --- a/sources/Filer/RuleEditWindow.cpp +++ b/sources/Filer/RuleEditWindow.cpp @@ -4,7 +4,7 @@ Written by DarkWyrm , Copyright 2008 Contributed by: Humdinger , 2016 */ -#include "RuleEditWindow.h" + #include #include @@ -16,8 +16,8 @@ #include "ActionView.h" #include "AutoTextControl.h" -#include "EscapeCancelFilter.h" #include "FilerRule.h" +#include "RuleEditWindow.h" #include "TestView.h" // Internal message defs @@ -37,142 +37,140 @@ enum }; -RuleEditWindow::RuleEditWindow(BRect &rect, FilerRule *rule) - : BWindow(rect,"Edit rule",B_TITLED_WINDOW,B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE), +RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) + : + BWindow(rect, "Edit rule", B_TITLED_WINDOW, + B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_CLOSE_ON_ESCAPE), fOriginalID(-1) { if (rule) fOriginalID = rule->GetID(); else SetTitle("Add rule"); - - - AddCommonFilter(new EscapeCancelFilter); - - BView *top = new BView(Bounds(),"top",B_FOLLOW_ALL,B_WILL_DRAW); + + BView* top = new BView(Bounds(), "top", B_FOLLOW_ALL, B_WILL_DRAW); top->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); AddChild(top); - + // Description - fDescriptionBox = new AutoTextControl(BRect(0,0,1,1),"description","Description: ", - NULL,new BMessage(M_DESCRIPTION_CHANGED), - B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + fDescriptionBox = new AutoTextControl(BRect(0, 0, 1, 1), "description", + "Description: ", NULL, new BMessage(M_DESCRIPTION_CHANGED), + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); top->AddChild(fDescriptionBox); - - float width,height; - fDescriptionBox->GetPreferredSize(&width,&height); - fDescriptionBox->ResizeTo(Bounds().Width() - 20,height); - fDescriptionBox->MoveTo(10,10); + + float width, height; + fDescriptionBox->GetPreferredSize(&width, &height); + fDescriptionBox->ResizeTo(Bounds().Width() - 20, height); + fDescriptionBox->MoveTo(10, 10); fDescriptionBox->SetDivider(be_plain_font->StringWidth("Description: ") + 5); - + if (rule) fDescriptionBox->SetText(rule->GetDescription()); - + // Separator line BRect rect(fDescriptionBox->Frame()); - rect.OffsetBy(0,rect.IntegerHeight() + 10); + rect.OffsetBy(0, rect.IntegerHeight() + 10); rect.bottom = rect.top + 1.0; - BBox *box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + BBox* box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); top->AddChild(box); - + // Set up the tests group and associated buttons - rect.OffsetBy(0,12.0); + rect.OffsetBy(0, 12.0); rect.bottom = rect.top + 20.0; - fTestGroup = new BBox(rect,"whengroup", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + fTestGroup = new BBox(rect, "whengroup", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); fTestGroup->SetLabel("When"); top->AddChild(fTestGroup); - - fAddTest = new BButton(BRect(0,0,1,1),"addtestbutton","Add",new BMessage(M_ADD_TEST), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + + fAddTest = new BButton(BRect(0, 0, 1, 1),"addtestbutton", "Add", + new BMessage(M_ADD_TEST), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fAddTest->ResizeToPreferred(); - fAddTest->MoveTo(10.0, fTestGroup->Bounds().bottom - 10.0 - fAddTest->Bounds().Height()); + fAddTest->MoveTo(10.0, fTestGroup->Bounds().bottom - 10.0 + - fAddTest->Bounds().Height()); fTestGroup->AddChild(fAddTest); - - fRemoveTest = new BButton(BRect(0,0,1,1),"removetestbutton","Remove", - new BMessage(M_REMOVE_TEST),B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + + fRemoveTest = new BButton(BRect(0, 0, 1, 1),"removetestbutton", "Remove", + new BMessage(M_REMOVE_TEST), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fRemoveTest->ResizeToPreferred(); fRemoveTest->MoveTo(fAddTest->Frame().right + 10, fAddTest->Frame().top); fTestGroup->AddChild(fRemoveTest); fRemoveTest->SetEnabled(false); - - fTestGroup->ResizeBy(0,fAddTest->Bounds().Height() + 10.0); - + + fTestGroup->ResizeBy(0, fAddTest->Bounds().Height() + 10.0); + // Set up the actions group and associated buttons - - rect.OffsetTo(10,fTestGroup->Frame().bottom + 10.0); - fActionGroup = new BBox(rect,"dogroup", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + + rect.OffsetTo(10, fTestGroup->Frame().bottom + 10.0); + fActionGroup = new BBox(rect, "dogroup", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); fActionGroup->SetLabel("Do"); top->AddChild(fActionGroup); - fAddAction = new BButton(BRect(0,0,1,1),"addactionbutton","Add",new BMessage(M_ADD_ACTION), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fAddAction = new BButton(BRect(0, 0, 1, 1), "addactionbutton", "Add", + new BMessage(M_ADD_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fAddAction->ResizeToPreferred(); - fAddAction->MoveTo(10.0, fActionGroup->Bounds().bottom - 10.0 - fAddAction->Bounds().Height()); + fAddAction->MoveTo(10.0, fActionGroup->Bounds().bottom - 10.0 + - fAddAction->Bounds().Height()); fActionGroup->AddChild(fAddAction); - - fRemoveAction = new BButton(BRect(0,0,1,1),"removeactionbutton","Remove", - new BMessage(M_REMOVE_ACTION),B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + + fRemoveAction = new BButton(BRect(0, 0, 1, 1), "removeactionbutton", "Remove", + new BMessage(M_REMOVE_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fRemoveAction->ResizeToPreferred(); fRemoveAction->MoveTo(fAddAction->Frame().right + 10, fAddAction->Frame().top); fActionGroup->AddChild(fRemoveAction); fRemoveAction->SetEnabled(false); - - fActionGroup->ResizeBy(0,fAddAction->Bounds().Height() + 10.0); + fActionGroup->ResizeBy(0, fAddAction->Bounds().Height() + 10.0); - - fOK = new BButton(BRect(0,0,1,1),"okbutton","OK",new BMessage(M_OK), - B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); + + fOK = new BButton(BRect(0, 0, 1, 1), "okbutton", "OK", new BMessage(M_OK), + B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); fOK->ResizeToPreferred(); fOK->MoveTo(Bounds().right - fOK->Bounds().Width() - 10, - Bounds().bottom - fOK->Bounds().Height() - 10); + Bounds().bottom - fOK->Bounds().Height() - 10); // calling AddChild later to ensure proper keyboard navigation - - fCancel = new BButton(BRect(0,0,1,1),"cancelbutton","Cancel",new BMessage(M_CANCEL), - B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); + + fCancel = new BButton(BRect(0, 0, 1 ,1), "cancelbutton", "Cancel", + new BMessage(M_CANCEL), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); fCancel->ResizeToPreferred(); fCancel->MoveTo(fOK->Frame().left - fCancel->Bounds().Width() - 10, - fOK->Frame().top); - - fHelp = new BButton(BRect(0,0,1,1),"helpbutton","Help…",new BMessage(M_SHOW_HELP), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fOK->Frame().top); + + fHelp = new BButton(BRect(0, 0, 1, 1), "helpbutton", "Help…", + new BMessage(M_SHOW_HELP), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fHelp->ResizeToPreferred(); fHelp->MoveTo(10, fOK->Frame().top); top->AddChild(fHelp); - + top->AddChild(fCancel); top->AddChild(fOK); fOK->MakeDefault(true); - - if (rule) - { + + if (rule) { for (int32 i = 0; i < rule->CountTests(); i++) AppendTest(rule->TestAt(i)); - + for (int32 i = 0; i < rule->CountActions(); i++) AppendAction(rule->ActionAt(i)); - } - else - { + } else { AppendTest(NULL); AppendAction(NULL); } - - ResizeTo(Bounds().Width(), fActionGroup->Frame().bottom + 15 + fOK->Bounds().Height()); - + + ResizeTo(Bounds().Width(), fActionGroup->Frame().bottom + 15 + + fOK->Bounds().Height()); + fDescriptionBox->MakeFocus(); } -RuleEditWindow::~RuleEditWindow(void) +RuleEditWindow::~RuleEditWindow() { } void -RuleEditWindow::MessageReceived(BMessage *msg) +RuleEditWindow::MessageReceived(BMessage* msg) { - switch(msg->what) + switch (msg->what) { case M_SHOW_HELP: { @@ -193,16 +191,15 @@ RuleEditWindow::MessageReceived(BMessage *msg) } case M_OK: { - if (strlen(fDescriptionBox->Text()) < 1) - { - BAlert *alert = new BAlert("Filer","You need to add a description " - "if you want to add this rule to the list.", - "OK"); + if (strlen(fDescriptionBox->Text()) < 1) { + BAlert* alert = new BAlert("Filer", + "You need to add a description if you want to add this " + "rule to the list.", "OK"); alert->Go(); fDescriptionBox->MakeFocus(true); break; } - + SendRuleMessage(); PostMessage(B_QUIT_REQUESTED); break; @@ -239,144 +236,145 @@ RuleEditWindow::MessageReceived(BMessage *msg) void -RuleEditWindow::AppendTest(BMessage *test) +RuleEditWindow::AppendTest(BMessage* test) { - TestView *view = new TestView(BRect(0,0,1,1),"test",test,B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + TestView* view = new TestView(BRect(0, 0, 1, 1), "test", test, + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); view->ResizeToPreferred(); - BRect r = view->GetPreferredSize(); - fTestGroup->ResizeBy(0,r.Height() + 10); - - if (fTestGroup->Bounds().Width() < r.Width() + 20) - ResizeBy(r.Width() + 20 - fTestGroup->Bounds().Width(),0); - - TestView *last = (TestView*)fTestList.ItemAt(fTestList.CountItems() - 1); + BRect rect = view->GetPreferredSize(); + fTestGroup->ResizeBy(0, rect.Height() + 10); + + if (fTestGroup->Bounds().Width() < rect.Width() + 20) + ResizeBy(rect.Width() + 20 - fTestGroup->Bounds().Width(),0); + + TestView* last = (TestView*)fTestList.ItemAt(fTestList.CountItems() - 1); if (last) - view->MoveTo(last->Frame().left,last->Frame().bottom + 10); + view->MoveTo(last->Frame().left, last->Frame().bottom + 10); else - view->MoveTo(10,15); - + view->MoveTo(10, 15); + fTestGroup->AddChild(view); fTestList.AddItem(view); - - fActionGroup->MoveBy(0,r.Height() + 10); - ResizeBy(0,r.Height() + 10); - + + fActionGroup->MoveBy(0, rect.Height() + 10); + ResizeBy(0, rect.Height() + 10); + if (fTestList.CountItems() > 1 && !fRemoveTest->IsEnabled()) fRemoveTest->SetEnabled(true); } void -RuleEditWindow::RemoveTest(void) +RuleEditWindow::RemoveTest() { - TestView *view = (TestView*) fTestList.RemoveItem(fTestList.CountItems() - 1); + TestView* view = (TestView*)fTestList.RemoveItem(fTestList.CountItems() - 1); view->RemoveSelf(); - fTestGroup->ResizeBy(0,-view->Bounds().Height() - 10); - fActionGroup->MoveBy(0,-view->Bounds().Height() - 10); - ResizeBy(0,-view->Bounds().Height() - 10); + fTestGroup->ResizeBy(0, -view->Bounds().Height() - 10); + fActionGroup->MoveBy(0, -view->Bounds().Height() - 10); + ResizeBy(0, -view->Bounds().Height() - 10); delete view; - + if (fTestList.CountItems() == 1) fRemoveTest->SetEnabled(false); } void -RuleEditWindow::AppendAction(BMessage *action) +RuleEditWindow::AppendAction(BMessage* action) { - ActionView *view = new ActionView(BRect(0,0,1,1),"action",action,B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); - BRect r = view->GetPreferredSize(); - view->ResizeTo(fActionGroup->Bounds().Width() - 20, r.Height()); - fActionGroup->ResizeBy(0,r.Height() + 10); - - if (fActionGroup->Bounds().Width() < r.Width() + 20) - ResizeBy(r.Width() + 20 - fActionGroup->Bounds().Width(),0); - - ActionView *last = (ActionView*)fActionList.ItemAt(fActionList.CountItems() - 1); - + ActionView* view = new ActionView(BRect(0, 0, 1, 1), "action", action, + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + BRect rect = view->GetPreferredSize(); + view->ResizeTo(fActionGroup->Bounds().Width() - 20, rect.Height()); + fActionGroup->ResizeBy(0, rect.Height() + 10); + + if (fActionGroup->Bounds().Width() < rect.Width() + 20) + ResizeBy(rect.Width() + 20 - fActionGroup->Bounds().Width(), 0); + + ActionView* last + = (ActionView*)fActionList.ItemAt(fActionList.CountItems() - 1); + if (last) - view->MoveTo(last->Frame().left,last->Frame().bottom + 10); + view->MoveTo(last->Frame().left, last->Frame().bottom + 10); else - view->MoveTo(10,15); - + view->MoveTo(10, 15); + fActionGroup->AddChild(view); fActionList.AddItem(view); - - ResizeBy(0,r.Height() + 10); - + + ResizeBy(0, rect.Height() + 10); + if (fActionList.CountItems() > 1 && !fRemoveAction->IsEnabled()) fRemoveAction->SetEnabled(true); } void -RuleEditWindow::RemoveAction(void) +RuleEditWindow::RemoveAction() { - ActionView *view = (ActionView*) fActionList.RemoveItem(fActionList.CountItems() - 1); + ActionView* view + = (ActionView*)fActionList.RemoveItem(fActionList.CountItems() - 1); view->RemoveSelf(); - fActionGroup->ResizeBy(0,-view->Bounds().Height() - 10); - ResizeBy(0,-view->Bounds().Height() - 10); + fActionGroup->ResizeBy(0, -view->Bounds().Height() - 10); + ResizeBy(0, -view->Bounds().Height() - 10); delete view; - - + if (fActionList.CountItems() == 1) fRemoveAction->SetEnabled(false); } BRect -RuleEditWindow::GetPreferredSize(void) const +RuleEditWindow::GetPreferredSize() const { // Base minimum size, padding included - BRect rect(0.0,0.0,320.0,220.0); - + BRect rect(0.0, 0.0, 320.0, 220.0); + // Figure preferred height - rect.bottom += fDescriptionBox->Bounds().Height() + 10.0; - + // 2 pixels for separator line + 10 pixels padding above it rect.bottom += 12.0; - - // Base minimum size for boxes (including inside padding) of 20 each and outside - // padding of 10 pixels above each box + + // Base minimum size for boxes (including inside padding) of 20 each and + // outside padding of 10 pixels above each box rect.bottom += 40.0 + 20.0; - + rect.bottom += fOK->Bounds().Height() + 10.0; - + return rect; } void -RuleEditWindow::SendRuleMessage(void) +RuleEditWindow::SendRuleMessage() { - FilerRule *rule = new FilerRule; - + FilerRule* rule = new FilerRule; + rule->SetDescription(fDescriptionBox->Text()); - - for(int32 i = 0; i < fTestList.CountItems(); i++) + + for (int32 i = 0; i < fTestList.CountItems(); i++) { - TestView *view = (TestView*)fTestList.ItemAt(i); + TestView* view = (TestView*)fTestList.ItemAt(i); rule->AddTest(new BMessage(*view->GetTest())); } - - for(int32 i = 0; i < fActionList.CountItems(); i++) + + for (int32 i = 0; i < fActionList.CountItems(); i++) { - ActionView *view = (ActionView*)fActionList.ItemAt(i); + ActionView* view = (ActionView*)fActionList.ItemAt(i); rule->AddAction(new BMessage(*view->GetAction())); } - + BMessage msg; msg.what = (fOriginalID >= 0) ? M_UPDATE_RULE : M_ADD_RULE; - msg.AddPointer("item",rule); - msg.AddInt64("id",fOriginalID); + msg.AddPointer("item", rule); + msg.AddInt64("id", fOriginalID); for (int32 i = 0; i < be_app->CountWindows(); i++) { - BWindow *win = be_app->WindowAt(i); - if (strcmp(win->Title(),"Filer settings") == 0) + BWindow* win = be_app->WindowAt(i); + if (strcmp(win->Title(), "Filer settings") == 0) win->PostMessage(&msg); } } - diff --git a/sources/Filer/RuleEditWindow.h b/sources/Filer/RuleEditWindow.h index ab2cbd5..855f08e 100644 --- a/sources/Filer/RuleEditWindow.h +++ b/sources/Filer/RuleEditWindow.h @@ -9,6 +9,7 @@ #include #include #include + #include "ObjectList.h" class AutoTextControl; @@ -26,39 +27,39 @@ enum class RuleEditWindow : public BWindow { public: - RuleEditWindow(BRect &rect, FilerRule *rule); - ~RuleEditWindow(void); - void MessageReceived(BMessage *msg); - -// FilerRule * Rule(void); - - void AppendTest(BMessage *test); - void RemoveTest(void); - - void AppendAction(BMessage *action); - void RemoveAction(void); - + RuleEditWindow(BRect& rect, FilerRule* rule); + ~RuleEditWindow(); + + void MessageReceived(BMessage* msg); + +// FilerRule* Rule(); + + void AppendTest(BMessage* test); + void RemoveTest(); + + void AppendAction(BMessage* action); + void RemoveAction(); private: - BRect GetPreferredSize(void) const; - void SendRuleMessage(void); - - AutoTextControl *fDescriptionBox; - - BBox *fTestGroup, - *fActionGroup; - - BButton *fOK, - *fCancel, - *fAddTest, - *fRemoveTest, - *fAddAction, - *fRemoveAction, - *fHelp; - + BRect GetPreferredSize() const; + void SendRuleMessage(); + + AutoTextControl* fDescriptionBox; + + BBox* fTestGroup; + BBox* fActionGroup; + + BButton* fOK; + BButton* fCancel; + BButton* fAddTest; + BButton* fRemoveTest; + BButton* fAddAction; + BButton* fRemoveAction; + BButton* fHelp; + int64 fOriginalID; - - BList fTestList, - fActionList; + + BList fTestList; + BList fActionList; }; -#endif +#endif // RULE_EDIT_WINDNOW_H diff --git a/sources/Filer/RuleItem.cpp b/sources/Filer/RuleItem.cpp index 8cf95f8..f68547a 100644 --- a/sources/Filer/RuleItem.cpp +++ b/sources/Filer/RuleItem.cpp @@ -3,22 +3,24 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #include "RuleItem.h" #include "FilerRule.h" -RuleItem::RuleItem(FilerRule *item) - : BStringItem("") +RuleItem::RuleItem(FilerRule* item) + : + BStringItem("") { SetRule(item); } - + void -RuleItem::SetRule(FilerRule *rule) +RuleItem::SetRule(FilerRule* rule) { fRule = rule; - + if (fRule) SetText(rule->GetDescription()); else @@ -26,9 +28,8 @@ RuleItem::SetRule(FilerRule *rule) } -FilerRule * -RuleItem::Rule(void) +FilerRule* +RuleItem::Rule() { return fRule; } - diff --git a/sources/Filer/RuleItem.h b/sources/Filer/RuleItem.h index c5e4bd8..d61e1bf 100644 --- a/sources/Filer/RuleItem.h +++ b/sources/Filer/RuleItem.h @@ -3,24 +3,25 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef RULEITEM_H #define RULEITEM_H -#include #include +#include class FilerRule; class RuleItem : public BStringItem { public: - RuleItem(FilerRule *item); - - void SetRule(FilerRule *rule); - FilerRule * Rule(void); - + RuleItem(FilerRule* item); + + void SetRule(FilerRule* rule); + FilerRule* Rule(); + private: - FilerRule *fRule; + FilerRule* fRule; }; -#endif +#endif // RULEITEM_H diff --git a/sources/Filer/RuleRunner.cpp b/sources/Filer/RuleRunner.cpp index 6bf9aea..3f4f516 100644 --- a/sources/Filer/RuleRunner.cpp +++ b/sources/Filer/RuleRunner.cpp @@ -4,6 +4,7 @@ Written by DarkWyrm , Copyright 2008 Contributed by: Humdinger , 2016 */ + #include #include #include @@ -26,8 +27,8 @@ "value" - string data associated with the action. Usually a file path FilerTest message fields: - "name" - the particular data being compared -- name, date, etc. This is set to - "Attribute" if it's an extended attribute + "name" - the particular data being compared -- name, date, etc. + This is set to"Attribute" if it's an extended attribute "mode" - the kind of comparison being used -- ==, != -- in plain English "value" - the value to be compared to @@ -36,47 +37,48 @@ "mimetype" - This is the MIME type associated with the attribute. "typename" - This is the mime type's short description. - "attrtype" - The MIME description for the attribute type, like META:email for email - addresses. + "attrtype" - The MIME description for the attribute type, like + META:email for email addresses. "attrname" - The public name for the attribute to be compared. - To add another test to this file, you'll need to implement an IsXxxxMatch() function, - make sure it is called from within IsMatch(), and add the appropriate name to both - sTestTypes[] and either sStringTests[], sDateTests[], or sNumberTests[]. + To add another test to this file, you'll need to implement an + IsXxxxMatch(), function make sure it is called from within IsMatch(), + and add the appropriate name to both sTestTypes[] and either + sStringTests[], sDateTests[], or sNumberTests[]. - To add an action to this file, you'll need to implement an xxxxAction() function, - make sure it is called from within RunAction, and add the appropriate action name - to sActions[]; + To add an action to this file, you'll need to implement an xxxxAction() + function, make sure it is called from within RunAction, and add the + appropriate action name to sActions[]; - In both cases, please make sure that you keep the location within the static array - variables when adding or deleting entries + In both cases, please make sure that you keep the location within the + static array variables when adding or deleting entries */ // The various compare functions used by IsMatch to do the actual comparing -bool IsNameMatch(const BMessage &test, const entry_ref &ref); -bool IsTypeMatch(const BMessage &test, const entry_ref &ref); -bool IsSizeMatch(const BMessage &test, const entry_ref &ref); -bool IsLocationMatch(const BMessage &test, const entry_ref &ref); -bool IsModifiedMatch(const BMessage &test, const entry_ref &ref); -bool IsAttributeMatch(const BMessage &test, const entry_ref &ref); -bool StringCompare(const BString &from, const BString &to, const char *mode, - const bool &match_case); +bool IsNameMatch(const BMessage& test, const entry_ref& ref); +bool IsTypeMatch(const BMessage& test, const entry_ref& ref); +bool IsSizeMatch(const BMessage& test, const entry_ref& ref); +bool IsLocationMatch(const BMessage& test, const entry_ref& ref); +bool IsModifiedMatch(const BMessage& test, const entry_ref& ref); +bool IsAttributeMatch(const BMessage& test, const entry_ref& ref); +bool StringCompare(const BString& from, const BString& to, const char* mode, + const bool& match_case); // The various action functions used by RunAction to do the heavy lifting -status_t MoveAction(const BMessage &action, entry_ref &ref); -status_t CopyAction(const BMessage &action, entry_ref &ref); -status_t RenameAction(const BMessage &action, entry_ref &ref); -status_t OpenAction(const BMessage &action, entry_ref &ref); -status_t ArchiveAction(const BMessage &action, entry_ref &ref); -status_t CommandAction(const BMessage &action, entry_ref &ref); -status_t TrashAction(const BMessage &action, entry_ref &ref); -status_t DeleteAction(const BMessage &action, entry_ref &ref); +status_t MoveAction(const BMessage& action, entry_ref& ref); +status_t CopyAction(const BMessage& action, entry_ref& ref); +status_t RenameAction(const BMessage& action, entry_ref& ref); +status_t OpenAction(const BMessage& action, entry_ref& ref); +status_t ArchiveAction(const BMessage& action, entry_ref& ref); +status_t CommandAction(const BMessage& action, entry_ref& ref); +status_t TrashAction(const BMessage& action, entry_ref& ref); +status_t DeleteAction(const BMessage& action, entry_ref& ref); // Internal variables for all the supported types of tests -static const char *sTestTypes[] = +static const char* sTestTypes[] = { "Type", "Name", @@ -86,7 +88,7 @@ static const char *sTestTypes[] = NULL }; -static const char *sStringTests[] = +static const char* sStringTests[] = { "Type", "Name", @@ -94,20 +96,20 @@ static const char *sStringTests[] = NULL }; -static const char *sNumberTests[] = +static const char* sNumberTests[] = { "Size", NULL }; -static const char *sDateTests[] = +static const char* sDateTests[] = { // "Last Changed", NULL }; -static const char *sTestEditors[] = +static const char* sTestEditors[] = { "type selector", "textbox", @@ -120,19 +122,19 @@ static const char *sTestEditors[] = // Internal variables for all the supported types of compare operators -static const char *sAnyModes[] = +static const char* sAnyModes[] = { "is", "is not", - + // for future expansion // "matches pattern", // "does not match pattern", - + NULL }; -static const char *sStringModes[] = +static const char* sStringModes[] = { "starts with", "ends with", @@ -141,7 +143,7 @@ static const char *sStringModes[] = NULL }; -static const char *sNumberModes[] = +static const char* sNumberModes[] = { "is more than", "is less than", @@ -150,7 +152,7 @@ static const char *sNumberModes[] = NULL }; -static const char *sDateModes[] = +static const char* sDateModes[] = { "is before", "is after", @@ -160,7 +162,7 @@ static const char *sDateModes[] = // Internal variable for all the supported types of actions -static const char *sActions[] = +static const char* sActions[] = { "Move it to…", "Copy it to…", @@ -170,50 +172,50 @@ static const char *sActions[] = "Move it to the Trash", "Delete it", "Terminal command…", - + // Future expansion // "Shred it", // "E-mail it to…", // "Make a Deskbar link", - + NULL }; -RuleRunner::RuleRunner(void) +RuleRunner::RuleRunner() { } -RuleRunner::~RuleRunner(void) +RuleRunner::~RuleRunner() { } void -RuleRunner::GetTestTypes(BMessage &msg) +RuleRunner::GetTestTypes(BMessage& msg) { int32 i = 0; while (sTestTypes[i]) { - msg.AddString("tests",sTestTypes[i]); + msg.AddString("tests", sTestTypes[i]); i++; } } status_t -RuleRunner::GetCompatibleModes(const char *testtype, BMessage &msg) +RuleRunner::GetCompatibleModes(const char* testtype, BMessage& msg) { if (!testtype) return B_ERROR; - - return GetCompatibleModes(GetDataTypeForTest(testtype),msg); + + return GetCompatibleModes(GetDataTypeForTest(testtype), msg); } status_t -RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) +RuleRunner::GetCompatibleModes(const int32& type, BMessage& msg) { int32 i = 0; switch (type) @@ -222,14 +224,14 @@ RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) { while (sAnyModes[i]) { - msg.AddString("modes",sAnyModes[i]); + msg.AddString("modes", sAnyModes[i]); i++; } - + i = 0; while (sStringModes[i]) { - msg.AddString("modes",sStringModes[i]); + msg.AddString("modes", sStringModes[i]); i++; } break; @@ -238,14 +240,14 @@ RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) { while (sAnyModes[i]) { - msg.AddString("modes",sAnyModes[i]); + msg.AddString("modes", sAnyModes[i]); i++; } - + i = 0; while (sNumberModes[i]) { - msg.AddString("modes",sNumberModes[i]); + msg.AddString("modes", sNumberModes[i]); i++; } break; @@ -254,14 +256,14 @@ RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) { while (sAnyModes[i]) { - msg.AddString("modes",sAnyModes[i]); + msg.AddString("modes", sAnyModes[i]); i++; } - + i = 0; while (sDateModes[i]) { - msg.AddString("modes",sDateModes[i]); + msg.AddString("modes", sDateModes[i]); i++; } break; @@ -270,7 +272,7 @@ RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) { while (sAnyModes[i]) { - msg.AddString("modes",sAnyModes[i]); + msg.AddString("modes", sAnyModes[i]); i++; } break; @@ -283,59 +285,59 @@ RuleRunner::GetCompatibleModes(const int32 &type, BMessage &msg) void -RuleRunner::GetModes(BMessage &msg) +RuleRunner::GetModes(BMessage& msg) { int32 i; - + i = 0; while (sAnyModes[i]) { - msg.AddString("modes",sAnyModes[i]); + msg.AddString("modes", sAnyModes[i]); i++; } - + i = 0; while (sStringModes[i]) { - msg.AddString("modes",sStringModes[i]); + msg.AddString("modes", sStringModes[i]); i++; } - + i = 0; while (sNumberModes[i]) { - msg.AddString("modes",sNumberModes[i]); + msg.AddString("modes", sNumberModes[i]); i++; } - + i = 0; while (sDateModes[i]) { - msg.AddString("modes",sDateModes[i]); + msg.AddString("modes", sDateModes[i]); i++; } } void -RuleRunner::GetActions(BMessage &msg) +RuleRunner::GetActions(BMessage& msg) { int32 i = 0; while (sActions[i]) { - msg.AddString("actions",sActions[i]); + msg.AddString("actions", sActions[i]); i++; } } BString -RuleRunner::GetEditorTypeForTest(const char *testname) +RuleRunner::GetEditorTypeForTest(const char* testname) { int32 i = 0; while (sTestTypes[i]) { - if (strcmp(testname,sTestTypes[i]) == 0) + if (strcmp(testname, sTestTypes[i]) == 0) return BString(sTestEditors[i]); i++; } @@ -344,363 +346,344 @@ RuleRunner::GetEditorTypeForTest(const char *testname) int32 -RuleRunner::GetDataTypeForTest(const char *testname) +RuleRunner::GetDataTypeForTest(const char* testname) { if (!testname) return TEST_TYPE_NULL; - + int32 i; - + i = 0; while (sStringTests[i]) { - if (strcmp(testname,sStringTests[i]) == 0) + if (strcmp(testname, sStringTests[i]) == 0) return TEST_TYPE_STRING; i++; } - + i = 0; while (sNumberTests[i]) { - if (strcmp(testname,sNumberTests[i]) == 0) + if (strcmp(testname, sNumberTests[i]) == 0) return TEST_TYPE_NUMBER; i++; } - + i = 0; while (sDateTests[i]) { - if (strcmp(testname,sDateTests[i]) == 0) + if (strcmp(testname, sDateTests[i]) == 0) return TEST_TYPE_DATE; i++; } - + return TEST_TYPE_NULL; } int32 -RuleRunner::GetDataTypeForMode(const char *modename) +RuleRunner::GetDataTypeForMode(const char* modename) { if (!modename) return TEST_TYPE_NULL; - + int32 i; - + i = 0; while (sStringModes[i]) { - if (strcmp(modename,sStringModes[i]) == 0) + if (strcmp(modename, sStringModes[i]) == 0) return TEST_TYPE_STRING; i++; } - + i = 0; while (sNumberModes[i]) { - if (strcmp(modename,sNumberModes[i]) == 0) + if (strcmp(modename, sNumberModes[i]) == 0) return TEST_TYPE_NUMBER; i++; } - + i = 0; while (sDateModes[i]) { - if (strcmp(modename,sDateModes[i]) == 0) + if (strcmp(modename, sDateModes[i]) == 0) return TEST_TYPE_DATE; i++; } - + i = 0; while (sAnyModes[i]) { - if (strcmp(modename,sAnyModes[i]) == 0) + if (strcmp(modename, sAnyModes[i]) == 0) return TEST_TYPE_ANY; i++; } - + return TEST_TYPE_NULL; } + bool -RuleRunner::IsMatch(const BMessage &test, const entry_ref &ref) +RuleRunner::IsMatch(const BMessage& test, const entry_ref& ref) { BString testname; - if (test.FindString("name",&testname) != B_OK) - { + if (test.FindString("name", &testname) != B_OK) { debugger("Couldn't find test name in RuleRunner::IsMatch"); return false; } - + if (testname.Compare("Name") == 0) - return IsNameMatch(test,ref); + return IsNameMatch(test, ref); else if (testname.Compare("Size") == 0) - return IsSizeMatch(test,ref); + return IsSizeMatch(test, ref); else if (testname.Compare("Location") == 0) - return IsLocationMatch(test,ref); + return IsLocationMatch(test, ref); else if (testname.Compare("Type") == 0) - return IsTypeMatch(test,ref); + return IsTypeMatch(test, ref); else if (testname.Compare("Last Changed") == 0) - return IsModifiedMatch(test,ref); + return IsModifiedMatch(test, ref); else if (testname.Compare("Attribute") == 0) - return IsAttributeMatch(test,ref); - + return IsAttributeMatch(test, ref); + return false; } status_t -RuleRunner::RunAction(const BMessage &action, entry_ref &ref) +RuleRunner::RunAction(const BMessage& action, entry_ref& ref) { BString actionname; - if (action.FindString("name",&actionname) != B_OK) - { + if (action.FindString("name", &actionname) != B_OK) { debugger("Couldn't find action name in RuleRunner::RunAction"); return B_ERROR; } - + if (actionname.Compare("Move it to…") == 0) - return MoveAction(action,ref); + return MoveAction(action, ref); else if (actionname.Compare("Copy it to…") == 0) - return CopyAction(action,ref); + return CopyAction(action, ref); else if (actionname.Compare("Rename it to…") == 0) - return RenameAction(action,ref); + return RenameAction(action, ref); else if (actionname.Compare("Open it") == 0) - return OpenAction(action,ref); + return OpenAction(action, ref); else if (actionname.Compare("Add it to the archive…") == 0) - return ArchiveAction(action,ref); + return ArchiveAction(action, ref); else if (actionname.Compare("Terminal command…") == 0) - return CommandAction(action,ref); + return CommandAction(action, ref); else if (actionname.Compare("Move it to the Trash") == 0) - return TrashAction(action,ref); + return TrashAction(action, ref); else if (actionname.Compare("Delete it") == 0) - return DeleteAction(action,ref); - + return DeleteAction(action, ref); + return B_ERROR; } status_t -RuleRunner::RunRule(FilerRule *rule, entry_ref &ref) +RuleRunner::RunRule(FilerRule* rule, entry_ref& ref) { if (!rule) return B_ERROR; - + bool pass; - printf("Running rule '%s'\n",rule->GetDescription()); - if (rule->GetRuleMode() == FILER_RULE_ANY) - { + if (rule->GetRuleMode() == FILER_RULE_ANY) { pass = false; for (int32 i = 0; i < rule->CountTests(); i++) { - BMessage *test = rule->TestAt(i); - if (IsMatch(*test,ref)) - { + BMessage* test = rule->TestAt(i); + if (IsMatch(*test, ref)) { pass = true; break; } } - } - else // And mode - { + } else { // And mode pass = true; for (int32 i = 0; i < rule->CountTests(); i++) { - BMessage *test = rule->TestAt(i); - if (!IsMatch(*test,ref)) - { + BMessage* test = rule->TestAt(i); + if (!IsMatch(*test, ref)) { pass = false; break; } } } - if (pass) - { + if (pass) { entry_ref realref; - BEntry(&ref,true).GetRef(&realref); - + BEntry(&ref, true).GetRef(&realref); + for (int32 i = 0; i < rule->CountActions(); i++) { - BMessage *action = rule->ActionAt(i); - + BMessage* action = rule->ActionAt(i); + // Note that this call passes the same ref object from one call to the // next. This allows the user to chain actions together. The only thing // required to do this is for the particular action to change the ref // passed to it. - status_t status = RunAction(*action,realref); + status_t status = RunAction(*action, realref); if (status != B_OK) return status; } } - return B_OK; } bool -IsNameMatch(const BMessage &test, const entry_ref &ref) +IsNameMatch(const BMessage& test, const entry_ref& ref) { BString value; - if (test.FindString("value",&value) != B_OK) - { + if (test.FindString("value", &value) != B_OK) { debugger("Couldn't get value in IsNameMatch"); return false; } - + BString compare; - if (test.FindString("mode",&compare) != B_OK) - { + if (test.FindString("mode", &compare) != B_OK) { debugger("Couldn't get mode in IsNameMatch"); return false; } - - bool result = StringCompare(value,BString(ref.name),compare.String(),true); - - printf("\tName test: %s %s %s - %s\n",ref.name,compare.String(),value.String(), - result ? "MATCH" : "NO MATCH"); - + + bool result = StringCompare(value, BString(ref.name), compare.String(), + true); + printf("\tName test: %s %s %s - %s\n", ref.name, compare.String(), + value.String(), result ? "MATCH" : "NO MATCH"); + return result; } bool -IsTypeMatch(const BMessage &test, const entry_ref &ref) +IsTypeMatch(const BMessage& test, const entry_ref& ref) { BString value; - if (test.FindString("value",&value) != B_OK) - { + if (test.FindString("value", &value) != B_OK) { debugger("Couldn't get value in IsTypeMatch"); return false; } -//if (value == "image/") -// debugger(""); - +// if (value == "image/") +// debugger(""); + BString compare; - if (test.FindString("mode",&compare) != B_OK) - { + if (test.FindString("mode", &compare) != B_OK) { debugger("Couldn't get mode in IsTypeMatch"); return false; } - + BString string; attr_info info; BNode node(&ref); if (node.InitCheck() != B_OK) return false; - - if (node.GetAttrInfo("BEOS:TYPE",&info) != B_OK) - { + + if (node.GetAttrInfo("BEOS:TYPE", &info) != B_OK) { BPath path(&ref); - if (update_mime_info(path.Path(),0,1,0) != B_OK) + if (update_mime_info(path.Path(), 0, 1, 0) != B_OK) return false; } - - if (node.ReadAttrString("BEOS:TYPE",&string) != B_OK) + + if (node.ReadAttrString("BEOS:TYPE", &string) != B_OK) return false; - - - bool result = StringCompare(value,string.String(),compare.String(),true); - - printf("\tType test: %s %s %s - %s\n",ref.name,compare.String(),value.String(), - result ? "MATCH" : "NO MATCH"); - + + bool result = StringCompare(value, string.String(), compare.String(), + true); + printf("\tType test: %s %s %s - %s\n", ref.name, compare.String(), + value.String(), result ? "MATCH" : "NO MATCH"); + return result; } bool -IsSizeMatch(const BMessage &test, const entry_ref &ref) +IsSizeMatch(const BMessage& test, const entry_ref& ref) { BString value; - if (test.FindString("value",&value) != B_OK) - { + if (test.FindString("value", &value) != B_OK) { debugger("Couldn't get value in IsTypeMatch"); return false; } - + BString compare; - if (test.FindString("mode",&compare) != B_OK) - { + if (test.FindString("mode",&compare) != B_OK) { debugger("Couldn't get mode in IsTypeMatch"); return false; } - + off_t fromsize = atoll(value.String()); - - BFile file(&ref,B_READ_ONLY); + + BFile file(&ref, B_READ_ONLY); if (file.InitCheck() != B_OK) return false; - + off_t tosize; file.GetSize(&tosize); file.Unset(); - + bool result = false; - - if (strcmp(compare.String(),"is") == 0) + + if (strcmp(compare.String(), "is") == 0) result = (fromsize == tosize); - else if (strcmp(compare.String(),"is not") == 0) + else if (strcmp(compare.String(), "is not") == 0) result = (fromsize != tosize); - else if (strcmp(compare.String(),"is more than") == 0) + else if (strcmp(compare.String(), "is more than") == 0) result = (fromsize > tosize); - else if (strcmp(compare.String(),"is less than") == 0) + else if (strcmp(compare.String(), "is less than") == 0) result = (fromsize < tosize); - else if (strcmp(compare.String(),"is at least") == 0) + else if (strcmp(compare.String(), "is at least") == 0) result = (fromsize >= tosize); - else if (strcmp(compare.String(),"is at most") == 0) + else if (strcmp(compare.String(), "is at most") == 0) result = (fromsize <= tosize); - - printf("\tSize test: %s %s %lld - %s\n",ref.name,compare.String(),tosize, - result ? "MATCH" : "NO MATCH"); - + + printf("\tSize test: %s %s %lld - %s\n", ref.name, compare.String(), + tosize, result ? "MATCH" : "NO MATCH"); + return result; } bool -IsLocationMatch(const BMessage &test, const entry_ref &ref) +IsLocationMatch(const BMessage& test, const entry_ref& ref) { BString value; - if (test.FindString("value",&value) != B_OK) - { + if (test.FindString("value", &value) != B_OK) { debugger("Couldn't get value in IsLocationMatch"); return false; } - + BString compare; - if (test.FindString("mode",&compare) != B_OK) - { + if (test.FindString("mode", &compare) != B_OK) { debugger("Couldn't get mode in IsLocationMatch"); return false; } - + // This is a little tricky -- we resolve symlinks in the location test entry_ref realref; BEntry(&ref).GetRef(&realref); - + BPath path(&realref); BString filepath(path.Path()); filepath.RemoveLast(path.Leaf()); - + if (value[value.CountChars() - 1] != '/') value << "/"; - - bool result = StringCompare(value,filepath.String(),compare.String(),true); - - printf("\tLocation test: %s %s %s - %s\n",filepath.String(), - compare.String(),value.String(), - result ? "MATCH" : "NO MATCH"); - + + bool result = StringCompare(value, filepath.String(), compare.String(), + true); + + printf("\tLocation test: %s %s %s - %s\n", filepath.String(), + compare.String(), value.String(), result ? "MATCH" : "NO MATCH"); + return result; } bool -IsModifiedMatch(const BMessage &test, const entry_ref &ref) +IsModifiedMatch(const BMessage& test, const entry_ref& ref) { // TODO: Implement using Mr. Peeps! date-parsing code return false; @@ -708,315 +691,296 @@ IsModifiedMatch(const BMessage &test, const entry_ref &ref) bool -IsAttributeMatch(const BMessage &test, const entry_ref &ref) +IsAttributeMatch(const BMessage& test, const entry_ref& ref) { BString value; - if (test.FindString("value",&value) != B_OK) - { + if (test.FindString("value", &value) != B_OK) { debugger("Couldn't get value in IsTypeMatch"); return false; } - + BString compare; - if (test.FindString("mode",&compare) != B_OK) - { + if (test.FindString("mode", &compare) != B_OK) { debugger("Couldn't get mode in IsTypeMatch"); return false; } - + BString attribute; - if (test.FindString("attrtype",&attribute) != B_OK) - { + if (test.FindString("attrtype", &attribute) != B_OK) { debugger("Couldn't get attribute in IsAttributeMatch"); return false; } - + BString string; attr_info info; BNode node(&ref); if (node.InitCheck() != B_OK) return false; - - if (node.GetAttrInfo(attribute.String(),&info) != B_OK) + + if (node.GetAttrInfo(attribute.String(), &info) != B_OK) return false; - - if (node.ReadAttrString(attribute.String(),&string) != B_OK) + + if (node.ReadAttrString(attribute.String(), &string) != B_OK) return false; - - - bool result = StringCompare(value,string,compare.String(),true); - - + + bool result = StringCompare(value, string, compare.String(), true); + BString attrname; - if (test.FindString("attrname",&attrname) != B_OK) + if (test.FindString("attrname", &attrname) != B_OK) attrname = attribute; - - printf("\tAttribute test: %s %s %s - %s\n",attrname.String(), - compare.String(),value.String(), - result ? "MATCH" : "NO MATCH"); - + + printf("\tAttribute test: %s %s %s - %s\n", attrname.String(), + compare.String(), value.String(), result ? "MATCH" : "NO MATCH"); + return result; } bool -StringCompare(const BString &from, const BString &to, const char *mode, - const bool &match_case) +StringCompare(const BString& from, const BString& to, const char* mode, + const bool& match_case) { - if (!mode) - { + if (!mode) { debugger("NULL mode in StringCompare"); return false; } - - if (strcmp(mode,"is") == 0) + + if (strcmp(mode, "is") == 0) if (match_case) return from.Compare(to) == 0; else return from.ICompare(to) == 0; - else if (strcmp(mode,"is not") == 0) + else if (strcmp(mode, "is not") == 0) if (match_case) return from.Compare(to) != 0; else return from.ICompare(to) != 0; - else if (strcmp(mode,"contains") == 0) + else if (strcmp(mode, "contains") == 0) if (match_case) return to.FindFirst(from) >= 0; else return to.IFindFirst(from) >= 0; - else if (strcmp(mode,"does not contain") == 0) + else if (strcmp(mode, "does not contain") == 0) if (match_case) return to.FindFirst(from) < 0; else return to.IFindFirst(from) < 0; - else if (strcmp(mode,"starts with") == 0) + else if (strcmp(mode, "starts with") == 0) if (match_case) return to.FindFirst(from) == 0; else return to.IFindFirst(from) == 0; - else if (strcmp(mode,"ends with") == 0) - { + else if (strcmp(mode, "ends with") == 0) { int32 pos; if (match_case) pos = to.FindLast(from); else pos = to.IFindLast(from); - + return (to.CountChars() - from.CountChars() == pos); } - + return false; } status_t -MoveAction(const BMessage &action, entry_ref &ref) +MoveAction(const BMessage& action, entry_ref& ref) { BString value; status_t status; - status = action.FindString("value",&value); + status = action.FindString("value", &value); if (status != B_OK) return status; - value = ProcessPatterns(value.String(),ref); - - BEntry entry(value.String(),true); + value = ProcessPatterns(value.String(), ref); + + BEntry entry(value.String(), true); status = entry.InitCheck(); if (status != B_OK || (entry.Exists() && !entry.IsDirectory())) return B_ERROR; - + if (!entry.Exists()) - create_directory(value.String(),0777); - + create_directory(value.String(), 0777); + BEntry source(&ref); status = source.InitCheck(); if (status != B_OK) return B_ERROR; - - status = MoveFile(&source,&entry,false); - if (status == B_OK) - { - printf("\tMoved %s to %s\n",ref.name,value.String()); + + status = MoveFile(&source, &entry, false); + if (status == B_OK) { + printf("\tMoved %s to %s\n", ref.name, value.String()); source.GetRef(&ref); + } else { + printf("\tCouldn't move %s to %s. Stopping here.\n\t\t" + "Error Message: %s\n", ref.name, value.String(), strerror(status)); } - else - { - printf("\tCouldn't move %s to %s. Stopping here.\n\t\tError Message: %s\n",ref.name, - value.String(),strerror(status)); - } - + return B_OK; } status_t -CopyAction(const BMessage &action, entry_ref &ref) +CopyAction(const BMessage& action, entry_ref& ref) { BString value; status_t status; - status = action.FindString("value",&value); + status = action.FindString("value", &value); if (status != B_OK) return status; - value = ProcessPatterns(value.String(),ref); - - BEntry entry(value.String(),true); + value = ProcessPatterns(value.String(), ref); + + BEntry entry(value.String(), true); status = entry.InitCheck(); if (status != B_OK || (entry.Exists() && !entry.IsDirectory())) return B_ERROR; - + if (!entry.Exists()) - create_directory(value.String(),0777); - + create_directory(value.String(), 0777); + BEntry source(&ref); status = source.InitCheck(); if (status != B_OK) return B_ERROR; - - status = CopyFile(&source,&entry,false); - if (status == B_OK) - { - printf("\tCopied %s to %s\n",ref.name,value.String()); + + status = CopyFile(&source, &entry, false); + if (status == B_OK) { + printf("\tCopied %s to %s\n", ref.name, value.String()); source.GetRef(&ref); + } else { + printf("\tCouldn't copy %s to %s. Stopping here.\n\t\t" + "Error Message: %s\n", ref.name, value.String(), strerror(status)); } - else - { - printf("\tCouldn't copy %s to %s. Stopping here.\n\t\tError Message: %s\n",ref.name, - value.String(),strerror(status)); - } - - + return B_OK; } status_t -RenameAction(const BMessage &action, entry_ref &ref) +RenameAction(const BMessage& action, entry_ref& ref) { BString value; status_t status; - status = action.FindString("value",&value); + status = action.FindString("value", &value); if (status != B_OK) return status; - value = ProcessPatterns(value.String(),ref); - - BEntry entry(value.String(),true); + value = ProcessPatterns(value.String(), ref); + + BEntry entry(value.String(), true); status = entry.InitCheck(); if (status != B_OK || entry.Exists()) return B_ERROR; - + BEntry source(&ref); status = source.InitCheck(); if (status != B_OK) return B_ERROR; - + status = source.Rename(value.String()); - if (status == B_OK) - { - printf("\tRenamed %s to %s\n",ref.name,value.String()); + if (status == B_OK) { + printf("\tRenamed %s to %s\n", ref.name, value.String()); source.GetRef(&ref); + } else { + printf("\tCouldn't rename %s to %s. Stopping here.\n\t\t" + "Error Message: %s\n", ref.name, value.String(), strerror(status)); } - else - { - printf("\tCouldn't rename %s to %s. Stopping here.\n\t\tError Message: %s\n",ref.name, - value.String(),strerror(status)); - } - + if (status == B_OK) source.GetRef(&ref); - + return B_OK; } status_t -OpenAction(const BMessage &action, entry_ref &ref) +OpenAction(const BMessage& action, entry_ref& ref) { entry_ref app; BString appName(""); - if (be_roster->FindApp(&ref,&app) == B_OK) + if (be_roster->FindApp(&ref, &app) == B_OK) appName = app.name; - + status_t status = be_roster->Launch(&ref); - + if (status == B_OK) - printf("\tOpened %s in program %s\n",ref.name,appName.String()); - else - { - // R5 (and probably others) don't seem to want to open folders in Tracker -- - // FindApp() returns B_OK, but sets the entry_ref of the app to open it to - // the folder's ref, which is dumb. This works around this apparent stupidity. + printf("\tOpened %s in program %s\n", ref.name, appName.String()); + else { + // R5 (and probably others) don't seem to want to open folders in + // Tracker -- FindApp() returns B_OK, but sets the entry_ref of the + // app to open it to the folder's ref, which is dumb. This works + // around this apparent stupidity. BString typestr; - if (BNode(&ref).ReadAttrString("BEOS:TYPE",&typestr) == B_OK && - typestr.Compare("application/x-vnd.Be-directory") == 0) - { - BMessage *msg = new BMessage(B_REFS_RECEIVED); - msg->AddRef("refs",&ref); - be_roster->Launch("application/x-vnd.Be-TRAK",msg); - printf("\tOpened %s in program Tracker\n",ref.name); + if (BNode(&ref).ReadAttrString("BEOS:TYPE", &typestr) == B_OK + && typestr.Compare("application/x-vnd.Be-directory") == 0) { + BMessage* msg = new BMessage(B_REFS_RECEIVED); + msg->AddRef("refs", &ref); + be_roster->Launch("application/x-vnd.Be-TRAK", msg); + printf("\tOpened %s in program Tracker\n", ref.name); return B_OK; } - if (appName.CountChars() > 0) - printf("\tCouldn't open %s in program %s\n",ref.name,appName.String()); - else - printf("\tCouldn't open %s -- the system couldn't find a program to do it.\n",ref.name); + if (appName.CountChars() > 0) { + printf("\tCouldn't open %s in program %s\n", + ref.name, appName.String()); + } else + printf("\tCouldn't open %s -- the system couldn't find a program " + "to do it.\n", ref.name); } - return status; } status_t -ArchiveAction(const BMessage &action, entry_ref &ref) +ArchiveAction(const BMessage& action, entry_ref& ref) { BString value; status_t status; - status = action.FindString("value",&value); + status = action.FindString("value", &value); if (status != B_OK) return status; - value = ProcessPatterns(value.String(),ref); - + value = ProcessPatterns(value.String(), ref); + BPath path(&ref); BString parentstr = path.Path(); parentstr.ReplaceLast(path.Leaf(),""); - + BString command = ""; command << "cd '" << parentstr << "'; zip -9 -u -r '" << value << "' '" - << path.Leaf() << "'"; - + << path.Leaf() << "'"; + int result = system(command.String()); - if (result) - printf("\tCouldn't create archive %s\n\t\tError code: %d\n", value.String(),result); - else - printf("\tAdded %s to Archive %s\n",ref.name,value.String()); - + if (result) { + printf("\tCouldn't create archive %s\n\t\tError code: %d\n", + value.String(), result); + } else + printf("\tAdded %s to Archive %s\n", ref.name, value.String()); + return B_OK; } status_t -CommandAction(const BMessage &action, entry_ref &ref) +CommandAction(const BMessage& action, entry_ref& ref) { BString value; status_t status; - status = action.FindString("value",&value); + status = action.FindString("value", &value); if (status != B_OK) return status; - value = ProcessPatterns(value.String(),ref); - + value = ProcessPatterns(value.String(), ref); + int result = system(value.String()); - if (result) - { - printf("\tTerminal Command: %s\n\t\tPossible error: command returned %d\n", - value.String(),result); - } - else - printf("\tTerminal Command: %s\n",value.String()); - + if (result) { + printf("\tTerminal Command: %s\n\t\tPossible error: " + "command returned %d\n", value.String(), result); + } else + printf("\tTerminal Command: %s\n", value.String()); + return B_OK; } status_t -TrashAction(const BMessage &action, entry_ref &ref) +TrashAction(const BMessage& action, entry_ref& ref) { BPath path; find_directory(B_TRASH_DIRECTORY, &path); @@ -1025,48 +989,42 @@ TrashAction(const BMessage &action, entry_ref &ref) status_t status = entry.InitCheck(); if (status != B_OK || !entry.Exists() || !entry.IsDirectory()) return B_ERROR; - + BEntry source(&ref); status = source.InitCheck(); if (status != B_OK) return B_ERROR; - - status = MoveFile(&source,&entry,false); - if (status == B_OK) - { - printf("\tMoved %s to the Trash\n",ref.name); + + status = MoveFile(&source, &entry, false); + if (status == B_OK) { + printf("\tMoved %s to the Trash\n", ref.name); source.GetRef(&ref); + } else { + printf("\tCouldn't move %s to the Trash. Stopping here.\n\t\t" + "Error Message: %s\n", ref.name, strerror(status)); } - else - { - printf("\tCouldn't move %s to the Trash. Stopping here.\n\t\tError Message: %s\n", - ref.name,strerror(status)); - } - return B_OK; } status_t -DeleteAction(const BMessage &action, entry_ref &ref) +DeleteAction(const BMessage& action, entry_ref& ref) { BEntry entry(&ref); - + status_t status = entry.Remove(); if (status == B_OK) - printf("\tDeleted %s\n",BPath(ref.name).Path()); - else - { + printf("\tDeleted %s\n", BPath(ref.name).Path()); + else { printf("\tCouldn't delete %s. Stopping here.\n\t\tError Message: %s\n", - BPath(ref.name).Path(),strerror(status)); + BPath(ref.name).Path(), strerror(status)); } - return entry.Remove(); } status_t -SaveRules(BObjectList *ruleList) +SaveRules(BObjectList* ruleList) { BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); @@ -1088,21 +1046,21 @@ SaveRules(BObjectList *ruleList) BEntry entry(path.Path()); if (entry.Exists()) entry.Remove(); - + CppSQLite3DB db; db.open(path.Path()); // While we could use other means of obtaining table names, this table is also // used for maintaining the order of the rules, which must be preserved DBCommand(db,"create table RuleList (ruleid int primary key, name varchar);", - "PrefsWindow::SaveRules"); - + "PrefsWindow::SaveRules"); + BString command; - + for (int32 i = 0; i < ruleList->CountItems(); i++) { - FilerRule *rule = ruleList->ItemAt(i); - + FilerRule* rule = ruleList->ItemAt(i); + // Test table: // 0) Entry type (test vs action) // 1) type @@ -1111,74 +1069,75 @@ SaveRules(BObjectList *ruleList) // 4) attribute type (if Attribute test) // 5) attribute type public name (short description) // 6) attribute public name (if Attribute test) - + BString tablename(EscapeIllegalCharacters(rule->GetDescription())); - + command = "create table "; command << tablename - << "(entrytype varchar, testtype varchar, testmode varchar, testvalue varchar, - attrtype varchar, attrtypename varchar, attrpublicname varchar);"; - DBCommand(db,command.String(), "PrefsWindow::SaveRules"); - + << "(entrytype varchar, testtype varchar, testmode varchar, + testvalue varchar, attrtype varchar, attrtypename varchar, + attrpublicname varchar);"; + DBCommand(db, command.String(), "PrefsWindow::SaveRules"); + command = "insert into RuleList values("; command << i << ",'" << tablename << "');"; - DBCommand(db,command.String(), "PrefsWindow::SaveRules"); - + DBCommand(db, command.String(), "PrefsWindow::SaveRules"); + for (int32 j = 0; j < rule->CountTests(); j++) { - BMessage *test = rule->TestAt(j); + BMessage* test = rule->TestAt(j); if (!test) continue; - - BString name,mode,value,mimeType,typeName, attrType, attrName; - test->FindString("name",&name); - test->FindString("mode",&mode); - test->FindString("value",&value); - test->FindString("mimetype",&mimeType); - test->FindString("typename",&typeName); - test->FindString("attrtype",&attrType); - test->FindString("attrname",&attrName); - + + BString name, mode, value, mimeType, typeName, attrType, attrName; + test->FindString("name", &name); + test->FindString("mode", &mode); + test->FindString("value", &value); + test->FindString("mimetype", &mimeType); + test->FindString("typename", &typeName); + test->FindString("attrtype", &attrType); + test->FindString("attrname", &attrName); + command = "insert into "; - command << tablename << " values('test', '" << EscapeIllegalCharacters(name.String()) - << "', '" << EscapeIllegalCharacters(mode.String()) - << "', '" << EscapeIllegalCharacters(value.String()) - << "', '" << EscapeIllegalCharacters(mimeType.String()) - << "', '" << EscapeIllegalCharacters(typeName.String()) - << "', '" << EscapeIllegalCharacters(attrName.String()) - << "');"; - - DBCommand(db,command.String(),"PrefsWindow::SaveRules:save test"); + command << tablename << " values('test', '" + << EscapeIllegalCharacters(name.String()) + << "', '" << EscapeIllegalCharacters(mode.String()) + << "', '" << EscapeIllegalCharacters(value.String()) + << "', '" << EscapeIllegalCharacters(mimeType.String()) + << "', '" << EscapeIllegalCharacters(typeName.String()) + << "', '" << EscapeIllegalCharacters(attrName.String()) + << "');"; + + DBCommand(db, command.String(), "PrefsWindow::SaveRules:save test"); } - + for (int32 j = 0; j < rule->CountActions(); j++) { - BMessage *action = rule->ActionAt(j); + BMessage* action = rule->ActionAt(j); if (!action) continue; - - BString name,value; - action->FindString("name",&name); - action->FindString("value",&value); - + + BString name, value; + action->FindString("name", &name); + action->FindString("value", &value); + command = "insert into "; - command << tablename << " values('action', '" << EscapeIllegalCharacters(name.String()) - << "', '" - << "', '" << EscapeIllegalCharacters(value.String()) - << "', '', '', '');"; - DBCommand(db,command.String(),"PrefsWindow::SaveRules:save action"); + command << tablename << " values('action', '" + << EscapeIllegalCharacters(name.String()) + << "', '" + << "', '" << EscapeIllegalCharacters(value.String()) + << "', '', '', '');"; + DBCommand(db, command.String(), "PrefsWindow::SaveRules:save action"); } } - - db.close(); - + return B_OK; } status_t -LoadRules(BObjectList *ruleList) +LoadRules(BObjectList* ruleList) { BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); @@ -1187,120 +1146,128 @@ LoadRules(BObjectList *ruleList) BEntry entry(path.Path()); if (!entry.Exists()) return B_OK; - + CppSQLite3DB db; db.open(path.Path()); - + // Because this particular build of sqlite3 does not support multithreading - // because of lack of pthreads support, we need to do this in a slightly different order - + // because of lack of pthreads support, we need to do this in a slightly + // different order + CppSQLite3Query query; - query = DBQuery(db,"select name from RuleList order by ruleid;","PrefsWindow::LoadRules"); - + query = DBQuery(db,"select name from RuleList order by ruleid;", + "PrefsWindow::LoadRules"); + BString command; while (!query.eof()) { BString rulename = query.getStringField((int)0); - - FilerRule *rule = new FilerRule; + + FilerRule* rule = new FilerRule; rule->SetDescription(DeescapeIllegalCharacters(rulename.String()).String()); - + ruleList->AddItem(rule); - + query.nextRow(); } - + query.finalize(); - + for (int32 i = 0; i < ruleList->CountItems(); i++) { - FilerRule *rule = ruleList->ItemAt(i); - + FilerRule* rule = ruleList->ItemAt(i); + if (!rule) continue; - + BString rulename(EscapeIllegalCharacters(rule->GetDescription())); - + // Now comes the fun(?) part: loading the tests and actions. Joy. :/ command = "select * from "; command << rulename << " where entrytype = 'test';"; - query = DBQuery(db,command.String(),"PrefsWindow::LoadRules"); - + query = DBQuery(db, command.String(), "PrefsWindow::LoadRules"); + while (!query.eof()) { BString classname = DeescapeIllegalCharacters(query.getStringField(1)); - BMessage *test = new BMessage; - - test->AddString("name",classname); - - if (classname.ICompare("Attribute") == 0) - { - test->AddString("mimetype",DeescapeIllegalCharacters(query.getStringField(4))); - test->AddString("typename",DeescapeIllegalCharacters(query.getStringField(5))); - test->AddString("attrname",DeescapeIllegalCharacters(query.getStringField(6))); + BMessage* test = new BMessage; + + test->AddString("name", classname); + + if (classname.ICompare("Attribute") == 0) { + test->AddString("mimetype", + DeescapeIllegalCharacters(query.getStringField(4))); + test->AddString("typename", + DeescapeIllegalCharacters(query.getStringField(5))); + test->AddString("attrname", + DeescapeIllegalCharacters(query.getStringField(6))); } - - test->AddString("mode",DeescapeIllegalCharacters(query.getStringField(2)).String()); - test->AddString("value",DeescapeIllegalCharacters(query.getStringField(3)).String()); - + + test->AddString("mode", + DeescapeIllegalCharacters(query.getStringField(2)).String()); + test->AddString("value", + DeescapeIllegalCharacters(query.getStringField(3)).String()); + rule->AddTest(test); - + query.nextRow(); } query.finalize(); - + command = "select * from "; command << rulename << " where entrytype = 'action';"; - query = DBQuery(db,command.String(),"PrefsWindow::LoadRules"); + query = DBQuery(db, command.String(), "PrefsWindow::LoadRules"); while (!query.eof()) { - BMessage *action = new BMessage; - - action->AddString("name",DeescapeIllegalCharacters(query.getStringField(1))); - action->AddString("value",DeescapeIllegalCharacters(query.getStringField(3))); - + BMessage* action = new BMessage; + + action->AddString("name", + DeescapeIllegalCharacters(query.getStringField(1))); + action->AddString("value", + DeescapeIllegalCharacters(query.getStringField(3))); + rule->AddAction(action); - + query.nextRow(); } query.finalize(); - } - db.close(); return B_OK; } -BMessage * -MakeTest(const char *name,const char *mode, const char *value, const char *mimeType, - const char *typeName, const char *attrType, const char *attrName) + +BMessage* +MakeTest(const char* name, const char* mode, const char* value, + const char* mimeType, const char* typeName, const char* attrType, + const char* attrName) { - BMessage *msg = new BMessage; - msg->AddString("name",name); - msg->AddString("mode",mode); - msg->AddString("value",value); - - if (typeName || mimeType || attrType || attrName) - { - if(!(typeName && mimeType && attrType && attrName)) - debugger("The last 4 parameters must all be either NULL or non-NULL as a group"); - - msg->AddString("typename",typeName); - msg->AddString("mimetype",mimeType); - msg->AddString("attrtype",attrType); - msg->AddString("attrname",attrName); + BMessage* msg = new BMessage; + msg->AddString("name", name); + msg->AddString("mode", mode); + msg->AddString("value", value); + + if (typeName || mimeType || attrType || attrName) { + if (!(typeName && mimeType && attrType && attrName)) { + debugger("The last 4 parameters must all be either NULL " + "or non-NULL as a group"); + } + msg->AddString("typename", typeName); + msg->AddString("mimetype", mimeType); + msg->AddString("attrtype", attrType); + msg->AddString("attrname", attrName); } return msg; } -BMessage * -MakeAction(const char *name,const char *value) +BMessage* +MakeAction(const char* name, const char* value) { - BMessage *msg = new BMessage; - msg->AddString("name",name); - msg->AddString("value",value); - + BMessage* msg = new BMessage; + msg->AddString("name", name); + msg->AddString("value", value); + return msg; } diff --git a/sources/Filer/RuleRunner.h b/sources/Filer/RuleRunner.h index fd18f75..493fc8d 100644 --- a/sources/Filer/RuleRunner.h +++ b/sources/Filer/RuleRunner.h @@ -4,6 +4,7 @@ Written by DarkWyrm , Copyright 2008 Contributed by: Humdinger , 2016 */ + #ifndef RULERUNNER_H #define RULERUNNER_H @@ -26,23 +27,23 @@ enum class RuleRunner { public: - RuleRunner(void); - ~RuleRunner(void); - - static void GetTestTypes(BMessage &msg); - static status_t GetCompatibleModes(const char *testtype, BMessage &msg); - static status_t GetCompatibleModes(const int32 &type, BMessage &msg); - static void GetModes(BMessage &msg); - static void GetActions(BMessage &msg); - - static BString GetEditorTypeForTest(const char *testname); - - static int32 GetDataTypeForTest(const char *testname); - static int32 GetDataTypeForMode(const char *modename); - - bool IsMatch(const BMessage &test, const entry_ref &ref); - status_t RunAction(const BMessage &test, entry_ref &ref); - status_t RunRule(FilerRule *rule, entry_ref &ref); + RuleRunner(); + ~RuleRunner(); + + static void GetTestTypes(BMessage& msg); + static status_t GetCompatibleModes(const char* testtype, BMessage& msg); + static status_t GetCompatibleModes(const int32& type, BMessage& msg); + static void GetModes(BMessage& msg); + static void GetActions(BMessage& msg); + + static BString GetEditorTypeForTest(const char* testname); + + static int32 GetDataTypeForTest(const char* testname); + static int32 GetDataTypeForMode(const char* modename); + + bool IsMatch(const BMessage& test, const entry_ref& ref); + status_t RunAction(const BMessage& test, entry_ref& ref); + status_t RunRule(FilerRule* rule, entry_ref& ref); }; status_t LoadRules(BObjectList *ruleList); @@ -51,9 +52,9 @@ status_t SaveRules(BObjectList *ruleList); // Some convenience functions. Deleting the returned BMessage is the // responsibility of the caller -BMessage * MakeTest(const char *name,const char *mode, const char *value, - const char *mimeType = NULL, const char *typeName = NULL, - const char *attrType = NULL, const char *attrName = NULL); -BMessage * MakeAction(const char *name,const char *value); +BMessage* MakeTest(const char* name, const char* mode, const char* value, + const char* mimeType = NULL, const char* typeName = NULL, + const char* attrType = NULL, const char* attrName = NULL); +BMessage* MakeAction(const char* name, const char* value); -#endif +#endif // RULERUNNER_H diff --git a/sources/Filer/RuleTab.cpp b/sources/Filer/RuleTab.cpp index 54ad9f9..7dae6e7 100644 --- a/sources/Filer/RuleTab.cpp +++ b/sources/Filer/RuleTab.cpp @@ -189,7 +189,7 @@ void RuleTab::MessageReceived(BMessage* message) { // message->PrintToStream(); - switch(message->what) + switch (message->what) { case M_SHOW_ADD_WINDOW: { @@ -327,8 +327,9 @@ RuleTab::AddRule(FilerRule* rule) void RuleTab::RemoveRule(RuleItem* item) { - // Select a new rule (if there is one) before removing the old one. BListView simply drops - // the selection if the selected item is removed. What a pain in the neck. :/ + // Select a new rule (if there is one) before removing the old one. + // BListView simply drops the selection if the selected item is removed. + // What a pain in the neck. :/ int32 itemindex = fRuleItemList->IndexOf(item); int32 selection = fRuleItemList->CurrentSelection(); if (itemindex == selection && fRuleItemList->CountItems() > 1) { diff --git a/sources/Filer/TestView.cpp b/sources/Filer/TestView.cpp index dc0767b..4a6d050 100644 --- a/sources/Filer/TestView.cpp +++ b/sources/Filer/TestView.cpp @@ -3,14 +3,15 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ -#include "TestView.h" + #include -#include #include #include -#include "RuleRunner.h" +#include #include "AutoTextControl.h" +#include "RuleRunner.h" +#include "TestView.h" enum { @@ -39,9 +40,10 @@ extern BMessage gArchivedTypeMenu; #endif -TestView::TestView(const BRect &frame,const char *name, BMessage *test, - const int32 &resize,const int32 &flags) - : BView(frame,name,resize,flags), +TestView::TestView(const BRect& frame, const char* name, BMessage* test, + const int32& resize, const int32& flags) + : + BView(frame, name, resize, flags), fTest(NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -50,103 +52,99 @@ TestView::TestView(const BRect &frame,const char *name, BMessage *test, RuleRunner::GetTestTypes(fTestTypes); int32 i = 0; BString teststr, widesttest, widestmode; - while (fTestTypes.FindString("tests",i,&teststr) == B_OK) + while (fTestTypes.FindString("tests", i, &teststr) == B_OK) { i++; if (teststr.CountChars() > widesttest.CountChars()) widesttest = teststr; } - + // This will hopefully accomodate some of the attribute strings teststr = "Netpositive Password"; if (teststr.CountChars() > widesttest.CountChars()) widesttest = teststr; - - fTestButton = new BButton(BRect(0,0,1,1),"testbutton",widesttest.String(), - new BMessage(M_SHOW_TEST_MENU)); + + fTestButton = new BButton(BRect(0, 0, 1, 1), "testbutton", + widesttest.String(), new BMessage(M_SHOW_TEST_MENU)); fTestButton->ResizeToPreferred(); AddChild(fTestButton); - + BRect rect = fTestButton->Frame(); - rect.OffsetBy(rect.Width() + 10.0,0.0); - + rect.OffsetBy(rect.Width() + 10.0, 0.0); + // Find the longest name in all the modes BMessage modes; RuleRunner::GetModes(modes); i = 0; - while (modes.FindString("modes",i,&teststr) == B_OK) + while (modes.FindString("modes", i, &teststr) == B_OK) { i++; if (teststr.CountChars() > widestmode.CountChars()) widestmode = teststr; } - - fModeButton = new BButton(rect,"modebutton",widestmode.String(), - new BMessage(M_SHOW_MODE_MENU)); + + fModeButton = new BButton(rect, "modebutton", widestmode.String(), + new BMessage(M_SHOW_MODE_MENU)); fModeButton->ResizeToPreferred(); AddChild(fModeButton); - + rect = fModeButton->Frame(); - rect.OffsetBy(rect.Width() + 5,0); + rect.OffsetBy(rect.Width() + 5, 0); rect.right = rect.left + StringWidth("application/x-vnd.dw-foo") + 5; - fValueBox = new AutoTextControl(rect,"valuebox",NULL,NULL, - new BMessage(M_VALUE_CHANGED), - B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + fValueBox = new AutoTextControl(rect, "valuebox", NULL, NULL, + new BMessage(M_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); AddChild(fValueBox); fValueBox->SetDivider(0); - if (fValueBox->Bounds().Height() < fModeButton->Bounds().Height()) - fValueBox->MoveBy(0.0,(fModeButton->Bounds().Height() - fValueBox->Bounds().Height()) / 2.0); - + if (fValueBox->Bounds().Height() < fModeButton->Bounds().Height()) { + fValueBox->MoveBy(0.0,(fModeButton->Bounds().Height() + - fValueBox->Bounds().Height()) / 2.0); + } SetupTestMenu(); - + bool usedefaults = false; - if (test) - { + if (test) { STRACE(("\nTestView::TestView: test parameter\n")); MSGTRACE(test); - + fTest = new BMessage(*test); BString str; - + if (!SetTest(fTest)) usedefaults = true; - - if (fTest->FindString("mode",&str) == B_OK) + + if (fTest->FindString("mode", &str) == B_OK) SetMode(str.String()); - else - { - fTest->FindString("name",&str); + else { + fTest->FindString("name" ,&str); modes.MakeEmpty(); - RuleRunner::GetCompatibleModes(str.String(),modes); - modes.FindString("modes",0,&str); + RuleRunner::GetCompatibleModes(str.String(), modes); + modes.FindString("modes", 0, &str); SetMode(str.String()); } - - if (fTest->FindString("value",&str) == B_OK) + + if (fTest->FindString("value", &str) == B_OK) fValueBox->SetText(str.String()); - } - else + } else usedefaults = true; - - if (usedefaults) - { + + if (usedefaults) { if (!fTest) fTest = new BMessage; - + BString str; - fTestTypes.FindString("tests",0,&str); - + fTestTypes.FindString("tests", 0, &str); + BMessage newtest; - newtest.AddString("name",str); - + newtest.AddString("name", str); + modes.MakeEmpty(); - RuleRunner::GetCompatibleModes(str.String(),modes); - modes.FindString("modes",0,&str); - - newtest.AddString("mode",str); - newtest.AddString("value",""); - + RuleRunner::GetCompatibleModes(str.String(), modes); + modes.FindString("modes", 0, &str); + + newtest.AddString("mode", str); + newtest.AddString("value", ""); + SetTest(&newtest); SetMode(str.String()); } @@ -154,7 +152,7 @@ TestView::TestView(const BRect &frame,const char *name, BMessage *test, void -TestView::AttachedToWindow(void) +TestView::AttachedToWindow() { fTestButton->SetTarget(this); fModeButton->SetTarget(this); @@ -163,18 +161,18 @@ TestView::AttachedToWindow(void) BRect -TestView::GetPreferredSize(void) +TestView::GetPreferredSize() { BRect rect(fValueBox->Frame()); rect.left = rect.top = 0.0; rect.bottom += 10.0; - + return rect; } void -TestView::ResizeToPreferred(void) +TestView::ResizeToPreferred() { BRect rect = GetPreferredSize(); ResizeTo(rect.Width(),rect.Height()); @@ -182,7 +180,7 @@ TestView::ResizeToPreferred(void) void -TestView::MessageReceived(BMessage *msg) +TestView::MessageReceived(BMessage* msg) { switch (msg->what) { @@ -196,73 +194,75 @@ TestView::MessageReceived(BMessage *msg) BString mode; if (msg->FindString("mode",&mode) != B_OK) break; - + SetMode(mode.String()); break; } case M_VALUE_CHANGED: { BString str; - if (fTest->FindString("value",&str) == B_OK) - fTest->ReplaceString("value",fValueBox->Text()); + if (fTest->FindString("value", &str) == B_OK) + fTest->ReplaceString("value", fValueBox->Text()); else - fTest->AddString("value",fValueBox->Text()); + fTest->AddString("value", fValueBox->Text()); break; } case M_SHOW_TEST_MENU: { - BPopUpMenu *menu = (BPopUpMenu*)BPopUpMenu::Instantiate(&fArchivedTestMenu); + BPopUpMenu* menu + = (BPopUpMenu*)BPopUpMenu::Instantiate(&fArchivedTestMenu); menu->SetTargetForItems(this); - + for (int32 i = 0; i < menu->CountItems(); i++) { - BMenuItem *item = menu->ItemAt(i); + BMenuItem* item = menu->ItemAt(i); if (item->Submenu()) item->Submenu()->SetTargetForItems(this); } - - BPoint pt; + + BPoint point; uint32 buttons; - GetMouse(&pt,&buttons); - ConvertToScreen(&pt); - pt.x -= 10.0; - if (pt.x < 0.0) - pt.x = 0.0; - - pt.y -= 10.0; - if (pt.y < 0.0) - pt.y = 0.0; - + GetMouse(&point, &buttons); + ConvertToScreen(&point); + point.x -= 10.0; + if (point.x < 0.0) + point.x = 0.0; + + point.y -= 10.0; + if (point.y < 0.0) + point.y = 0.0; + menu->SetAsyncAutoDestruct(true); - menu->Go(pt,true,true,true); + menu->Go(point, true, true, true); break; } case M_SHOW_TYPE_MENU: { - BPopUpMenu *menu = (BPopUpMenu*)BPopUpMenu::Instantiate(&gArchivedTypeMenu); + BPopUpMenu* menu + = (BPopUpMenu*)BPopUpMenu::Instantiate(&gArchivedTypeMenu); menu->SetTargetForItems(this); - + for (int32 i = 0; i < menu->CountItems(); i++) { - BMenuItem *item = menu->ItemAt(i); + BMenuItem* item = menu->ItemAt(i); if (item->Submenu()) item->Submenu()->SetTargetForItems(this); } - - BPoint pt; + + BPoint point; uint32 buttons; - GetMouse(&pt,&buttons); - ConvertToScreen(&pt); - pt.x -= 10.0; - if (pt.x < 0.0) - pt.x = 0.0; - - pt.y -= 10.0; - if (pt.y < 0.0) - pt.y = 0.0; - + GetMouse(&point, &buttons); + ConvertToScreen(&point); + point.x -= 10.0; + if (point.x < 0.0) + point.x = 0.0; + + point.y -= 10.0; + if (point.y < 0.0) + point.y = 0.0; + menu->SetAsyncAutoDestruct(true); - menu->Go(pt,true,true,true); + menu->Go(point, true, true, true); break; } case M_SHOW_MODE_MENU: @@ -280,31 +280,30 @@ TestView::MessageReceived(BMessage *msg) } -BMessage * -TestView::GetTest(void) const +BMessage* +TestView::GetTest() const { return fTest; } void -TestView::SetupTestMenu(void) +TestView::SetupTestMenu() { // These ones will always exist. Type is the default because it's probably // going to be the one most used - BMessage *msg; - BPopUpMenu *menu = new BPopUpMenu("Test"); - - + BMessage* msg; + BPopUpMenu* menu = new BPopUpMenu("Test"); + // Read in the types in the MIME database which have extra attributes // associated with them - + BMimeType mime; BMessage types, info, attr; BString string; - + BMimeType::GetInstalledTypes(&types); - + int32 index = 0; while (types.FindString("types",index,&string) == B_OK) { @@ -312,133 +311,132 @@ TestView::SetupTestMenu(void) mime.SetTo(string.String()); if (mime.GetAttrInfo(&info) != B_OK) continue; - + int32 infoindex = 0; BString attrName; BString attrPublicName; int32 attrType; - + char attrTypeName[B_MIME_TYPE_LENGTH]; mime.GetShortDescription(attrTypeName); - - while (info.FindString("attr:name",infoindex,&attrName) == B_OK) + + while (info.FindString("attr:name", infoindex, &attrName) == B_OK) { - // This is where we create tests based on a particular type's "special" attributes + // This is where we create tests based on a particular type's + // "special" attributes // Just string attributes are supported for now - if (info.FindInt32("attr:type",infoindex,&attrType) != B_OK || - attrType != B_STRING_TYPE || - info.FindString("attr:public_name",infoindex,&attrPublicName) != B_OK) - { - infoindex++; - continue; + if (info.FindInt32("attr:type", infoindex, &attrType) != B_OK + || attrType != B_STRING_TYPE + || info.FindString("attr:public_name", infoindex, + &attrPublicName) != B_OK) { + infoindex++; + continue; } - - BMenu *submenu = GetMenu(menu,attrTypeName); + + BMenu* submenu = GetMenu(menu, attrTypeName); if (!submenu) - submenu = AddMenuSorted(menu,attrTypeName); - + submenu = AddMenuSorted(menu, attrTypeName); + msg = new BMessage(M_TEST_CHOSEN); - msg->AddString("name","Attribute"); - msg->AddString("attrtype",attrName); - msg->AddString("attrname",attrPublicName); - msg->AddString("mimetype",string); - msg->AddString("typename",attrTypeName); - submenu->AddItem(new BMenuItem(attrPublicName.String(),msg)); - + msg->AddString("name", "Attribute"); + msg->AddString("attrtype", attrName); + msg->AddString("attrname", attrPublicName); + msg->AddString("mimetype", string); + msg->AddString("typename", attrTypeName); + submenu->AddItem(new BMenuItem(attrPublicName.String(), msg)); + infoindex++; } } - - menu->AddItem(new BSeparatorItem(),0); - - + + menu->AddItem(new BSeparatorItem(), 0); + // All this weirdness is to have the "standard" tests at the top and // the attribute tests at the bottom with a separator in between BString testtype; int32 i = 0; - while (fTestTypes.FindString("tests",i,&testtype) == B_OK) + while (fTestTypes.FindString("tests", i, &testtype) == B_OK) i++; - + i--; - + while (i >= 0) { - fTestTypes.FindString("tests",i,&testtype); + fTestTypes.FindString("tests", i, &testtype); msg = new BMessage(M_TEST_CHOSEN); - msg->AddString("name",testtype); - menu->AddItem(new BMenuItem(testtype.String(),msg),0); + msg->AddString("name", testtype); + menu->AddItem(new BMenuItem(testtype.String(), msg),0); i--; } - - + menu->Archive(&fArchivedTestMenu); delete menu; } void -TestView::ShowModeMenu(void) +TestView::ShowModeMenu() { - BPopUpMenu *menu = new BPopUpMenu("String"); - BMessage *msg, modes; + BPopUpMenu* menu = new BPopUpMenu("String"); + BMessage* msg, modes; - if (RuleRunner::GetCompatibleModes(fTestButton->Label(),modes) != B_OK) + if (RuleRunner::GetCompatibleModes(fTestButton->Label(), modes) != B_OK) return; BString modestr; int32 i = 0; - while (modes.FindString("modes",i,&modestr) == B_OK) + while (modes.FindString("modes", i, &modestr) == B_OK) { i++; msg = new BMessage(M_MODE_CHOSEN); - msg->AddString("mode",modestr); + msg->AddString("mode", modestr); menu->AddItem(new BMenuItem(modestr.String(), msg)); } - + menu->SetTargetForItems(this); - - BPoint pt; + + BPoint point; uint32 buttons; - GetMouse(&pt,&buttons); - ConvertToScreen(&pt); - pt.x -= 10.0; - if (pt.x < 0.0) - pt.x = 0.0; - - pt.y -= 10.0; - if (pt.y < 0.0) - pt.y = 0.0; - + GetMouse(&point, &buttons); + ConvertToScreen(&point); + point.x -= 10.0; + if (point.x < 0.0) + point.x = 0.0; + + point.y -= 10.0; + if (point.y < 0.0) + point.y = 0.0; + menu->SetAsyncAutoDestruct(true); - menu->Go(pt,true,true,true); + menu->Go(point, true, true, true); } -BMenu * -TestView::AddMenuSorted(BMenu *parent,const char *name) +BMenu* +TestView::AddMenuSorted(BMenu* parent, const char* name) { // XXX: TODO: This doesn't work for some reason -- the items aren't sorted :( - + if (!name) return NULL; - - BMenu *menu = new BMenu(name); - + + BMenu* menu = new BMenu(name); + for (int32 i = 0; i < parent->CountItems(); i++) { - BMenuItem *item = parent->ItemAt(i); - - if (strcmp(item->Label(),name) == -1) - { -// printf("INSERT: %s is after %s\n",name,item->Label()); - parent->AddItem(menu,i); + BMenuItem* item = parent->ItemAt(i); + + if (strcmp(item->Label(), name) == -1) { +// printf("INSERT: %s is after %s\n", name, item->Label()); + parent->AddItem(menu, i); return menu; } } - + // if (parent->CountItems()) -// printf("%s is after %s\n",name,parent->ItemAt(parent->CountItems() - 1)->Label()); +// printf("%s is after %s\n", name, parent->ItemAt(parent->CountItems() +// - 1)->Label()); // else // printf("%s is last\n",name); @@ -447,127 +445,122 @@ TestView::AddMenuSorted(BMenu *parent,const char *name) } -BMenu * -TestView::GetMenu(BMenu *parent, const char *name) +BMenu* +TestView::GetMenu(BMenu* parent, const char* name) { - // This is because FindMenu recursively searches a menu. We just want to check the - // top level of fTestMenu - + // This is because FindMenu recursively searches a menu. We just want to + // check the top level of fTestMenu + if (!name) return NULL; - - + for (int32 i = 0; i < parent->CountItems(); i++) { - BMenuItem *item = parent->ItemAt(i); - + BMenuItem* item = parent->ItemAt(i); + if (!item->Submenu()) continue; - - if (strcmp(item->Label(),name) == 0) + + if (strcmp(item->Label(), name) == 0) return item->Submenu(); } - + return NULL; } bool -TestView::SetTest(BMessage *msg) +TestView::SetTest(BMessage* msg) { STRACE(("\nTestView::SetTest\n")); if (!msg) return false; - + MSGTRACE(msg); - + // The easy way to update fTest is just copy the whole thing and update // the mode and value from the controls. This saves some conditionals when // dealing with attribute tests. The fields sent by the menu items (and passed - // to this function) are the exact same as what is needed by RuleRunner's test code + // to this function) are the exact same as what is needed by RuleRunner's test + // code. // There is one catch, however. The message passed here will NOT have the mode // or value, so we need to save them and copy them over - + BString str, mode, value; - - fTest->FindString("mode",&mode); - fTest->FindString("value",&value); + + fTest->FindString("mode", &mode); + fTest->FindString("value", &value); *fTest = *msg; - + fTest->what = 0; - - if (fTest->FindString("mode",&str) != B_OK) - fTest->AddString("mode",mode); - - if (fTest->FindString("value",&str) != B_OK) - fTest->AddString("value",value); - - + + if (fTest->FindString("mode" ,&str) != B_OK) + fTest->AddString("mode", mode); + + if (fTest->FindString("value", &str) != B_OK) + fTest->AddString("value", value); + BString label; - - fTest->FindString("name",&str); + + fTest->FindString("name", &str); int32 testtype; - if (str == "Attribute") - { - fTest->FindString("typename",&str); + if (str == "Attribute") { + fTest->FindString("typename", &str); label = str; - fTest->FindString("attrname",&str); + fTest->FindString("attrname", &str); label << " : " << str; testtype = TEST_TYPE_STRING; - + // Truncate the label because it is likely too long for the button - be_plain_font->TruncateString(&label,B_TRUNCATE_SMART, - fTestButton->Bounds().Width() - 10.0); - } - else - { + be_plain_font->TruncateString(&label, B_TRUNCATE_SMART, + fTestButton->Bounds().Width() - 10.0); + } else { label = str; testtype = RuleRunner::GetDataTypeForTest(label.String()); } - + fTestButton->SetLabel(label.String()); - + // Now that the test button has been updated, make sure that the mode currently // set is supported by the current test int32 modetype = RuleRunner::GetDataTypeForMode(fModeButton->Label()); - if (testtype != modetype && modetype != TEST_TYPE_ANY) - { + if (testtype != modetype && modetype != TEST_TYPE_ANY) { STRACE(("Modes not compatible, refreshing.\n")); // Not compatible, so reset the mode to something compatible BMessage modes; - RuleRunner::GetCompatibleModes(testtype,modes); - + RuleRunner::GetCompatibleModes(testtype, modes); + BString modestr; - modes.FindString("modes",0,&modestr); + modes.FindString("modes", 0, &modestr); SetMode(modestr.String()); } STRACE(("-------------------------\n")); - + return true; } void -TestView::SetMode(const char *mode) +TestView::SetMode(const char* mode) { if (!mode) return; - - // This function assumes that the string passed to it is valid for the test type + + // This function assumes that the string passed to it is valid + // for the test type BString str; - if (fTest->FindString("mode",&str) == B_OK) - fTest->ReplaceString("mode",mode); + if (fTest->FindString("mode", &str) == B_OK) + fTest->ReplaceString("mode", mode); else - fTest->AddString("mode",mode); + fTest->AddString("mode", mode); fModeButton->SetLabel(mode); } -const char * -TestView::GetValue(void) +const char* +TestView::GetValue() { // Exists for future expansion when different controls are associated with // different tests return fValueBox->Text(); } - diff --git a/sources/Filer/TestView.h b/sources/Filer/TestView.h index 80f4a30..4894313 100644 --- a/sources/Filer/TestView.h +++ b/sources/Filer/TestView.h @@ -6,50 +6,50 @@ #ifndef TESTVIEW_H #define TESTVIEW_H -#include +#include #include #include #include -#include -#include #include +#include +#include class AutoTextControl; class TestView : public BView { public: - TestView(const BRect &frame,const char *name, - BMessage *test = NULL, - const int32 &resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, - const int32 &flags = B_WILL_DRAW); - void AttachedToWindow(void); - BRect GetPreferredSize(void); - void ResizeToPreferred(void); - void MessageReceived(BMessage *msg); - BMessage * GetTest(void) const; + TestView(const BRect& frame, const char* name, + BMessage* test = NULL, + const int32& resize = B_FOLLOW_LEFT | B_FOLLOW_TOP, + const int32& flags = B_WILL_DRAW); + + void AttachedToWindow(); + BRect GetPreferredSize(); + void ResizeToPreferred(); + void MessageReceived(BMessage* msg); + BMessage* GetTest() const; private: - - void SetupTestMenu(void); - void ShowModeMenu(void); - bool SetTest(BMessage *msg); - void SetMode(const char *mode); - const char *GetValue(void); + void SetupTestMenu(); + void ShowModeMenu(); + bool SetTest(BMessage* msg); + void SetMode(const char* mode); + const char* GetValue(); - BMenu * AddMenuSorted(BMenu *parent,const char *name); - BMenu * GetMenu(BMenu *parent,const char *name); + BMenu* AddMenuSorted(BMenu* parent, const char* name); + BMenu* GetMenu(BMenu* parent, const char* name); - BButton *fTestButton, - *fModeButton; + BButton* fTestButton; + BButton* fModeButton; BMessage fArchivedTestMenu; - AutoTextControl *fValueBox; + AutoTextControl* fValueBox; - BMessage *fTest; - BMessage fTestTypes; + BMessage* fTest; + BMessage fTestTypes; }; -#endif +#endif // TESTVIEW_H diff --git a/sources/Filer/TypedRefFilter.cpp b/sources/Filer/TypedRefFilter.cpp index 1e32bb1..8405872 100644 --- a/sources/Filer/TypedRefFilter.cpp +++ b/sources/Filer/TypedRefFilter.cpp @@ -1,68 +1,70 @@ #include "TypedRefFilter.h" -TypedRefFilter::TypedRefFilter(void) - : BRefFilter() +TypedRefFilter::TypedRefFilter() + : + BRefFilter() { } -TypedRefFilter::TypedRefFilter(const char *file_type, const uint32 &node_type) - : BRefFilter(), +TypedRefFilter::TypedRefFilter(const char* file_type, const uint32& node_type) + : + BRefFilter(), fFileType(file_type), fNodeType(node_type) { } -TypedRefFilter::~TypedRefFilter(void) +TypedRefFilter::~TypedRefFilter() { } - -const char * -TypedRefFilter::FileType(void) const + +const char* +TypedRefFilter::FileType() const { return fFileType.String(); } void -TypedRefFilter::SetFileType(const char *type) +TypedRefFilter::SetFileType(const char* type) { fFileType = type; } uint32 -TypedRefFilter::NodeType(void) const +TypedRefFilter::NodeType() const { return fNodeType; } void -TypedRefFilter::SetNodeType(const uint32 &node_type) +TypedRefFilter::SetNodeType(const uint32& node_type) { fNodeType = node_type; } bool -TypedRefFilter::Filter(const entry_ref *ref, BNode *node, struct stat_beos *st, - const char *filetype) +TypedRefFilter::Filter(const entry_ref* ref, BNode* node, struct stat_beos* st, + const char* filetype) { // it does not match the entry filter, then we automatically kick back a false - if ( !( ((B_DIRECTORY_NODE & NodeType()) && S_ISDIR(st->st_mode)) || - ((B_FILE_NODE & NodeType()) && S_ISREG(st->st_mode)) || - ((B_SYMLINK_NODE & NodeType()) && S_ISLNK(st->st_mode)) ) ) + if ( !( ((B_DIRECTORY_NODE & NodeType()) && S_ISDIR(st->st_mode)) + || ((B_FILE_NODE & NodeType()) && S_ISREG(st->st_mode)) + || ((B_SYMLINK_NODE & NodeType()) && S_ISLNK(st->st_mode)) ) ) return false; - + // An empty file type means any file type if (fFileType.Length() < 1) return true; - + if (fFileType == filetype) return true; - + return false; } diff --git a/sources/Filer/TypedRefFilter.h b/sources/Filer/TypedRefFilter.h index 6373611..4722b47 100644 --- a/sources/Filer/TypedRefFilter.h +++ b/sources/Filer/TypedRefFilter.h @@ -12,26 +12,23 @@ class TypedRefFilter : public BRefFilter { public: - TypedRefFilter(void); - TypedRefFilter(const char *file_type, - const uint32 &node_type = B_FILE_NODE | - B_DIRECTORY_NODE | - B_SYMLINK_NODE); - virtual ~TypedRefFilter(void); + TypedRefFilter(); + TypedRefFilter(const char* file_type, + const uint32& node_type + = B_FILE_NODE | B_DIRECTORY_NODE | B_SYMLINK_NODE); + virtual ~TypedRefFilter(); - const char * FileType(void) const; - void SetFileType(const char *type); - - uint32 NodeType(void) const; - void SetNodeType(const uint32 &node_type); - - virtual bool Filter(const entry_ref *ref, BNode *node, - struct stat_beos *st, const char *filetype); + const char* FileType() const; + void SetFileType(const char* type); + uint32 NodeType() const; + void SetNodeType(const uint32& node_type); + virtual bool Filter(const entry_ref* ref, BNode* node, + struct stat_beos* st, const char* filetype); private: - BString fFileType; - uint32 fNodeType; + BString fFileType; + uint32 fNodeType; }; -#endif +#endif // TYPED_REF_FILTER diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index 59f6cc1..d20134c 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -5,6 +5,7 @@ Written by DarkWyrm , Copyright 2008 Contributed by: Humdinger , 2016 */ + #include #include #include @@ -23,15 +24,16 @@ BMessage gArchivedTypeMenu; // Original def in TestView.cpp #define M_TYPE_CHOSEN 'tych' -App::App(void) - : BApplication("application/x-vnd.dw-Filer"), +App::App() + : + BApplication("application/x-vnd.dw-Filer"), fRefList(NULL), fRuleList(NULL), fMainWin(NULL), fQuitRequested(false) { - fRefList = new BObjectList(20,true); - fRuleList = new BObjectList(20,true); + fRefList = new BObjectList(20, true); + fRuleList = new BObjectList(20, true); // SetupTypeMenu(); @@ -39,7 +41,7 @@ App::App(void) } -App::~App(void) +App::~App() { delete fRefList; delete fRuleList; @@ -47,9 +49,9 @@ App::~App(void) void -App::MessageReceived(BMessage *msg) +App::MessageReceived(BMessage* msg) { - switch(msg->what) + switch (msg->what) { default: BApplication::MessageReceived(msg); @@ -59,7 +61,7 @@ App::MessageReceived(BMessage *msg) void -App::RefsReceived(BMessage *msg) +App::RefsReceived(BMessage* msg) { entry_ref tempRef; int32 i = 0; @@ -69,11 +71,10 @@ App::RefsReceived(BMessage *msg) BEntry entry(&tempRef); if (entry.Exists()) { - entry_ref *ref = new entry_ref(tempRef); + entry_ref* ref = new entry_ref(tempRef); entry.GetRef(ref); fRefList->AddItem(ref); - } - else + } else printf("Couldn't find file %s\n",tempRef.name); i++; } @@ -88,18 +89,16 @@ App::RefsReceived(BMessage *msg) void -App::ArgvReceived(int32 argc, char **argv) +App::ArgvReceived(int32 argc, char** argv) { for (int32 i = 1; i < argc; i++) { BEntry entry(argv[i]); - if (entry.Exists()) - { - entry_ref *ref = new entry_ref; + if (entry.Exists()) { + entry_ref* ref = new entry_ref; entry.GetRef(ref); fRefList->AddItem(ref); - } - else + } else printf("Couldn't find file %s\n",argv[i]); } @@ -112,7 +111,7 @@ App::ArgvReceived(int32 argc, char **argv) void -App::ReadyToRun(void) +App::ReadyToRun() { if (fRefList->CountItems() > 0 || fQuitRequested) { ProcessFiles(); @@ -142,60 +141,58 @@ App::FileRef(entry_ref ref) for (int32 i = 0; i < fRuleList->CountItems(); i++) { - FilerRule * rule = fRuleList->ItemAt(i); - runner.RunRule(rule,ref); + FilerRule* rule = fRuleList->ItemAt(i); + runner.RunRule(rule, ref); } } void -App::SetupTypeMenu(void) +App::SetupTypeMenu() { - BPopUpMenu *menu = new BPopUpMenu("Type"); - - + BPopUpMenu* menu = new BPopUpMenu("Type"); + // Read in the types in the MIME database which have extra attributes // associated with them - + BMimeType mime; BMessage supertypes, types, info, attr; BString supertype; - + BMimeType::GetInstalledSupertypes(&supertypes); - + int32 index = 0; - while (supertypes.FindString("super_types",index,&supertype) == B_OK) + while (supertypes.FindString("super_types", index, &supertype) == B_OK) { index++; - - BMenu *submenu = new BMenu(supertype.String()); + + BMenu* submenu = new BMenu(supertype.String()); menu->AddItem(submenu); - - BMimeType::GetInstalledTypes(supertype.String(),&types); - + + BMimeType::GetInstalledTypes(supertype.String(), &types); + BString string; int32 typeindex = 0; - - while (types.FindString("types",typeindex,&string) == B_OK) + + while (types.FindString("types", typeindex, &string) == B_OK) { typeindex++; - + mime.SetTo(string.String()); - + char attrTypeName[B_MIME_TYPE_LENGTH]; mime.GetShortDescription(attrTypeName); - + BString supertype = string.String(); supertype.Truncate(supertype.FindFirst("/")); - - BMenuItem *item = menu->FindItem(supertype.String()); - BMenu *submenu = item->Submenu(); - if (!submenu->FindItem(attrTypeName)) - { - BMessage *msg = new BMessage(M_TYPE_CHOSEN); - msg->AddString("type",string.String()); - msg->AddString("typename",attrTypeName); - submenu->AddItem(new BMenuItem(attrTypeName,msg)); + + BMenuItem* item = menu->FindItem(supertype.String()); + BMenu* submenu = item->Submenu(); + if (!submenu->FindItem(attrTypeName)) { + BMessage* msg = new BMessage(M_TYPE_CHOSEN); + msg->AddString("type", string.String()); + msg->AddString("typename", attrTypeName); + submenu->AddItem(new BMenuItem(attrTypeName, msg)); } } } @@ -208,7 +205,7 @@ App::SetupTypeMenu(void) int main() { - App *app = new App; + App* app = new App; app->Run(); delete app; return 0; diff --git a/sources/Filer/main.h b/sources/Filer/main.h index 97bc76d..7038d2c 100644 --- a/sources/Filer/main.h +++ b/sources/Filer/main.h @@ -4,12 +4,14 @@ Written by DarkWyrm , Copyright 2008 Released under the MIT license. */ + #ifndef MAIN_H #define MAIN_H #include #include #include + #include "ObjectList.h" class FilerRule; @@ -18,25 +20,25 @@ class MainWindow; class App : public BApplication { public: - App(void); - ~App(void); - void MessageReceived(BMessage *msg); - void RefsReceived(BMessage *msg); - void ArgvReceived(int32 argc, char **argv); - void ReadyToRun(void); - void SetupTypeMenu(void); - - // Filing-related functions - void FileRef(entry_ref ref); + App(); + ~App(); + + void MessageReceived(BMessage* msg); + void RefsReceived(BMessage* msg); + void ArgvReceived(int32 argc, char** argv); + void ReadyToRun(); + + void SetupTypeMenu(); + void FileRef(entry_ref ref); private: void ProcessFiles(); - BObjectList *fRefList; - BObjectList *fRuleList; - MainWindow *fMainWin; + BObjectList* fRefList; + BObjectList* fRuleList; + MainWindow* fMainWin; - bool fQuitRequested; + bool fQuitRequested; }; -#endif +#endif // MAIN_H From 2dfb2fa753b55436ff756a653c62103d67c39cd2 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Mon, 25 Apr 2016 15:01:47 +0200 Subject: [PATCH 04/10] Use a "Help" tab instead of a menu bar Use a 4th tab "Help" to show the "About" and links to the documentation via buttons. Gets rid of the menu bar which looked stupid with only one menubar item. Resizing behaviour isn't yet OK: the window can't be resized vertically... Merged DropZone into DropZoneTab. It's neater. Send requests for docu everywhere to the main app. --- sources/Filer/DropZone.cpp | 53 --------- sources/Filer/DropZone.h | 26 ----- sources/Filer/DropZoneTab.cpp | 42 +++++++ sources/Filer/DropZoneTab.h | 13 ++- sources/Filer/HelpTab.cpp | 190 +++++++++++++++++++++++++++++++ sources/Filer/HelpTab.h | 53 +++++++++ sources/Filer/MainWindow.cpp | 27 +---- sources/Filer/MainWindow.h | 2 + sources/Filer/Makefile | 4 +- sources/Filer/RuleEditWindow.cpp | 25 +--- sources/Filer/main.cpp | 38 ++++++- sources/Filer/main.h | 1 + 12 files changed, 347 insertions(+), 127 deletions(-) delete mode 100644 sources/Filer/DropZone.cpp delete mode 100644 sources/Filer/DropZone.h create mode 100644 sources/Filer/HelpTab.cpp create mode 100644 sources/Filer/HelpTab.h diff --git a/sources/Filer/DropZone.cpp b/sources/Filer/DropZone.cpp deleted file mode 100644 index fd02d0b..0000000 --- a/sources/Filer/DropZone.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2016. All rights reserved. - * Distributed under the terms of the MIT license. - * - * Author: - * Humdinger, humdingerb@gmail.com - */ - -#include - -#include "DropZone.h" -#include "main.h" - - -DropZone::DropZone() - : - BView("dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE) -{ -} - - -DropZone::~DropZone() -{ -} - - -void -DropZone::Draw(BRect rect) -{ - SetDrawingMode(B_OP_ALPHA); - - SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT)); - SetLowColor(0, 0, 0, 0); - - BRect bounds = Bounds(); - StrokeRect(bounds); - FillRect(bounds.InsetBySelf(3, 3), stripePattern); - - BView::Draw(rect); -} - - -void -DropZone::MessageReceived(BMessage* message) -{ - if (message->WasDropped()) { - BMessenger messenger(be_app); - message->what = B_REFS_RECEIVED; - messenger.SendMessage(message); - } - - BView::MessageReceived(message); -} diff --git a/sources/Filer/DropZone.h b/sources/Filer/DropZone.h deleted file mode 100644 index 1332dbb..0000000 --- a/sources/Filer/DropZone.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2016. All rights reserved. - * Distributed under the terms of the MIT license. - * - * Author: - * Humdinger, humdingerb@gmail.com - */ - -#ifndef DROPZONE_H -#define DROPZONE_H - -#include - -const pattern stripePattern = {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}; - -class DropZone : public BView -{ -public: - DropZone(); - ~DropZone(); - - virtual void Draw(BRect rect); - void MessageReceived(BMessage* message); -}; - -#endif // DROPZONE_H diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index 2e4a4b7..cade177 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -12,6 +12,48 @@ #include #include "DropZoneTab.h" +#include "main.h" + + +DropZone::DropZone() + : + BView("dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE) +{ +} + + +DropZone::~DropZone() +{ +} + + +void +DropZone::Draw(BRect rect) +{ + SetDrawingMode(B_OP_ALPHA); + + SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT)); + SetLowColor(0, 0, 0, 0); + + BRect bounds = Bounds(); + StrokeRect(bounds); + FillRect(bounds.InsetBySelf(3, 3), stripePattern); + + BView::Draw(rect); +} + + +void +DropZone::MessageReceived(BMessage* msg) +{ + if (msg->WasDropped()) { + BMessenger messenger(be_app); + msg->what = B_REFS_RECEIVED; + messenger.SendMessage(msg); + } + + BView::MessageReceived(msg); +} DropZoneTab::DropZoneTab() diff --git a/sources/Filer/DropZoneTab.h b/sources/Filer/DropZoneTab.h index ed884ba..920fe28 100644 --- a/sources/Filer/DropZoneTab.h +++ b/sources/Filer/DropZoneTab.h @@ -11,7 +11,18 @@ #include -#include "DropZone.h" +const pattern stripePattern = {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}; + +class DropZone : public BView +{ +public: + DropZone(); + ~DropZone(); + + virtual void Draw(BRect rect); + void MessageReceived(BMessage* msg); +}; + class DropZoneTab : public BView { diff --git a/sources/Filer/HelpTab.cpp b/sources/Filer/HelpTab.cpp new file mode 100644 index 0000000..093f394 --- /dev/null +++ b/sources/Filer/HelpTab.cpp @@ -0,0 +1,190 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#include +#include +#include +#include + +#include "HelpTab.h" +#include "main.h" + +#define M_SHOW_HELP 'shhl' +#define M_SHOW_DOCS 'shdc' + + +IconView::IconView() + : + BView("iconview", B_WILL_DRAW | B_SUPPORTS_LAYOUT), + fIcon(NULL) +{ + GetIcon(); +} + + +IconView::~IconView() +{ +} + + +void +IconView::Draw(BRect updateRect) +{ + if (fIcon == NULL) + return; + + SetDrawingMode(B_OP_ALPHA); + SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY); + DrawBitmapAsync(fIcon, BPoint(0, 0)); +} + + +void +IconView::AttachedToWindow() +{ + SetViewUIColor(B_PANEL_BACKGROUND_COLOR); + + BView::AttachedToWindow(); +} + + +BBitmap* +IconView::Icon() +{ + return fIcon; +} + + +BSize +IconView::MinSize() +{ + return BSize(64.0, 64.0); +} + + +BSize +IconView::MaxSize() +{ + return BSize(64.0, 64.0); +} + + +void +IconView::GetIcon() +{ + BResources* resources = BApplication::AppResources(); + + if (resources != NULL) { + size_t size; + const uint8* data + = (const uint8*)resources->LoadResource(B_VECTOR_ICON_TYPE, + "BEOS:ICON", &size); + fIcon = new BBitmap(BRect(0, 0, 64, 64), 0, B_RGBA32); + if (fIcon != NULL) { + if (data == NULL + || BIconUtils::GetVectorIcon(data, size, fIcon) + != B_OK) { + delete fIcon; + fIcon = NULL; + } + } + } +} + + +HelpTab::HelpTab() + : + BView("Help", B_SUPPORTS_LAYOUT) +{ + // Icon + fIconView = new IconView(); + + // About info + fName = new BStringView("name", "Filer"); + BFont font; + fName->GetFont(&font); + font.SetFace(B_BOLD_FACE); + font.SetSize(font.Size() * 2.0); + fName->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + fName->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + + fVersion = new BStringView("version", "v1.1.0"); + fVersion->GetFont(&font); + font.SetFace(B_REGULAR_FACE); + font.SetSize(font.Size() * 0.9); + fVersion->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + fVersion->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + + fCopyright1 = new BStringView("copy1", "Copyright 2008, DarkWyrm"); + fCopyright2 = new BStringView("copy2", "Copyright 2016, Humdinger"); + fCopyright1->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + fCopyright2->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + fCopyright1->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + fCopyright2->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + + fInfo = new BTextView("info"); + fInfo->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); + fInfo->MakeEditable(false); + fInfo->SetWordWrap(true); + fInfo->SetStylable(true); + fInfo->SetText("Filer is an automatic file organizer. It takes the " + "files it's opened with or that are dropped on it and moves, " + "renames, copies or does all sorts of other things with them " + "according to rules created by the user."); + + // work-around for misbehaving BTextView: the other GUI elements treat it + // as it were only one line high. + float minHeight, maxHeight, prefHeight; + fInfo->GetHeightForWidth(300.0, &minHeight, &maxHeight, &prefHeight); + fInfo->SetExplicitMinSize(BSize(30.0, minHeight)); + fInfo->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + fInfo->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP)); + + // Buttons + fHelpButton = new BButton("help", "Help on rules", + new BMessage(M_SHOW_HELP)); + fHelpButton->SetTarget(be_app); + + fDocsButton = new BButton("docs", "User documentation", + new BMessage(M_SHOW_DOCS)); + fDocsButton->SetTarget(be_app); + + // Laying it all out + static const float spacing = be_control_look->DefaultItemSpacing(); + BLayoutBuilder::Group<>(this, B_HORIZONTAL) + .SetInsets(B_USE_WINDOW_INSETS) + .AddGroup(B_VERTICAL, 0) + .SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP)) + .SetInsets(0, spacing / 2, 0, 0) + .Add(fIconView) + .End() + .AddGroup(B_VERTICAL, 0) + .Add(fName) + .Add(fVersion) + .Add(fCopyright1) + .Add(fCopyright2) + .AddStrut(spacing) + .Add(fInfo, 0) + .AddStrut(spacing) + .AddGroup(B_HORIZONTAL) + .AddGlue() + .Add(fHelpButton) + .Add(fDocsButton) + .AddGlue() + .End() + .End(); +} + + +HelpTab::~HelpTab() +{ +} diff --git a/sources/Filer/HelpTab.h b/sources/Filer/HelpTab.h new file mode 100644 index 0000000..4f972f7 --- /dev/null +++ b/sources/Filer/HelpTab.h @@ -0,0 +1,53 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#ifndef HELPTAB_H +#define HELPTAB_H + +#include +#include +#include +#include +#include + +class IconView : public BView { +public: + IconView(); + ~IconView(); + + void AttachedToWindow(); + virtual void Draw(BRect updateRect); + virtual BSize MinSize(); + virtual BSize MaxSize(); + +private: + void GetIcon(); + BBitmap* Icon(); + + BBitmap* fIcon; +}; + + +class HelpTab : public BView +{ +public: + HelpTab(); + ~HelpTab(); +private: + IconView* fIconView; + BStringView* fName; + BStringView* fVersion; + BStringView* fCopyright1; + BStringView* fCopyright2; + BTextView* fInfo; + + BButton* fHelpButton; + BButton* fDocsButton; +}; + +#endif // HELPTAB_H diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp index 14fd291..d1998d6 100644 --- a/sources/Filer/MainWindow.cpp +++ b/sources/Filer/MainWindow.cpp @@ -25,7 +25,7 @@ MainWindow::MainWindow() : - BWindow(BRect(50, 50, 400, 350), B_TRANSLATE_SYSTEM_NAME("Filer"), + BWindow(BRect(50, 50, 400, 320), B_TRANSLATE_SYSTEM_NAME("Filer"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) { _BuildLayout(); @@ -48,27 +48,6 @@ MainWindow::QuitRequested() void MainWindow::_BuildLayout() { - // The menu - BMenuBar* menuBar = new BMenuBar("menubar"); - BMenu* menu; - BMenuItem* item; - - menu = new BMenu(B_TRANSLATE("App")); - item = new BMenuItem(B_TRANSLATE("About Filer"), - new BMessage(B_ABOUT_REQUESTED)); - menu->AddItem(item); - item->SetTarget(be_app); - item = new BMenuItem(B_TRANSLATE("User documentation"), - new BMessage(DOCS)); - menu->AddItem(item); - item = new BMenuItem(B_TRANSLATE("Help on Rules"), - new BMessage(HELP)); - menu->AddItem(item); - item = new BMenuItem(B_TRANSLATE("Quit"), - new BMessage(B_QUIT_REQUESTED), 'Q'); - menu->AddItem(item); - menuBar->AddItem(menu); - // The tabview fTabView = new BTabView("tabview", B_WIDTH_FROM_WIDEST); fTabView->SetBorder(B_NO_BORDER); @@ -77,14 +56,16 @@ MainWindow::_BuildLayout() fDropZone = new DropZoneTab(); fRules = new RuleTab(); fAutoFiler = new AutoFilerTab(); + fHelp = new HelpTab(); fTabView->AddTab(fDropZone); fTabView->AddTab(fRules); fTabView->AddTab(fAutoFiler); + fTabView->AddTab(fHelp); // do the layouting BLayoutBuilder::Group<>(this, B_VERTICAL, 0) - .Add(menuBar) +// .Add(menuBar) .AddGroup(B_VERTICAL) .SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0) .Add(fTabView) diff --git a/sources/Filer/MainWindow.h b/sources/Filer/MainWindow.h index 63a973e..c0207e7 100644 --- a/sources/Filer/MainWindow.h +++ b/sources/Filer/MainWindow.h @@ -23,6 +23,7 @@ #include "AutoFilerTab.h" #include "DropZoneTab.h" +#include "HelpTab.h" #include "RuleTab.h" #include @@ -45,6 +46,7 @@ class MainWindow : public BWindow { DropZoneTab* fDropZone; RuleTab* fRules; AutoFilerTab* fAutoFiler; + HelpTab* fHelp; }; #endif // MAIN_WINDOW_H diff --git a/sources/Filer/Makefile b/sources/Filer/Makefile index b5bdf2e..6a26cf1 100644 --- a/sources/Filer/Makefile +++ b/sources/Filer/Makefile @@ -30,8 +30,8 @@ APP_MIME_SIG = application/x-vnd.dw-Filer # Also note that spaces in folder names do not work well with this Makefile. SRCS = AutoFilerTab.cpp FilerRule.cpp FSUtils.cpp main.cpp PatternProcessor.cpp \ RuleRunner.cpp ActionView.cpp AutoTextControl.cpp CppSQLite3.cpp Database.cpp \ - DropZone.cpp DropZoneTab.cpp MainWindow.cpp RefStorage.cpp RuleEditWindow.cpp \ - RuleItem.cpp RuleTab.cpp TypedRefFilter.cpp TestView.cpp + DropZoneTab.cpp HelpTab.cpp MainWindow.cpp RefStorage.cpp \ + RuleEditWindow.cpp RuleItem.cpp RuleTab.cpp TypedRefFilter.cpp TestView.cpp # Specify the resource definition files to use. Full or relative paths can be # used. diff --git a/sources/Filer/RuleEditWindow.cpp b/sources/Filer/RuleEditWindow.cpp index 15fd281..23153ce 100644 --- a/sources/Filer/RuleEditWindow.cpp +++ b/sources/Filer/RuleEditWindow.cpp @@ -5,18 +5,18 @@ Contributed by: Humdinger , 2016 */ - #include #include #include +#include #include #include #include - #include "ActionView.h" #include "AutoTextControl.h" #include "FilerRule.h" +#include "main.h" #include "RuleEditWindow.h" #include "TestView.h" @@ -33,7 +33,8 @@ enum M_ADD_ACTION = 'adac', M_REMOVE_ACTION = 'rmac', - M_SHOW_HELP = 'shhl' + M_SHOW_HELP = 'shhl', + M_SHOW_DOCS = 'shdc' }; @@ -138,6 +139,7 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) new BMessage(M_SHOW_HELP), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fHelp->ResizeToPreferred(); fHelp->MoveTo(10, fOK->Frame().top); + fHelp->SetTarget(be_app); top->AddChild(fHelp); top->AddChild(fCancel); @@ -172,23 +174,6 @@ RuleEditWindow::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_SHOW_HELP: - { - app_info info; - BPath path; - be_roster->GetActiveAppInfo(&info); - BEntry entry(&info.ref); - - entry.GetPath(&path); - path.GetParent(&path); - path.Append("documentation/Rule-Making Reference.html"); - - entry = path.Path(); - entry_ref ref; - entry.GetRef(&ref); - be_roster->Launch(&ref); - break; - } case M_OK: { if (strlen(fDescriptionBox->Text()) < 1) { diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index d20134c..0a72c78 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "main.h" #include "FilerRule.h" @@ -24,6 +25,11 @@ BMessage gArchivedTypeMenu; // Original def in TestView.cpp #define M_TYPE_CHOSEN 'tych' +// Original def in EditRuleWindow.cpp +#define M_SHOW_HELP 'shhl' +#define M_SHOW_DOCS 'shdc' + + App::App() : BApplication("application/x-vnd.dw-Filer"), @@ -53,6 +59,16 @@ App::MessageReceived(BMessage* msg) { switch (msg->what) { + case M_SHOW_HELP: + { + ShowHTML("documentation/Rule-Making Reference.html"); + break; + } + case M_SHOW_DOCS: + { + ShowHTML("documentation/User Documentation.html"); + break; + } default: BApplication::MessageReceived(msg); break; @@ -102,8 +118,7 @@ App::ArgvReceived(int32 argc, char** argv) printf("Couldn't find file %s\n",argv[i]); } - if (argc > 1 && fRefList->CountItems() == 0) - { + if (argc > 1 && fRefList->CountItems() == 0) { printf("No files given could be processed. Exiting.\n"); fQuitRequested = true; } @@ -134,6 +149,25 @@ App::ProcessFiles() } +void +App::ShowHTML(const char* docfile) +{ + app_info info; + BPath path; + be_roster->GetActiveAppInfo(&info); + BEntry entry(&info.ref); + + entry.GetPath(&path); + path.GetParent(&path); + path.Append(docfile); + + entry = path.Path(); + entry_ref ref; + entry.GetRef(&ref); + be_roster->Launch(&ref); +} + + void App::FileRef(entry_ref ref) { diff --git a/sources/Filer/main.h b/sources/Filer/main.h index 7038d2c..5690e68 100644 --- a/sources/Filer/main.h +++ b/sources/Filer/main.h @@ -29,6 +29,7 @@ class App : public BApplication void ReadyToRun(); void SetupTypeMenu(); + void ShowHTML(const char* docfile); void FileRef(entry_ref ref); private: From 251def5fc65da80ed2d5f0d5146490bdecf428e8 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 30 Apr 2016 13:40:26 +0200 Subject: [PATCH 05/10] Make the dropzone replicatable Add a button to make the dropzone replicatable. It opens a window for the user to resize the dropzone before replicating it. Needs its own window, because the main window size might not be shrinkable enough for the desired replicant size. When files are dropped, forward refs by launching the Filer app, so it'll still work when replicated. Removed localization preparations, because that'll only work with a layout-aware RulesEditWindow --- sources/Filer/DropZoneTab.cpp | 174 ++++++++++++++++++++++++++++-- sources/Filer/DropZoneTab.h | 34 ++++-- sources/Filer/MainWindow.cpp | 6 +- sources/Filer/MainWindow.h | 3 - sources/Filer/Makefile | 4 +- sources/Filer/ReplicantWindow.cpp | 46 ++++++++ sources/Filer/ReplicantWindow.h | 26 +++++ 7 files changed, 266 insertions(+), 27 deletions(-) create mode 100644 sources/Filer/ReplicantWindow.cpp create mode 100644 sources/Filer/ReplicantWindow.h diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index cade177..5a6894d 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -7,18 +7,93 @@ */ #include +#include +#include #include -#include +#include #include +#include #include "DropZoneTab.h" #include "main.h" +#include "ReplicantWindow.h" -DropZone::DropZone() +#define REPLICATE 'repl' + +void +DropZone::_Init() +{ + if (fReplicated) + SetViewColor(B_TRANSPARENT_COLOR); + + fLabel1 = new BStringView("label1", " Filer "); + fLabel2 = new BStringView("label2", " Dropzone "); + + BFont font; + fLabel1->GetFont(&font); + font.SetFace(B_CONDENSED_FACE); + font.SetSize(font.Size() * 1.5); + fLabel1->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + font.SetSize(font.Size() * 0.75); + fLabel2->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE + | B_FONT_FLAGS); + + fLabel1->SetAlignment(B_ALIGN_CENTER); + fLabel2->SetAlignment(B_ALIGN_CENTER); + + return; +} + + +DropZone::DropZone(bool replicatable) : - BView("dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE) + BView("Filer dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE), + fReplicated(false) { + _Init(); + + if (replicatable) { + // Dragger + BRect rect(Bounds()); + rect.left = rect.right - 7; + rect.top = rect.bottom - 7; + BDragger* dragger = new BDragger(rect, this, + B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); + dragger->SetExplicitMinSize(BSize(7, 7)); + dragger->SetExplicitMaxSize(BSize(7, 7)); + dragger->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, B_ALIGN_BOTTOM)); + + // Layout + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .AddGroup(B_VERTICAL, 3) + .AddGlue() + .AddStrut(1) + .Add(fLabel1) + .Add(fLabel2) + .AddGlue() + .End() + .Add(dragger, 0.01); + } else { + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .AddGroup(B_VERTICAL, 3) + .AddGlue() + .AddStrut(1) + .Add(fLabel1) + .Add(fLabel2) + .AddGlue() + .End(); + } +} + + +DropZone::DropZone(BMessage* archive) + : + BView(archive), + fReplicated(true) +{ + _Init(); } @@ -27,15 +102,41 @@ DropZone::~DropZone() } +BArchivable* +DropZone::Instantiate(BMessage* data) +{ + if (!validate_instantiation(data, "Filer")) + return NULL; + + return new DropZone(data); +} + + +status_t +DropZone::Archive(BMessage* archive, bool deep) const +{ + BView::Archive(archive, deep); + + archive->AddString("add_on", "application/x-vnd.dw-Filer"); + archive->AddString("class", "Filer"); + + archive->PrintToStream(); + + return B_OK; +} + + void DropZone::Draw(BRect rect) { SetDrawingMode(B_OP_ALPHA); - SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT)); SetLowColor(0, 0, 0, 0); + SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), + B_DARKEN_2_TINT)); BRect bounds = Bounds(); + FillRect(bounds, B_SOLID_LOW); StrokeRect(bounds); FillRect(bounds.InsetBySelf(3, 3), stripePattern); @@ -49,30 +150,83 @@ DropZone::MessageReceived(BMessage* msg) if (msg->WasDropped()) { BMessenger messenger(be_app); msg->what = B_REFS_RECEIVED; - messenger.SendMessage(msg); + be_roster->Launch("application/x-vnd.dw-Filer", msg); + } + switch (msg->what) + { + case B_ABOUT_REQUESTED: + { + BAboutWindow* about = new BAboutWindow("Filer", + "application/x-vnd.dw-Filer"); + about->AddDescription( + "Filer is an automatic file organizer. It takes the " + "files it's opened with or that are dropped on it and moves, " + "renames, copies or does all sorts of other things with them " + "according to rules created by the user."); + about->AddCopyright(2008, "DarkWyrm"); + about->AddCopyright(2016, "Humdinger"); + about->Show(); + } + default: + { + BView::MessageReceived(msg); + break; + } } - - BView::MessageReceived(msg); } DropZoneTab::DropZoneTab() : - BView("Drop zone", B_SUPPORTS_LAYOUT) + BView("Dropzone", B_SUPPORTS_LAYOUT) { BStringView* zoneLabel = new BStringView("zonelabel", "Drag and drop the files to be processed below."); zoneLabel->SetAlignment(B_ALIGN_CENTER); - fDropzone = new DropZone(); + fDropzone = new DropZone(false); + + fRepliButton = new BButton("replibutton", "Replicate dropzone", + new BMessage(REPLICATE)); static const float spacing = be_control_look->DefaultItemSpacing(); BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING) .SetInsets(spacing) .Add(zoneLabel) - .Add(fDropzone); + .Add(fDropzone) + .Add(fRepliButton); } DropZoneTab::~DropZoneTab() { } + + +void +DropZoneTab::AttachedToWindow() +{ + fRepliButton->SetTarget(this); + + BView::AttachedToWindow(); +} + + +void +DropZoneTab::MessageReceived(BMessage* msg) +{ + switch (msg->what) + { + printf("click!\n"); + case REPLICATE: + { + ReplicantWindow* replicantWindow = new ReplicantWindow(Window()->Frame()); + replicantWindow->Show(); + break; + } + default: + { + BView::MessageReceived(msg); + break; + } + } +} diff --git a/sources/Filer/DropZoneTab.h b/sources/Filer/DropZoneTab.h index 920fe28..3b15c34 100644 --- a/sources/Filer/DropZoneTab.h +++ b/sources/Filer/DropZoneTab.h @@ -9,29 +9,49 @@ #ifndef DROPZONETAB_H #define DROPZONETAB_H +#include +#include #include const pattern stripePattern = {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}; +class _EXPORT DropZone; + class DropZone : public BView { public: - DropZone(); - ~DropZone(); + DropZone(bool replicatable = true); + DropZone(BMessage* data); + ~DropZone(); - virtual void Draw(BRect rect); - void MessageReceived(BMessage* msg); + static BArchivable* Instantiate(BMessage* archive); + virtual status_t Archive(BMessage* data, bool deep = true) const; + + virtual void Draw(BRect rect); + void MessageReceived(BMessage* msg); + + void _Init(); + +private: + bool fReplicated; + BStringView* fLabel1; + BStringView* fLabel2; }; class DropZoneTab : public BView { public: - DropZoneTab(); - ~DropZoneTab(); + DropZoneTab(); + ~DropZoneTab(); + + virtual void AttachedToWindow(); + void MessageReceived(BMessage* msg); + private: - DropZone* fDropzone; + DropZone* fDropzone; + BButton* fRepliButton; }; #endif // DROPZONETAB_H diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp index d1998d6..8cc0c26 100644 --- a/sources/Filer/MainWindow.cpp +++ b/sources/Filer/MainWindow.cpp @@ -19,13 +19,10 @@ #include "MainWindow.h" -#undef B_TRANSLATION_CONTEXT -#define B_TRANSLATION_CONTEXT "MainWindow" - MainWindow::MainWindow() : - BWindow(BRect(50, 50, 400, 320), B_TRANSLATE_SYSTEM_NAME("Filer"), + BWindow(BRect(50, 50, 400, 300), ("Filer"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) { _BuildLayout(); @@ -65,7 +62,6 @@ MainWindow::_BuildLayout() // do the layouting BLayoutBuilder::Group<>(this, B_VERTICAL, 0) -// .Add(menuBar) .AddGroup(B_VERTICAL) .SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0) .Add(fTabView) diff --git a/sources/Filer/MainWindow.h b/sources/Filer/MainWindow.h index c0207e7..2049412 100644 --- a/sources/Filer/MainWindow.h +++ b/sources/Filer/MainWindow.h @@ -13,9 +13,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/sources/Filer/Makefile b/sources/Filer/Makefile index 6a26cf1..75eb40e 100644 --- a/sources/Filer/Makefile +++ b/sources/Filer/Makefile @@ -30,7 +30,7 @@ APP_MIME_SIG = application/x-vnd.dw-Filer # Also note that spaces in folder names do not work well with this Makefile. SRCS = AutoFilerTab.cpp FilerRule.cpp FSUtils.cpp main.cpp PatternProcessor.cpp \ RuleRunner.cpp ActionView.cpp AutoTextControl.cpp CppSQLite3.cpp Database.cpp \ - DropZoneTab.cpp HelpTab.cpp MainWindow.cpp RefStorage.cpp \ + DropZoneTab.cpp HelpTab.cpp MainWindow.cpp RefStorage.cpp ReplicantWindow.cpp \ RuleEditWindow.cpp RuleItem.cpp RuleTab.cpp TypedRefFilter.cpp TestView.cpp # Specify the resource definition files to use. Full or relative paths can be @@ -57,7 +57,7 @@ RSRCS = # - if your library does not follow the standard library naming scheme, # you need to specify the path to the library and it's name. # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") -LIBS = be localestub tracker translation $(STDCPPLIBS) sqlite3 +LIBS = be tracker translation $(STDCPPLIBS) sqlite3 # Specify additional paths to directories following the standard libXXX.so # or libXXX.a naming scheme. You can specify full paths or paths relative diff --git a/sources/Filer/ReplicantWindow.cpp b/sources/Filer/ReplicantWindow.cpp new file mode 100644 index 0000000..0e62dc7 --- /dev/null +++ b/sources/Filer/ReplicantWindow.cpp @@ -0,0 +1,46 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + + +#include +#include + +#include "DropZoneTab.h" +#include "ReplicantWindow.h" + + +ReplicantWindow::ReplicantWindow(BRect frame) + : + BWindow(BRect(0, 0, 120, 100), ("Resize"), + B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) +{ + frame.OffsetBy(290.0, 130.0); + MoveTo(frame.LeftTop()); + + DropZone* dropzone = new DropZone(true); + dropzone->SetExplicitMinSize(BSize(70.0, 64.0)); + dropzone->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + + static const float spacing = be_control_look->DefaultItemSpacing(); + BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING) + .SetInsets(spacing) + .Add(dropzone); +} + + +ReplicantWindow::~ReplicantWindow() +{ +} + + +//bool +//ReplicantWindow::QuitRequested() +//{ +// be_app->PostMessage(B_QUIT_REQUESTED); +// return true; +//} diff --git a/sources/Filer/ReplicantWindow.h b/sources/Filer/ReplicantWindow.h new file mode 100644 index 0000000..a633cef --- /dev/null +++ b/sources/Filer/ReplicantWindow.h @@ -0,0 +1,26 @@ +/* + * Copyright 2015. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#ifndef REPLICANT_WINDOW_H +#define REPLICANT_WINDOW_H + +#include +#include + +#include + +class ReplicantWindow : public BWindow { +public: + ReplicantWindow(BRect frame); + virtual ~ReplicantWindow(); + +// bool QuitRequested(); + +}; + +#endif // REPLICANT_WINDOW_H From 6f53e6b0bbff439bd6ce8e970721fd707c0ead75 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 1 May 2016 18:10:51 +0200 Subject: [PATCH 06/10] Load/Save settings Loading and saving of window position and selected tab. Move all those message definitions etc to FilerDefs.h. --- sources/Filer/ActionView.cpp | 20 +++----- sources/Filer/AutoFilerTab.cpp | 39 ++++++--------- sources/Filer/DropZoneTab.cpp | 12 ++--- sources/Filer/Filer.rdef | 2 +- sources/Filer/FilerDefs.h | 56 +++++++++++++++++++++ sources/Filer/HelpTab.cpp | 9 ++-- sources/Filer/MainWindow.cpp | 85 +++++++++++++++++++++++++++++--- sources/Filer/MainWindow.h | 10 ++-- sources/Filer/RuleEditWindow.cpp | 48 ++++++------------ sources/Filer/RuleEditWindow.h | 7 --- sources/Filer/RuleTab.cpp | 46 +++++++---------- sources/Filer/TestView.cpp | 38 +++++--------- sources/Filer/main.cpp | 16 ++---- sources/Filer/main.h | 24 ++++----- 14 files changed, 238 insertions(+), 174 deletions(-) create mode 100644 sources/Filer/FilerDefs.h diff --git a/sources/Filer/ActionView.cpp b/sources/Filer/ActionView.cpp index 122dc90..c80a652 100644 --- a/sources/Filer/ActionView.cpp +++ b/sources/Filer/ActionView.cpp @@ -12,15 +12,9 @@ #include "ActionView.h" #include "AutoTextControl.h" +#include "FilerDefs.h" #include "RuleRunner.h" -enum -{ - M_ACTION_CHOSEN = 'tsch', - M_SHOW_ACTION_MENU = 'sham', - M_VALUE_CHANGED = 'vlch' -}; - ActionView::ActionView(const BRect& frame, const char* name, BMessage* action, const int32& resize, const int32& flags) @@ -42,7 +36,7 @@ ActionView::ActionView(const BRect& frame, const char* name, BMessage* action, } fActionButton = new BButton(BRect(0, 0, 1, 1), "actionbutton", - wideststr.String(), new BMessage(M_SHOW_ACTION_MENU)); + wideststr.String(), new BMessage(MSG_SHOW_ACTION_MENU)); fActionButton->ResizeToPreferred(); AddChild(fActionButton); @@ -53,7 +47,7 @@ ActionView::ActionView(const BRect& frame, const char* name, BMessage* action, rect.right = rect.left + 10; fValueBox = new AutoTextControl(rect, "valuebox", NULL, NULL, - new BMessage(M_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + new BMessage(MSG_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); AddChild(fValueBox); fValueBox->SetDivider(0); @@ -137,19 +131,19 @@ ActionView::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_SHOW_ACTION_MENU: + case MSG_SHOW_ACTION_MENU: { ShowActionMenu(); break; } - case M_ACTION_CHOSEN: + case MSG_ACTION_CHOSEN: { BString name; if (msg->FindString("name", &name) == B_OK) SetAction(name.String()); break; } - case M_VALUE_CHANGED: + case MSG_VALUE_CHANGED: { BString str; if (fAction->FindString("value", &str) == B_OK) @@ -207,7 +201,7 @@ ActionView::ShowActionMenu() while (fActions.FindString("actions", i, &name) == B_OK) { i++; - msg = new BMessage(M_ACTION_CHOSEN); + msg = new BMessage(MSG_ACTION_CHOSEN); msg->AddString("name", name.String()); menu->AddItem(new BMenuItem(name.String(), msg)); } diff --git a/sources/Filer/AutoFilerTab.cpp b/sources/Filer/AutoFilerTab.cpp index c981df1..817c7b5 100644 --- a/sources/Filer/AutoFilerTab.cpp +++ b/sources/Filer/AutoFilerTab.cpp @@ -20,18 +20,10 @@ #include #include "AutoFilerTab.h" +#include "FilerDefs.h" #include "RefStorage.h" #include "TypedRefFilter.h" -enum -{ - M_SHOW_ADD_PANEL = 'shaw', - M_SHOW_EDIT_PANEL = 'shew', - M_REMOVE_FOLDER = 'rmfl', - M_FOLDER_SELECTED = 'flsl', - M_FOLDER_CHOSEN = 'flch' -}; - AutoFilerTab::AutoFilerTab() : @@ -45,7 +37,7 @@ AutoFilerTab::AutoFilerTab() fRefFilter = new TypedRefFilter("", B_DIRECTORY_NODE); fFilePanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), NULL, B_DIRECTORY_NODE, false, NULL, fRefFilter); - BMessage panelMsg(M_FOLDER_CHOSEN); + BMessage panelMsg(MSG_FOLDER_CHOSEN); fFilePanel->SetMessage(&panelMsg); gRefLock.Lock(); @@ -78,8 +70,8 @@ AutoFilerTab::_BuildLayout() B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); fScrollView = new BScrollView("listscroll", fFolderList, B_FRAME_EVENTS | B_WILL_DRAW, false, true); - fFolderList->SetSelectionMessage(new BMessage(M_FOLDER_SELECTED)); - fFolderList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_PANEL)); + fFolderList->SetSelectionMessage(new BMessage(MSG_FOLDER_SELECTED)); + fFolderList->SetInvocationMessage(new BMessage(MSG_SHOW_EDIT_PANEL)); fAutorunBox = new BCheckBox("autorunbox", "Run AutoFiler on system startup", new BMessage); @@ -100,14 +92,14 @@ AutoFilerTab::_BuildLayout() fAutorunBox->SetValue(B_CONTROL_ON); fAddButton = new BButton("addbutton", "Add" B_UTF8_ELLIPSIS, - new BMessage(M_SHOW_ADD_PANEL)); + new BMessage(MSG_SHOW_ADD_PANEL)); fEditButton = new BButton("editbutton", "Edit" B_UTF8_ELLIPSIS, - new BMessage(M_SHOW_EDIT_PANEL)); + new BMessage(MSG_SHOW_EDIT_PANEL)); fEditButton->SetEnabled(false); fRemoveButton = new BButton("removebutton", "Remove", - new BMessage(M_REMOVE_FOLDER)); + new BMessage(MSG_REMOVE_FOLDER)); fRemoveButton->SetEnabled(false); static const float spacing = be_control_look->DefaultItemSpacing(); @@ -143,7 +135,7 @@ AutoFilerTab::AttachedToWindow() if (fFolderList->CountItems() > 0) { BMessenger messenger(this); - BMessage msg(M_FOLDER_SELECTED); + BMessage msg(MSG_FOLDER_SELECTED); messenger.SendMessage(&msg); } BView::AttachedToWindow(); @@ -153,7 +145,6 @@ AutoFilerTab::AttachedToWindow() void AutoFilerTab::DetachedFromWindow() { - printf("AutoFilerTab: QuitRequested()\n"); SaveFolders(); // save autorun value @@ -176,7 +167,7 @@ AutoFilerTab::DetachedFromWindow() // if AutoFiler is running, tell it to refresh its folders if (be_roster->IsRunning("application/x-vnd.dw-AutoFiler")) { - BMessage msg(M_REFRESH_FOLDERS); + BMessage msg(MSG_REFRESH_FOLDERS); BMessenger msgr("application/x-vnd.dw-AutoFiler"); msgr.SendMessage(&msg); } @@ -188,12 +179,12 @@ AutoFilerTab::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_SHOW_ADD_PANEL: + case MSG_SHOW_ADD_PANEL: { fFilePanel->Show(); break; } - case M_SHOW_EDIT_PANEL: + case MSG_SHOW_EDIT_PANEL: { int32 selection = fFolderList->CurrentSelection(); if (selection < 0) @@ -202,13 +193,13 @@ AutoFilerTab::MessageReceived(BMessage* msg) BStringItem* item = (BStringItem*)fFolderList->ItemAt(selection); fFilePanel->SetPanelDirectory(item->Text()); - BMessage panelMsg(M_FOLDER_CHOSEN); + BMessage panelMsg(MSG_FOLDER_CHOSEN); panelMsg.AddInt32("index", selection); fFilePanel->SetMessage(&panelMsg); fFilePanel->Show(); break; } - case M_REMOVE_FOLDER: + case MSG_REMOVE_FOLDER: { int32 selection = fFolderList->CurrentSelection(); if (selection < 0) @@ -223,7 +214,7 @@ AutoFilerTab::MessageReceived(BMessage* msg) gRefLock.Unlock(); break; } - case M_FOLDER_SELECTED: + case MSG_FOLDER_SELECTED: { int32 selection = fFolderList->CurrentSelection(); bool value = (selection >= 0); @@ -232,7 +223,7 @@ AutoFilerTab::MessageReceived(BMessage* msg) fRemoveButton->SetEnabled(value); break; } - case M_FOLDER_CHOSEN: + case MSG_FOLDER_CHOSEN: { int32 index; if (msg->FindInt32("index", &index) != B_OK) diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index 5a6894d..b11903e 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -15,6 +15,7 @@ #include #include "DropZoneTab.h" +#include "FilerDefs.h" #include "main.h" #include "ReplicantWindow.h" @@ -117,7 +118,7 @@ DropZone::Archive(BMessage* archive, bool deep) const { BView::Archive(archive, deep); - archive->AddString("add_on", "application/x-vnd.dw-Filer"); + archive->AddString("add_on", kApplicationSignature); archive->AddString("class", "Filer"); archive->PrintToStream(); @@ -150,14 +151,14 @@ DropZone::MessageReceived(BMessage* msg) if (msg->WasDropped()) { BMessenger messenger(be_app); msg->what = B_REFS_RECEIVED; - be_roster->Launch("application/x-vnd.dw-Filer", msg); + be_roster->Launch(kApplicationSignature, msg); } switch (msg->what) { case B_ABOUT_REQUESTED: { BAboutWindow* about = new BAboutWindow("Filer", - "application/x-vnd.dw-Filer"); + kApplicationSignature); about->AddDescription( "Filer is an automatic file organizer. It takes the " "files it's opened with or that are dropped on it and moves, " @@ -185,8 +186,8 @@ DropZoneTab::DropZoneTab() zoneLabel->SetAlignment(B_ALIGN_CENTER); fDropzone = new DropZone(false); - fRepliButton = new BButton("replibutton", "Replicate dropzone", - new BMessage(REPLICATE)); + fRepliButton = new BButton("replibutton", + "Replicate dropzone" B_UTF8_ELLIPSIS, new BMessage(REPLICATE)); static const float spacing = be_control_look->DefaultItemSpacing(); BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING) @@ -216,7 +217,6 @@ DropZoneTab::MessageReceived(BMessage* msg) { switch (msg->what) { - printf("click!\n"); case REPLICATE: { ReplicantWindow* replicantWindow = new ReplicantWindow(Window()->Frame()); diff --git a/sources/Filer/Filer.rdef b/sources/Filer/Filer.rdef index 8116c3b..7dfc664 100644 --- a/sources/Filer/Filer.rdef +++ b/sources/Filer/Filer.rdef @@ -8,7 +8,7 @@ resource app_flags B_MULTIPLE_LAUNCH; resource app_version { major = 1, - middle = 0, + middle = 1, minor = 0, variety = 5, diff --git a/sources/Filer/FilerDefs.h b/sources/Filer/FilerDefs.h new file mode 100644 index 0000000..f3ad72c --- /dev/null +++ b/sources/Filer/FilerDefs.h @@ -0,0 +1,56 @@ +/* + * Copyright 2016. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Author: + * Humdinger, humdingerb@gmail.com + */ + +#ifndef FILERDEFS_H +#define FILERDEFS_H + +static const char *kApplicationSignature = "application/x-vnd.dw-Filer"; +static const char kSettingsFolder[] = "Filer"; +static const char kSettingsFile[] = "Filer_settings"; + +#define MSG_DOCS 'docs' +#define MSG_HELP 'help' +#define MSG_TYPE_CHOSEN 'tych' +#define MSG_NEW_DESCRIPTION 'dsch' +#define MSG_OK 'okay' +#define MSG_CANCEL 'cncl' + +#define MSG_ADD_TEST 'adts' +#define MSG_REMOVE_TEST 'rmts' +#define MSG_ADD_ACTION 'adac' +#define MSG_REMOVE_ACTION 'rmac' +#define MSG_ADD_RULE 'adrl' +#define MSG_UPDATE_RULE 'uprl' +#define MSG_FORCE_QUIT 'frcq' + +#define MSG_SHOW_ADD_WINDOW 'shaw' +#define MSG_SHOW_EDIT_WINDOW 'shew' +#define MSG_REMOVE_RULE 'shrr' +#define MSG_REVERT 'rvrt' +#define MSG_RULE_SELECTED 'rlsl' +#define MSG_MOVE_RULE_UP 'mvup' +#define MSG_MOVE_RULE_DOWN 'mvdn' + +#define MSG_SHOW_ADD_PANEL 'shap' +#define MSG_SHOW_EDIT_PANEL 'shep' +#define MSG_REMOVE_FOLDER 'rmfl' +#define MSG_FOLDER_SELECTED 'flsl' +#define MSG_FOLDER_CHOSEN 'flch' +#define MSG_REFRESH_FOLDERS 'flrf' + +#define MSG_ACTION_CHOSEN 'tsch' +#define MSG_SHOW_ACTION_MENU 'sham' +#define MSG_VALUE_CHANGED 'vlch' + +#define MSG_TEST_CHOSEN 'tsch' +#define MSG_MODE_CHOSEN 'mdch' +#define MSG_SHOW_TEST_MENU 'shtm' +#define MSG_SHOW_TYPE_MENU 'stym' +#define MSG_SHOW_MODE_MENU 'shmm' + +#endif // FILERDEFS_H diff --git a/sources/Filer/HelpTab.cpp b/sources/Filer/HelpTab.cpp index 093f394..8250eea 100644 --- a/sources/Filer/HelpTab.cpp +++ b/sources/Filer/HelpTab.cpp @@ -11,13 +11,10 @@ #include #include +#include "FilerDefs.h" #include "HelpTab.h" #include "main.h" -#define M_SHOW_HELP 'shhl' -#define M_SHOW_DOCS 'shdc' - - IconView::IconView() : BView("iconview", B_WILL_DRAW | B_SUPPORTS_LAYOUT), @@ -151,11 +148,11 @@ HelpTab::HelpTab() // Buttons fHelpButton = new BButton("help", "Help on rules", - new BMessage(M_SHOW_HELP)); + new BMessage(MSG_HELP)); fHelpButton->SetTarget(be_app); fDocsButton = new BButton("docs", "User documentation", - new BMessage(M_SHOW_DOCS)); + new BMessage(MSG_DOCS)); fDocsButton->SetTarget(be_app); // Laying it all out diff --git a/sources/Filer/MainWindow.cpp b/sources/Filer/MainWindow.cpp index 8cc0c26..8cc0c5a 100644 --- a/sources/Filer/MainWindow.cpp +++ b/sources/Filer/MainWindow.cpp @@ -6,15 +6,10 @@ * Humdinger, humdingerb@gmail.com */ -#include -#include -#include -#include #include #include #include #include -#include #include #include "MainWindow.h" @@ -22,10 +17,27 @@ MainWindow::MainWindow() : - BWindow(BRect(50, 50, 400, 300), ("Filer"), + BWindow(BRect(), ("Filer"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) { _BuildLayout(); + + LoadSettings(); + + MoveTo(fPosition.left, fPosition.top); + ResizeTo(fPosition.Width(), fPosition.Height()); + + if (fPosition == BRect(-1, -1, -1, -1)) { + CenterOnScreen(); + ResizeTo(350, 250); + } else { + // make sure window is on screen + BScreen screen(this); + if (!screen.Frame().InsetByCopy(10, 10).Intersects(Frame())) + CenterOnScreen(); + } + + fTabView->Select(fTabSelection); } @@ -37,6 +49,8 @@ MainWindow::~MainWindow() bool MainWindow::QuitRequested() { + SaveSettings(); + be_app->PostMessage(B_QUIT_REQUESTED); return true; } @@ -84,3 +98,62 @@ MainWindow::MessageReceived(BMessage* msg) } } } + +void +MainWindow::LoadSettings() +{ + fPosition.Set(-1, -1, -1, -1); + fTabSelection = 0; + + BPath path; + BMessage msg; + + if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) { + status_t ret = path.Append(kSettingsFolder); + if (ret == B_OK) { + path.Append(kSettingsFile); + BFile file(path.Path(), B_READ_ONLY); + + if ((file.InitCheck() == B_OK) && (msg.Unflatten(&file) == B_OK)) { + if (msg.FindRect("pos", &fPosition) != B_OK) + fPosition.Set(-1, -1, -1, -1); + if (msg.FindInt32("tab", &fTabSelection) != B_OK) + fTabSelection = 0; + } + } + } +} + + +void +MainWindow::SaveSettings() +{ + BRect pos = Frame(); + int32 tab = fTabView->Selection(); + if (pos == fPosition && tab == fTabSelection) + return; + + BPath path; + BMessage msg; + + if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) < B_OK) + return; + status_t ret = path.Append(kSettingsFolder); + + if (ret == B_OK) + ret = create_directory(path.Path(), 0777); + + if (ret == B_OK) + path.Append(kSettingsFile); + + if (ret == B_OK) { + BFile file(path.Path(), B_WRITE_ONLY | B_CREATE_FILE); + ret = file.InitCheck(); + + if (ret == B_OK) { + msg.AddRect("pos", pos); + msg.AddInt32("tab", tab); + msg.Flatten(&file); + } + } +} diff --git a/sources/Filer/MainWindow.h b/sources/Filer/MainWindow.h index 2049412..c6049ce 100644 --- a/sources/Filer/MainWindow.h +++ b/sources/Filer/MainWindow.h @@ -1,5 +1,5 @@ /* - * Copyright 2015. All rights reserved. + * Copyright 2016. All rights reserved. * Distributed under the terms of the MIT license. * * Author: @@ -20,13 +20,12 @@ #include "AutoFilerTab.h" #include "DropZoneTab.h" +#include "FilerDefs.h" #include "HelpTab.h" #include "RuleTab.h" #include -#define DOCS 'docs' -#define HELP 'help' class MainWindow : public BWindow { public: @@ -38,6 +37,11 @@ class MainWindow : public BWindow { private: void _BuildLayout(); + void LoadSettings(); + void SaveSettings(); + + BRect fPosition; + int32 fTabSelection; BTabView* fTabView; DropZoneTab* fDropZone; diff --git a/sources/Filer/RuleEditWindow.cpp b/sources/Filer/RuleEditWindow.cpp index 23153ce..de53fc6 100644 --- a/sources/Filer/RuleEditWindow.cpp +++ b/sources/Filer/RuleEditWindow.cpp @@ -15,28 +15,12 @@ #include "ActionView.h" #include "AutoTextControl.h" +#include "FilerDefs.h" #include "FilerRule.h" #include "main.h" #include "RuleEditWindow.h" #include "TestView.h" -// Internal message defs -enum -{ - M_DESCRIPTION_CHANGED = 'dsch', - M_OK = 'mok ', - M_CANCEL = 'cncl', - - M_ADD_TEST = 'adts', - M_REMOVE_TEST = 'rmts', - - M_ADD_ACTION = 'adac', - M_REMOVE_ACTION = 'rmac', - - M_SHOW_HELP = 'shhl', - M_SHOW_DOCS = 'shdc' -}; - RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) : @@ -55,7 +39,7 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) // Description fDescriptionBox = new AutoTextControl(BRect(0, 0, 1, 1), "description", - "Description: ", NULL, new BMessage(M_DESCRIPTION_CHANGED), + "Description: ", NULL, new BMessage(MSG_NEW_DESCRIPTION), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); top->AddChild(fDescriptionBox); @@ -83,14 +67,14 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) top->AddChild(fTestGroup); fAddTest = new BButton(BRect(0, 0, 1, 1),"addtestbutton", "Add", - new BMessage(M_ADD_TEST), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + new BMessage(MSG_ADD_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fAddTest->ResizeToPreferred(); fAddTest->MoveTo(10.0, fTestGroup->Bounds().bottom - 10.0 - fAddTest->Bounds().Height()); fTestGroup->AddChild(fAddTest); fRemoveTest = new BButton(BRect(0, 0, 1, 1),"removetestbutton", "Remove", - new BMessage(M_REMOVE_TEST), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + new BMessage(MSG_REMOVE_TEST), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fRemoveTest->ResizeToPreferred(); fRemoveTest->MoveTo(fAddTest->Frame().right + 10, fAddTest->Frame().top); fTestGroup->AddChild(fRemoveTest); @@ -106,14 +90,14 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) top->AddChild(fActionGroup); fAddAction = new BButton(BRect(0, 0, 1, 1), "addactionbutton", "Add", - new BMessage(M_ADD_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + new BMessage(MSG_ADD_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fAddAction->ResizeToPreferred(); fAddAction->MoveTo(10.0, fActionGroup->Bounds().bottom - 10.0 - fAddAction->Bounds().Height()); fActionGroup->AddChild(fAddAction); fRemoveAction = new BButton(BRect(0, 0, 1, 1), "removeactionbutton", "Remove", - new BMessage(M_REMOVE_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + new BMessage(MSG_REMOVE_ACTION), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fRemoveAction->ResizeToPreferred(); fRemoveAction->MoveTo(fAddAction->Frame().right + 10, fAddAction->Frame().top); fActionGroup->AddChild(fRemoveAction); @@ -122,7 +106,7 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) fActionGroup->ResizeBy(0, fAddAction->Bounds().Height() + 10.0); - fOK = new BButton(BRect(0, 0, 1, 1), "okbutton", "OK", new BMessage(M_OK), + fOK = new BButton(BRect(0, 0, 1, 1), "okbutton", "OK", new BMessage(MSG_OK), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); fOK->ResizeToPreferred(); fOK->MoveTo(Bounds().right - fOK->Bounds().Width() - 10, @@ -130,13 +114,13 @@ RuleEditWindow::RuleEditWindow(BRect& rect, FilerRule* rule) // calling AddChild later to ensure proper keyboard navigation fCancel = new BButton(BRect(0, 0, 1 ,1), "cancelbutton", "Cancel", - new BMessage(M_CANCEL), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); + new BMessage(MSG_CANCEL), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); fCancel->ResizeToPreferred(); fCancel->MoveTo(fOK->Frame().left - fCancel->Bounds().Width() - 10, fOK->Frame().top); fHelp = new BButton(BRect(0, 0, 1, 1), "helpbutton", "Help…", - new BMessage(M_SHOW_HELP), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + new BMessage(MSG_HELP), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); fHelp->ResizeToPreferred(); fHelp->MoveTo(10, fOK->Frame().top); fHelp->SetTarget(be_app); @@ -174,7 +158,7 @@ RuleEditWindow::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_OK: + case MSG_OK: { if (strlen(fDescriptionBox->Text()) < 1) { BAlert* alert = new BAlert("Filer", @@ -189,27 +173,27 @@ RuleEditWindow::MessageReceived(BMessage* msg) PostMessage(B_QUIT_REQUESTED); break; } - case M_CANCEL: + case MSG_CANCEL: { PostMessage(B_QUIT_REQUESTED); break; } - case M_ADD_TEST: + case MSG_ADD_TEST: { AppendTest(NULL); break; } - case M_REMOVE_TEST: + case MSG_REMOVE_TEST: { RemoveTest(); break; } - case M_ADD_ACTION: + case MSG_ADD_ACTION: { AppendAction(NULL); break; } - case M_REMOVE_ACTION: + case MSG_REMOVE_ACTION: { RemoveAction(); break; @@ -352,7 +336,7 @@ RuleEditWindow::SendRuleMessage() } BMessage msg; - msg.what = (fOriginalID >= 0) ? M_UPDATE_RULE : M_ADD_RULE; + msg.what = (fOriginalID >= 0) ? MSG_UPDATE_RULE : MSG_ADD_RULE; msg.AddPointer("item", rule); msg.AddInt64("id", fOriginalID); diff --git a/sources/Filer/RuleEditWindow.h b/sources/Filer/RuleEditWindow.h index 855f08e..ea35abc 100644 --- a/sources/Filer/RuleEditWindow.h +++ b/sources/Filer/RuleEditWindow.h @@ -16,13 +16,6 @@ class AutoTextControl; class FilerRule; class TestView; -// Message defs used by other classes -enum -{ - M_ADD_RULE = 'adrl', - M_UPDATE_RULE = 'uprl', - M_FORCE_QUIT = 'frcq' -}; class RuleEditWindow : public BWindow { diff --git a/sources/Filer/RuleTab.cpp b/sources/Filer/RuleTab.cpp index 7dae6e7..ffa4b2f 100644 --- a/sources/Filer/RuleTab.cpp +++ b/sources/Filer/RuleTab.cpp @@ -15,22 +15,12 @@ #include #include "FilerRule.h" +#include "FilerDefs.h" #include "RuleEditWindow.h" #include "RuleItem.h" #include "RuleRunner.h" #include "RuleTab.h" -enum -{ - M_SHOW_ADD_WINDOW = 'shaw', - M_SHOW_EDIT_WINDOW = 'shew', - M_REMOVE_RULE = 'shrr', - M_REVERT = 'rvrt', - M_RULE_SELECTED = 'rlsl', - M_MOVE_RULE_UP = 'mvup', - M_MOVE_RULE_DOWN = 'mvdn' -}; - RuleTab::RuleTab() : @@ -113,27 +103,27 @@ RuleTab::_BuildLayout() fScrollView = new BScrollView("listscroll", fRuleItemList, B_FRAME_EVENTS | B_WILL_DRAW, false, true); - fRuleItemList->SetSelectionMessage(new BMessage(M_RULE_SELECTED)); - fRuleItemList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_WINDOW)); + fRuleItemList->SetSelectionMessage(new BMessage(MSG_RULE_SELECTED)); + fRuleItemList->SetInvocationMessage(new BMessage(MSG_SHOW_EDIT_WINDOW)); // fScrollView->ScrollBar(B_HORIZONTAL)->SetRange(0.0, 0.0); fAddButton = new BButton("addbutton", "Add" B_UTF8_ELLIPSIS, - new BMessage(M_SHOW_ADD_WINDOW)); + new BMessage(MSG_SHOW_ADD_WINDOW)); fEditButton = new BButton("editbutton", "Edit" B_UTF8_ELLIPSIS, - new BMessage(M_SHOW_EDIT_WINDOW)); + new BMessage(MSG_SHOW_EDIT_WINDOW)); fEditButton->SetEnabled(false); fRemoveButton = new BButton("removebutton", "Remove", - new BMessage(M_REMOVE_RULE)); + new BMessage(MSG_REMOVE_RULE)); fRemoveButton->SetEnabled(false); fMoveUpButton = new BButton("moveupbutton", "Move up", - new BMessage(M_MOVE_RULE_UP)); + new BMessage(MSG_MOVE_RULE_UP)); fMoveUpButton->SetEnabled(false); fMoveDownButton = new BButton("movedownbutton", "Move down", - new BMessage(M_MOVE_RULE_DOWN)); + new BMessage(MSG_MOVE_RULE_DOWN)); fMoveDownButton->SetEnabled(false); static const float spacing = be_control_look->DefaultItemSpacing(); @@ -169,7 +159,7 @@ RuleTab::AttachedToWindow() if (fRuleItemList->CountItems() > 0) { BMessenger messenger(this); - BMessage message(M_RULE_SELECTED); + BMessage message(MSG_RULE_SELECTED); messenger.SendMessage(&message); } BView::AttachedToWindow(); @@ -191,7 +181,7 @@ RuleTab::MessageReceived(BMessage* message) // message->PrintToStream(); switch (message->what) { - case M_SHOW_ADD_WINDOW: + case MSG_SHOW_ADD_WINDOW: { printf("Show Add Window\n"); BRect frame(Frame()); @@ -204,7 +194,7 @@ RuleTab::MessageReceived(BMessage* message) rulewin->Show(); break; } - case M_SHOW_EDIT_WINDOW: + case MSG_SHOW_EDIT_WINDOW: { BRect frame(Frame()); ConvertToScreen(&frame); @@ -219,7 +209,7 @@ RuleTab::MessageReceived(BMessage* message) rulewin->Show(); break; } - case M_ADD_RULE: + case MSG_ADD_RULE: { fChanges = true; FilerRule* item; @@ -227,7 +217,7 @@ RuleTab::MessageReceived(BMessage* message) AddRule(item); break; } - case M_REMOVE_RULE: + case MSG_REMOVE_RULE: { fChanges = true; if (fRuleItemList->CurrentSelection() >= 0) @@ -235,7 +225,7 @@ RuleTab::MessageReceived(BMessage* message) fRuleItemList->CurrentSelection())); break; } - case M_UPDATE_RULE: + case MSG_UPDATE_RULE: { fChanges = true; FilerRule* rule; @@ -260,7 +250,7 @@ RuleTab::MessageReceived(BMessage* message) } break; } - case M_REVERT: + case MSG_REVERT: { while (fRuleItemList->CountItems() > 0) RemoveRule((RuleItem*)fRuleItemList->ItemAt(0L)); @@ -271,7 +261,7 @@ RuleTab::MessageReceived(BMessage* message) LoadRules(fRuleList); break; } - case M_RULE_SELECTED: + case MSG_RULE_SELECTED: { bool value = (fRuleItemList->CurrentSelection() >= 0); @@ -284,7 +274,7 @@ RuleTab::MessageReceived(BMessage* message) } break; } - case M_MOVE_RULE_UP: + case MSG_MOVE_RULE_UP: { fChanges = true; int32 selection = fRuleItemList->CurrentSelection(); @@ -295,7 +285,7 @@ RuleTab::MessageReceived(BMessage* message) fRuleList->SwapItems(selection, selection - 1); break; } - case M_MOVE_RULE_DOWN: + case MSG_MOVE_RULE_DOWN: { fChanges = true; int32 selection = fRuleItemList->CurrentSelection(); diff --git a/sources/Filer/TestView.cpp b/sources/Filer/TestView.cpp index 4a6d050..d8402ba 100644 --- a/sources/Filer/TestView.cpp +++ b/sources/Filer/TestView.cpp @@ -10,22 +10,10 @@ #include #include "AutoTextControl.h" +#include "FilerDefs.h" #include "RuleRunner.h" #include "TestView.h" -enum -{ - M_TEST_CHOSEN = 'tsch', - M_MODE_CHOSEN = 'mdch', - M_VALUE_CHANGED = 'vlch', - - M_TYPE_CHOSEN = 'tych', - - M_SHOW_TEST_MENU = 'shtm', - M_SHOW_TYPE_MENU = 'stym', - M_SHOW_MODE_MENU = 'shmm' -}; - extern BMessage gArchivedTypeMenu; @@ -65,7 +53,7 @@ TestView::TestView(const BRect& frame, const char* name, BMessage* test, widesttest = teststr; fTestButton = new BButton(BRect(0, 0, 1, 1), "testbutton", - widesttest.String(), new BMessage(M_SHOW_TEST_MENU)); + widesttest.String(), new BMessage(MSG_SHOW_TEST_MENU)); fTestButton->ResizeToPreferred(); AddChild(fTestButton); @@ -84,7 +72,7 @@ TestView::TestView(const BRect& frame, const char* name, BMessage* test, } fModeButton = new BButton(rect, "modebutton", widestmode.String(), - new BMessage(M_SHOW_MODE_MENU)); + new BMessage(MSG_SHOW_MODE_MENU)); fModeButton->ResizeToPreferred(); AddChild(fModeButton); @@ -92,7 +80,7 @@ TestView::TestView(const BRect& frame, const char* name, BMessage* test, rect.OffsetBy(rect.Width() + 5, 0); rect.right = rect.left + StringWidth("application/x-vnd.dw-foo") + 5; fValueBox = new AutoTextControl(rect, "valuebox", NULL, NULL, - new BMessage(M_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); + new BMessage(MSG_VALUE_CHANGED), B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); AddChild(fValueBox); fValueBox->SetDivider(0); if (fValueBox->Bounds().Height() < fModeButton->Bounds().Height()) { @@ -184,12 +172,12 @@ TestView::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_TEST_CHOSEN: + case MSG_TEST_CHOSEN: { SetTest(msg); break; } - case M_MODE_CHOSEN: + case MSG_MODE_CHOSEN: { BString mode; if (msg->FindString("mode",&mode) != B_OK) @@ -198,7 +186,7 @@ TestView::MessageReceived(BMessage* msg) SetMode(mode.String()); break; } - case M_VALUE_CHANGED: + case MSG_VALUE_CHANGED: { BString str; if (fTest->FindString("value", &str) == B_OK) @@ -207,7 +195,7 @@ TestView::MessageReceived(BMessage* msg) fTest->AddString("value", fValueBox->Text()); break; } - case M_SHOW_TEST_MENU: + case MSG_SHOW_TEST_MENU: { BPopUpMenu* menu = (BPopUpMenu*)BPopUpMenu::Instantiate(&fArchivedTestMenu); @@ -236,7 +224,7 @@ TestView::MessageReceived(BMessage* msg) menu->Go(point, true, true, true); break; } - case M_SHOW_TYPE_MENU: + case MSG_SHOW_TYPE_MENU: { BPopUpMenu* menu = (BPopUpMenu*)BPopUpMenu::Instantiate(&gArchivedTypeMenu); @@ -265,7 +253,7 @@ TestView::MessageReceived(BMessage* msg) menu->Go(point, true, true, true); break; } - case M_SHOW_MODE_MENU: + case MSG_SHOW_MODE_MENU: { ShowModeMenu(); break; @@ -338,7 +326,7 @@ TestView::SetupTestMenu() if (!submenu) submenu = AddMenuSorted(menu, attrTypeName); - msg = new BMessage(M_TEST_CHOSEN); + msg = new BMessage(MSG_TEST_CHOSEN); msg->AddString("name", "Attribute"); msg->AddString("attrtype", attrName); msg->AddString("attrname", attrPublicName); @@ -364,7 +352,7 @@ TestView::SetupTestMenu() while (i >= 0) { fTestTypes.FindString("tests", i, &testtype); - msg = new BMessage(M_TEST_CHOSEN); + msg = new BMessage(MSG_TEST_CHOSEN); msg->AddString("name", testtype); menu->AddItem(new BMenuItem(testtype.String(), msg),0); i--; @@ -389,7 +377,7 @@ TestView::ShowModeMenu() while (modes.FindString("modes", i, &modestr) == B_OK) { i++; - msg = new BMessage(M_MODE_CHOSEN); + msg = new BMessage(MSG_MODE_CHOSEN); msg->AddString("mode", modestr); menu->AddItem(new BMenuItem(modestr.String(), msg)); } diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index 0a72c78..2aab70e 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -14,6 +14,7 @@ #include #include "main.h" +#include "FilerDefs.h" #include "FilerRule.h" #include "MainWindow.h" #include "RuleRunner.h" @@ -22,17 +23,10 @@ // better performance BMessage gArchivedTypeMenu; -// Original def in TestView.cpp -#define M_TYPE_CHOSEN 'tych' - -// Original def in EditRuleWindow.cpp -#define M_SHOW_HELP 'shhl' -#define M_SHOW_DOCS 'shdc' - App::App() : - BApplication("application/x-vnd.dw-Filer"), + BApplication(kApplicationSignature), fRefList(NULL), fRuleList(NULL), fMainWin(NULL), @@ -59,12 +53,12 @@ App::MessageReceived(BMessage* msg) { switch (msg->what) { - case M_SHOW_HELP: + case MSG_HELP: { ShowHTML("documentation/Rule-Making Reference.html"); break; } - case M_SHOW_DOCS: + case MSG_DOCS: { ShowHTML("documentation/User Documentation.html"); break; @@ -223,7 +217,7 @@ App::SetupTypeMenu() BMenuItem* item = menu->FindItem(supertype.String()); BMenu* submenu = item->Submenu(); if (!submenu->FindItem(attrTypeName)) { - BMessage* msg = new BMessage(M_TYPE_CHOSEN); + BMessage* msg = new BMessage(MSG_TYPE_CHOSEN); msg->AddString("type", string.String()); msg->AddString("typename", attrTypeName); submenu->AddItem(new BMenuItem(attrTypeName, msg)); diff --git a/sources/Filer/main.h b/sources/Filer/main.h index 5690e68..f202b6e 100644 --- a/sources/Filer/main.h +++ b/sources/Filer/main.h @@ -20,26 +20,26 @@ class MainWindow; class App : public BApplication { public: - App(); - ~App(); + App(); + ~App(); - void MessageReceived(BMessage* msg); - void RefsReceived(BMessage* msg); - void ArgvReceived(int32 argc, char** argv); - void ReadyToRun(); + void MessageReceived(BMessage* msg); + void RefsReceived(BMessage* msg); + void ArgvReceived(int32 argc, char** argv); + void ReadyToRun(); - void SetupTypeMenu(); - void ShowHTML(const char* docfile); - void FileRef(entry_ref ref); + void SetupTypeMenu(); + void ShowHTML(const char* docfile); + void FileRef(entry_ref ref); private: - void ProcessFiles(); + void ProcessFiles(); BObjectList* fRefList; BObjectList* fRuleList; - MainWindow* fMainWin; + MainWindow* fMainWin; - bool fQuitRequested; + bool fQuitRequested; }; #endif // MAIN_H From 5143176d3eb212575a508ed5e7a563d27395f7d0 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Mon, 2 May 2016 17:04:21 +0200 Subject: [PATCH 07/10] Fix window resizing Now the window can again be resized vertically as well. Fix the worst flickering of the Dropzone. --- sources/Filer/DropZoneTab.cpp | 13 ++++++++----- sources/Filer/HelpTab.cpp | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index b11903e..6bfa4ad 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -25,9 +25,6 @@ void DropZone::_Init() { - if (fReplicated) - SetViewColor(B_TRANSPARENT_COLOR); - fLabel1 = new BStringView("label1", " Filer "); fLabel2 = new BStringView("label2", " Dropzone "); @@ -53,6 +50,8 @@ DropZone::DropZone(bool replicatable) BView("Filer dropzone", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE), fReplicated(false) { + SetViewColor(B_TRANSPARENT_COLOR); + _Init(); if (replicatable) { @@ -130,13 +129,17 @@ DropZone::Archive(BMessage* archive, bool deep) const void DropZone::Draw(BRect rect) { - SetDrawingMode(B_OP_ALPHA); + BRect bounds = Bounds(); + if (!fReplicated) { + SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + FillRect(bounds); + } + SetDrawingMode(B_OP_ALPHA); SetLowColor(0, 0, 0, 0); SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_DARKEN_2_TINT)); - BRect bounds = Bounds(); FillRect(bounds, B_SOLID_LOW); StrokeRect(bounds); FillRect(bounds.InsetBySelf(3, 3), stripePattern); diff --git a/sources/Filer/HelpTab.cpp b/sources/Filer/HelpTab.cpp index 8250eea..d449e01 100644 --- a/sources/Filer/HelpTab.cpp +++ b/sources/Filer/HelpTab.cpp @@ -178,7 +178,10 @@ HelpTab::HelpTab() .Add(fDocsButton) .AddGlue() .End() + .AddGlue(100.0) .End(); + + SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); } From 394f82530c87cb6de09c596a8af6622254b8d393 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 3 May 2016 17:23:46 +0200 Subject: [PATCH 08/10] Add a button to start/stop AutoFiler AutoFiler can now be started/stopped with a button in the AutoFiler tab. Use a BMessageRunner to check ever 0.5 sec if AutoFiler is running or not, in case it was started/quit manually outside the Filer GUI. --- sources/Filer/AutoFilerTab.cpp | 55 +++++++++++++++++++++++++++++++--- sources/Filer/AutoFilerTab.h | 5 ++++ sources/Filer/DropZoneTab.cpp | 7 ++--- sources/Filer/FilerDefs.h | 5 +++- sources/Filer/main.cpp | 2 +- 5 files changed, 64 insertions(+), 10 deletions(-) diff --git a/sources/Filer/AutoFilerTab.cpp b/sources/Filer/AutoFilerTab.cpp index 817c7b5..9c3a52c 100644 --- a/sources/Filer/AutoFilerTab.cpp +++ b/sources/Filer/AutoFilerTab.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,7 @@ AutoFilerTab::_BuildLayout() { BStringView* folderLabel = new BStringView("folderlabel", "Automatically run Filer on the contents of these folders:"); - + fFolderList = new BListView("rulelist", B_SINGLE_SELECTION_LIST, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); fScrollView = new BScrollView("listscroll", fFolderList, @@ -76,6 +77,9 @@ AutoFilerTab::_BuildLayout() fAutorunBox = new BCheckBox("autorunbox", "Run AutoFiler on system startup", new BMessage); + fStartStop = new BButton("startstop", "Start AutoFiler", + new BMessage(MSG_STARTSTOP_AUTOFILER)); + BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); path.Append(gPrefsPath); @@ -106,7 +110,11 @@ AutoFilerTab::_BuildLayout() BLayoutBuilder::Group<>(this, B_HORIZONTAL, B_USE_DEFAULT_SPACING) .SetInsets(spacing) .AddGroup(B_VERTICAL) - .Add(fAutorunBox) + .AddGroup(B_HORIZONTAL) + .Add(fAutorunBox) + .Add(new BSeparatorView(B_VERTICAL)) + .Add(fStartStop) + .End() .Add(new BSeparatorView(B_HORIZONTAL)) .Add(folderLabel) .Add(fScrollView) @@ -126,10 +134,11 @@ AutoFilerTab::AttachedToWindow() { // SetFlags(Flags() | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); + fStartStop->SetTarget(this); fAddButton->SetTarget(this); fEditButton->SetTarget(this); fRemoveButton->SetTarget(this); - + fFolderList->SetTarget(this); fFilePanel->SetTarget(this); @@ -137,7 +146,10 @@ AutoFilerTab::AttachedToWindow() BMessenger messenger(this); BMessage msg(MSG_FOLDER_SELECTED); messenger.SendMessage(&msg); - } + } + BMessage msg(MSG_UPDATE_LABEL); + fRunner = new BMessageRunner(this, &msg, 0.5 * 6000000); // x * seconds + BView::AttachedToWindow(); } @@ -179,6 +191,16 @@ AutoFilerTab::MessageReceived(BMessage* msg) { switch (msg->what) { + case MSG_STARTSTOP_AUTOFILER: + { + ToggleAutoFiler(); + break; + } + case MSG_UPDATE_LABEL: + { + UpdateAutoFilerLabel(); + break; + } case MSG_SHOW_ADD_PANEL: { fFilePanel->Show(); @@ -258,6 +280,31 @@ AutoFilerTab::MessageReceived(BMessage* msg) } +void +AutoFilerTab::ToggleAutoFiler() +{ + if (be_roster->IsRunning(kAutoFilerSignature)) { + BString command = "hey %app% quit"; + command.ReplaceFirst("%app%", kAutoFilerSignature); + system(command.String()); + fStartStop->SetLabel("Start AutoFiler"); + } else { + be_roster->Launch(kAutoFilerSignature); + fStartStop->SetLabel("Stop AutoFiler"); + } +} + + +void +AutoFilerTab::UpdateAutoFilerLabel() +{ + if (be_roster->IsRunning(kAutoFilerSignature)) + fStartStop->SetLabel("Stop AutoFiler"); + else + fStartStop->SetLabel("Start AutoFiler"); +} + + void AutoFilerTab::EnableAutorun() { diff --git a/sources/Filer/AutoFilerTab.h b/sources/Filer/AutoFilerTab.h index 2e9e0c9..a0bd171 100644 --- a/sources/Filer/AutoFilerTab.h +++ b/sources/Filer/AutoFilerTab.h @@ -34,11 +34,15 @@ class AutoFilerTab : public BView void EnableAutorun(); void DisableAutorun(); + + void ToggleAutoFiler(); + void UpdateAutoFilerLabel(); BListView* fFolderList; BScrollView* fScrollView; BCheckBox* fAutorunBox; + BButton* fStartStop; BButton* fAddButton; BButton* fEditButton; @@ -46,6 +50,7 @@ class AutoFilerTab : public BView BFilePanel* fFilePanel; TypedRefFilter* fRefFilter; + BMessageRunner* fRunner; }; #endif // AUTOFILERTAB_H diff --git a/sources/Filer/DropZoneTab.cpp b/sources/Filer/DropZoneTab.cpp index 6bfa4ad..17fa03e 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/Filer/DropZoneTab.cpp @@ -117,7 +117,7 @@ DropZone::Archive(BMessage* archive, bool deep) const { BView::Archive(archive, deep); - archive->AddString("add_on", kApplicationSignature); + archive->AddString("add_on", kFilerSignature); archive->AddString("class", "Filer"); archive->PrintToStream(); @@ -154,14 +154,13 @@ DropZone::MessageReceived(BMessage* msg) if (msg->WasDropped()) { BMessenger messenger(be_app); msg->what = B_REFS_RECEIVED; - be_roster->Launch(kApplicationSignature, msg); + be_roster->Launch(kFilerSignature, msg); } switch (msg->what) { case B_ABOUT_REQUESTED: { - BAboutWindow* about = new BAboutWindow("Filer", - kApplicationSignature); + BAboutWindow* about = new BAboutWindow("Filer", kFilerSignature); about->AddDescription( "Filer is an automatic file organizer. It takes the " "files it's opened with or that are dropped on it and moves, " diff --git a/sources/Filer/FilerDefs.h b/sources/Filer/FilerDefs.h index f3ad72c..b3bdd63 100644 --- a/sources/Filer/FilerDefs.h +++ b/sources/Filer/FilerDefs.h @@ -9,7 +9,8 @@ #ifndef FILERDEFS_H #define FILERDEFS_H -static const char *kApplicationSignature = "application/x-vnd.dw-Filer"; +static const char *kFilerSignature = "application/x-vnd.dw-Filer"; +static const char *kAutoFilerSignature = "application/x-vnd.dw-AutoFiler"; static const char kSettingsFolder[] = "Filer"; static const char kSettingsFile[] = "Filer_settings"; @@ -36,6 +37,8 @@ static const char kSettingsFile[] = "Filer_settings"; #define MSG_MOVE_RULE_UP 'mvup' #define MSG_MOVE_RULE_DOWN 'mvdn' +#define MSG_STARTSTOP_AUTOFILER 'ssaf' +#define MSG_UPDATE_LABEL 'upla' #define MSG_SHOW_ADD_PANEL 'shap' #define MSG_SHOW_EDIT_PANEL 'shep' #define MSG_REMOVE_FOLDER 'rmfl' diff --git a/sources/Filer/main.cpp b/sources/Filer/main.cpp index 2aab70e..5fadb3f 100644 --- a/sources/Filer/main.cpp +++ b/sources/Filer/main.cpp @@ -26,7 +26,7 @@ BMessage gArchivedTypeMenu; App::App() : - BApplication(kApplicationSignature), + BApplication(kFilerSignature), fRefList(NULL), fRuleList(NULL), fMainWin(NULL), From 7ab353fe738e2079916fdf1b68de7ace37a43119 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 3 May 2016 17:41:45 +0200 Subject: [PATCH 09/10] Updated documentation. --- documentation/User Documentation.html | 84 +++++++++++++++----- documentation/images/autofiler_settings.png | Bin 8471 -> 10893 bytes documentation/images/filer_dropzone.png | Bin 0 -> 13644 bytes documentation/images/filer_ruleslist.png | Bin 10135 -> 12390 bytes documentation/images/help.png | Bin 0 -> 15655 bytes 5 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 documentation/images/filer_dropzone.png create mode 100644 documentation/images/help.png diff --git a/documentation/User Documentation.html b/documentation/User Documentation.html index a737d3e..f59fb99 100644 --- a/documentation/User Documentation.html +++ b/documentation/User Documentation.html @@ -109,42 +109,84 @@ Filer icon

Filer's User Documentation

-

Filer — Filer Usage
-AutoFiler — AutoFiler Usage

+

Usage — Dropzone — Rules — AutoFiler — Help — History


-

Filer is an automatic file organizer. It takes the files it's opened with or that are dropped on its icon and move, rename, copy or do all sorts of other things with them according to rules created by the user.

-

Filer is accompanied by AutoFiler. Instead of working on a set of files provided by the user, it can be started together with Haiku to monitor certain folders and deal with new files appearing there according to the user-defined rules.

+

Filer is an automatic file organizer. It takes the files it's opened with or that are dropped on its icon and moves, renames, copies or does all sorts of other things with them according to rules created by the user.

+

Filer is accompanied by AutoFiler. Instead of working on a set of files provided by the user, it can be started (automatically with Haiku) to monitor certain folders and deal with new files appearing there according to the user-defined rules.

+ +

+index +Usage

+

When started for the first time, you are asked if you'd like to have a few example rules by default. You can edit them to your needs or remove them altogether at any time. All settings are saved in ~/config/settings/Filer/.

+

Once you have created some rules, using Filer to process files accordingly is very simple. There are basically four ways:

+
    +
  1. From a Terminal, simply type "Filer" followed by the files you want processed.
    2. +
  2. Select the files to process, right-click them and choose Open with… | Filer from Tracker's context menu.
    3. +
  3. Select the files to process and drag&drop them on Filer's icon. You may want to create a link to Filer on the Desktop for that.
    4. +
  4. Open Filer, select the files to process and drag&drop them onto the "Dropzone". The Dropzone can also be embedded into the Desktop as a Replicant.
    5. +
+

…or have AutoFiler monitor specific folders to automatically process their incoming files according to Filer's rules.

+

Filer's interface is divided into four tabs: Dropzone, Rules, AutoFiler and Help.

+

index -Filer

+Dropzone
-Filer list of rules   Editing a rule
-

Double-clicking Filer opens the settings with a list of organization rules. When started for the first time, you are asked if you'd like to have a few example rules by default. You can edit them to your needs or remove them altogether at any time.

+Filer's dropzone + +

As described above under 4.), you can drag&drop files onto the Dropzone to have them processed according to your set of rules. If you'd like to embed this Dropzone into the Desktop, click the button Replicate dropzone….
+It opens a window to resize the dropzone to fit your needs. When that's done, drag the little Replicant handle in the bottom-right corner onto your Desktop. Make sure to have Show replicants in the Deskbar menu activated. Once on the Desktop, right-click the Replicant's handle for a menu to remove it again.

+ +

+index +Rules

+
+Filer's rules +
+

The second tab shows the list of organization rules. Every dropped file is being tested against – and if its type etc. matches processed by – each rule, top to bottom.

+

You can arrange the rules with the Move up/down buttons and Add…, Edit… and Remove them.
+Here's the window that opens to edit a rule:

+
+Editing a rule

A rule needs three items: A Description, the condition When it is applied, and what action to Do.

Click on the buttons in the "When" and "Do" boxes to explore the various options to construct the right condition and what action will be taken. You can add several conditions which will all have to be met to trigger the action. If you add several actions in the "Do" box, be aware that they are executed in order, from top to bottom.

Please read the Rule-Making Reference (also available from the Help… button) for more information on the various possibilities.

-

-index -Filer Usage

-

Once you have created some rules, using Filer to process some files accordingly is very simple. There are basically three ways:

-
    -
  1. Select the files to process, right-click them and choose Open with… | Filer from Tracker's context menu.
    2. -
  2. Select the files to process and drag&drop them on Filer's icon. You may want to create a link to Filer on the Desktop for that.
    3. -
  3. From within a Terminal, simply type "Filer" followed by the files you want processed.
    4. -
+

index AutoFiler

When AutoFiler is running, it monitors user-defined folders and executes the actions defined in the Filer rules automatically.

+
+AutoFiler settings +
+ +

The AutoFiler itself is a background application. You can activate the checkbox at the top to automatically Run AutoFiler on system startup. The button to beside it lets you start/stop it manually.

+

You can Add…, Edit… and Remove the folders that AutoFiler will monitor for incoming files.

+

index -AutoFiler Usage

-

The AutoFiler itself is a background application that normally isn't started manually. If you want to stop an already running AutoFiler, you'll have to quit it through a tool like Haiku's ProcessController or kill it from the TeamMonitor (press CTRL ALT DEL).

-

The configuration is done with the AutoFiler Settings:

+Help
-AutoFiler settings
-

You can add, edit and remove the folders that AutoFiler will monitor and use the checkbox to enable/disable the automatic launch on startup.

+The help tab + +

The last tab shows some information about Filer and offers two quick links to Help on rules and the User documentation.

+ +

+index +History

+

1.0.0 - 2008:

+
    +
  • Initial release.
    • +
+ +

1.1.0 - 03-05-2016

+
    +
  • A new GUI to integrate Filer and AutoFiler settings.
    • +
  • Add a button to manually start/stop AutoFiler.
    • +
  • Adding a dropzone and make it replicatable. +
  • Add user documentation.
    • +
diff --git a/documentation/images/autofiler_settings.png b/documentation/images/autofiler_settings.png index 17f167198efb38e5a2a50830142312ef9d7126ed..9e3ee64a50875d6ef887e223860dcad3363498c4 100644 GIT binary patch literal 10893 zcmcI~cT`hN*Ke!{iYS6eM-jmwL_t8hAQ7bpLPsJZy(yswf{F+P0qN2u2t=ev6X}m4 zAYD3yCcP5~C3L=tKJWKF@3-!{>)y5Q{R7s?%$##(_TDr5_xtS=q@|%uPsc_Ffk5c* z-&4|tKn_KNKaLZ}K?}pgRY3>@ioCC+fb<|PCeeIht{tkgIea744-uY)u>Wo$zdFfTFh5)) zX{=G2h;Abt$jC3XF10Q+`&v#X6;QOtoP2i@o;Q5EgJd>v_(jzP#;NV(*rtPpAkQ*>DJ^Ha|VklR>XV}NF9vqy!}Ey0ghw7exhG#{5PssSfaSCh%@XCiCbRP8M?saz0*UH8P{^AU zd_j3hFmuqG7mq%d$W!mn`f@2ebtjmSI!_&>o2z^NrL)>v%`r_3gQTDoXzsn268#6I_yXZdD-3Toxi?7ryAtNOQy}onc`{F^G}@)q=QUk5-K|TYjH~V6mBHI zZvA-ts@w zA7}kN{pgn%=#AcU{+cqm5%f+;2X^fHE{kH~-W@O~CzDkhyMDSDDgW=4<>dTX86EcN zFRbP+@+th%#CqS8(t`9cT!&de^r^kqF3*2k9`|yr`p;_?!~a;Rq=vy$R@{X2Hl=SF zqbjVi%{qJd&y1=i+$EPW{G&%}v$tlS@5rv`)GjXHF%6?~V-dDP#dc!B zvjX9TOd(a>mhPnC7T<`8n${%g#b(Eig?`Ji??FY}0$vC+PB!P~qcs5otT-w4WviWy zMYqqFQrg{k9=try+>?4y|0lUMlvA4Ls8hwtafjm_D%Oa0BUb~<=C@~Ov46SGemlz? z^6laUWu&!xMd9qFBEmJJB7vLE&QUvuM$%6zBR@L~#H>aMATEu!E#v4G1Kh-u0m*OS98nY8AOMVHF6`C!WjAEiqgiIqw!g3N)7@l1C1GO22oW_#|rKu*U4Y9 zMtXZGSbv<`A~DXkJ1Z_r_ao6fX|=9&@$-OMG*nlu7RRifAnuU;M6&l0Z9;|=Pi2Kg zQ%o@@`Rxt!!TI?8A@9|eDMDJP2s0FUJ;$h6B(HMAsLq=u+5k0AVQP#PoHk||Mh}m_ zE0EjY9G}`84=ce&R4KWNP>?Rc?+2FRF6FwJPxuvt=uG=7<43`vkSM zWR_#_*>V#eJ2+gGkuBVl6#hdkLA*sa6R}}vm1L2jkz^}5{#vv-L}J)LAT+mn`P<3! zoFgus>NK(+_47=p3YvsZCRui7sJBcsL^|*u43V%_8nWw1O4&X1p>d~(HG00gIsRWr_>~5e70S5%H0+fpFW~hF;+zvTDCaXZ0|9)7*$Xj z+Yr78A!9fn!J+nZ!*!A*KEeWzzsqr6QnGQ+mMMRF?S*w%EhbFr3Q1O(+ox!cT~otj zp)Y>}zFN0p+M7=)yCCI4*qVg-+9->gb$ZXH#||zJmZBH$jnLZF=&O2Y7;xh5&c=}+ zARkGKy6(2gA5=I!@M!Z4^J~m9w4f{v<=nC=P&4H~v^yg%2!Hu?cooFhmr?nHt+ouq zLQ6-3$&iq7Sr$?mv4&V|H}omgwH2nJMFgit3CT}DH!CVBXFiiM45G+ixWrE%iOUKd z3(C6F_nCR%ir?_6n)dHKqldhy*slGO!u8=Dg-ht;J?{#|_vqnU*j|+P3cOqRpeu7rWDbl37f>diUe%&(~0uEu9r$*wsA4mzIJ?jXHg2b*Iaul${bEH)g#O zxBkhqlc*M>ehXjlbiD3%QT=Md$nMm;Ree*>^vaC!PEGkC;o5AY;>IQU*(Rl}ze@FY z9LeDlRm9xFgNsF(&LE|f^;WK!ub8fKNn@a1F_v;{Cu|zT)#9-paK290ams19gK@rt zNIS-qi7B1r{5+eHIplD$erl{XyJOnj5VAuck>S?PLgC`cD@DgY?lCxVRQ`+)4@9?0 z);l`R#f$GRRqZUj?^v_@wXLYU(*0w7Al*o=^SJG298ODlc2iN5#o>*up=Q$~V!g^` zsDgztt1IvjEET7MTw@9L`*}^*;o3$;YtoZ%v>OHvxBY-2#eU87=B2DZN9XNk ze4dldj8hLd&6yoY$2p&f9>O?X8wN+*UcQ>oP&#YyOO&VYSP;Kr`mFM2oQl=}&LJ{r z7_Gz?47cbnut*J$OdI6h!9ZiM`&zxiox!rxc zvTcn~yv1Y7JyZ-zYEKJzaIUAxcOk!?=(?@8B@A65=e5|n;-z|;7ov1Do>up1XU>M4 zOV4JIS$@X()Jyv7Z%5%_UwAI$5gwO0?h+q%QA6Zhj8>L+yJIkI+(x%_2hx>(vqL>Kr0FZ>F|fa-wV+CjC6)s$>04v0$_sb%O~C} z-ooQs8NXfpoimqxyN*C^w;yn?-#Ym(IPl*<;NNh7iV{HcKY+rs!MnaSS2<^wOS+v| z09q)}MjmJ2IwkpPUqBE57ehfP%6Cs}0>T)XEQ`4Wpz0pJz-dJ8hx6J&Du6rB2)9?x zM@x)&i}HDVID|_fcyEpdyqSDlOpsar>&X3lyIx^aTL4kcMEk)f6P&7ozW??7$XRA; z3$xOsmKI)#b{8Va3&l{D{BORa$m!TvRT8{+7E8iU@Isvlcfcv$;?H7gZR)e${krs;3jaHtDKgpL^B4e*$qOdveg@$8I_wa=-!a}j#%*s%-%Nu~mML$8B7MW>V8lUXGk zO^DK+0<&Eo_1n7gP}TRO_B}{G6>DdrPX*%872aFUXz;#-P7P_HG+5vFpmPp2j8ejM z2(yeA1SSatLU~ddoUzS0CBwG0aG$o5u!@JmRhy3}W!}tDcQ1U)5CsP^dhltzA%G^~ z;Z~Q=@jt)@D)$68x{vs<1QGC;da@188)IRlort>7C7M$g9@_R~+bG{*ye!65ZAD#J zPrIzw+Vx%&wEDx$Ux}(W2Y#xeYv?83g536YuKVMFdD6+w_RH}f?1@DUF7rJtF(0+l zRWhiDWYzo5N|5mKB*{N`)f*!C#xpptpb*{?wp{|~j{E%m80P7(G~7i=)bzaY?5|R% zz3uglL^hX-TiB{oI*t$W4D#_pz2NL{m`4;2riDs1hQ3Uj7=gjSibaHsKNs2P6STgX zI5+V5H?kVjm|3O;&F$ruFNt(#=@z!l{Y<@+>eZ-=klbCaX#s$X(e1ry;;L$_uvjb# zTk0U6HQpp#-fZ9ZDOF2m9S$;%i%H7P2KjY zb8u472cbEG>2HDl;Go^yql`#Ydaa8T+jbW?r26b^SOTC(+Z0AP>XK#qsbt74!KUw% z*?X1(c<_14;R;Xj6ySd`tHh^wzfI3t=voK?po$;oIdo!<=VrNW7a=@h3cv}wr7z>5 zQA%+7`Q6nv3G{TUn4n(v^&I08@gyl%s7u~mpI{c4##^_y-td(q)5ME+UK#kdq{xpH zISlk9>+=&rhf19$euTTRcEU6+RlmGSDeg73)5|k;U@wspmK~u@@g_HfucipV_!FPJ zU=_7|ZCLJ>V_0k(?GqY<-kswi>|M@s@9xCIgRe;~b)>6;U;(?!yWP20U1I35sqfzU zmtNhaJ~ZRrbc*k=+k3C%In(vU5H!fg#ErRFjcd~GOGS$5ZkJrL(O4TQJjfLvDYDU# zXaUfD;Ixcd6=S;3!5(Gc=A;$8GyPzlaoG~KCHa_ArN<$S=6f4rG{;>H}`>bx-7F$i_QCmmtrqEXNZ`* zUd@#gk$D1Dooer#Myf2ozBuOJstUR3+;IwS7Lv<_S-3HBE6AHQW3ZLGKJwQ0S4}ZO z?2-p&u{m8&t@XzAX&P|2lH{VB<2jio%+X*=_xI=T<{H*V>zlF~o*KsPI1GHQc&e9c z!YZJVPuOKKdGefHuU-~}5^&p20b91D89lN{b3Wvpsus~GzLTeRzQ#OMvaVz|P~}Ce z-Re|}B_JD90E6Aslvzi&Z*14BO{ba0ILmk6^@R>Nl}0w zi~*px$Sm8Qt<;xWU3C!IA~(%oFsSW*Hd}`W-t}zzHd07yOU60DaXe$3BH!7* zW0^-gajcsU-&*MiN(Y$QEoSbe?yF$ovL6!kq*9MwU1dgD{%o-CBlDDO_-zlclN8>0 z_+$V#Hc&|f1J%Z~=yjb)3PpIj<=QW)cl$!i$E~n zNCEC%ehrOS*Bmuc&>&fNZE`8}J(J$W+LaqzU@$8h-k`ihi{!*RPBvF6n*y&NOLku%%hYRlbI+uv@y(mu=V zAOKaDRc(@DdsFER@Z4G7FY!Dt>Xl9zu-3k%2Cxr7PZgYf63Bm*T3J&BE4;N)ezBM zH{X|U&LEYCrf0i(VqJzdvL~Q&`euAbEZ_Dwm6^Ws#PEe)loxAJ{X3r*<6-i{*jXkx zGJ?8xHU--&7e}n`=qB_H&uhxAM-8F1hX3hTyqNotZ=YE}zpKxr;NPovtJ?1d+rFxT)BBbV3S#WorBpLoEMxf`|V+`5i0^ z6oB$J4~KIyPf$g$$2o+@a|ip+nqLqgkiRa{{3j^-2O|2HqVk{832n%};~5BqiQ(-B z0HB&s5CDC^1%N<*E&x^nn$MsA|7iZ7{Sg`}Q37Wvw|bitlNDqDv!{~q*AvtBS&@V- zhBDX)(YOwtu8|~_;W$(#Ng1ohV9Ur+C-Hdi+K6EM+Xk;@-9ybTTXx-97FRS9-xj(u zM)@jDp26Xu8Q8t;7=dVT;6!MOM!SS`oQVc;1jW5)%jz;sIum1c-#glPT{&h-P zhUCBC&ki#Qz#laO(`peu75PrrvDgEFbyk?K+1$_h1iQS-o~oTP%2GK=V~aCLTcXwo zIbkB{Hu}x~JSTrv;3r;>$}d1laqgt*I4zv+g9w38sLT3X_h%k(5PzBdnd-+b2V6LW z(Y!T!RMfKhLZREDQK4-&6oaA?^yxf+YNry>tv7(q5pS6P$bS~>a%~&w`ZDFiGl|@i z&hJZspm0unHyBpcM^&35%6v*X2ov63cBm2SR`qnB+u~ELj{6tz&jB>Ug(FeAk=zr@ZGea= z<+A^1b&OAiI6STjtL&25o=J0)Edh+)EhCc9UZ1;lWxVZEVfd%ntaDnD{yphpKE0aN z-kC=A4N<%^CR&m&$ce4w@8w)|ZHUf9Dc7u|tJZJ@?w(WJaxyutQL|DjO}<^*uUk~3 z$aUos-R_rFhM0^I;oC7(fgwD%bvAz7JALtcyFl&yu7}+cLirxntQG@U)1sQ?cwLAa zlx@wMWJE>|dipgrC`NQTp~eD}wddPC7d> z3`~u>18hCVCgoY>Y0_ukopzY{nd;WSrz0Az)^opNS2?E*X$6H`C;_fR-u4Wx@L;p zXY7PT^aB{`qh8LXAeAnu(<%}KuE?v(*RT#3yUE|1d_}OQRaVJOuoBM9j+1j=B7h<` z|98B?5RD)AVy~#j_sKG+dVHwj#ac8aOu`(HVVu$%?^dOH-zgl?UtISOScUsl?FJ70 z?1;TNjE+|^bsuuw_(+#(PC|;}2&dS^n?u=7OD|k6k4+V80`m?lrnCc4T&|C|5LUic z^M0|nUw*wyM_k>9k1@T5foz2c#F4WLY=;bX^y|5OEA|e<8c&`n4)yDx&#Hgics3Yi ze6Lt$g`Dy_#jm4lKZ%%446C}?5pZQTJ58ZpG=GqUYX1DdZT15^gdRmz=15FXW^zRS_4xV@JTQJ>|%wNTi0X{CWbg?iH) z1LOv2#AyrQT9b{XA$FD^+JC)}gAH+2K;SkK$1A_Pd?(+_6cI}U!3Q^jT+jkEwPuhW zZ~+99onK6atA3h3(icfveVF~_SpDW6ik$et{*?4i;Z9`UQ8$;d0aBGHHo%g?^DXXTQ*7P`6sLMJIP|270a)-c0c;Yon}yP@UU7C62vpMNI>40 zBKk|wnXF>AQOr@a=dSdn&;ha{TLQP(3$4spHSdg!|6m=nQhn|`OBrR9R&`-ZfO80y zQDt_%qPT`0)$fjvEB7kjT5HN{VL8~0jVrMXC?(X-D2j3hTz@(iy*@bbDq;G3b_vCI ztzW+R*K{n43aMfsAb}R$yEjeL-zW=p)#!Cw+-okHm1yTWXp=Q>p^O|n6t2W%)1$h5 zBRs80VZ8g#$64Yi^4s6M_ef4HWe%8@?jy;;^CzpP{jZ|5JRSF{XDwHAeZ;vN+qmnm zo$5aAvfC9bn7u6MB%7RQL37xvm4@5b%#myD(Tq%%OdD+Qq1?{gZLR>dtBLi6QVhjy zUZk|PMOm2ekUg6_D{I*)NaoGfPJtxab}|MFOEFj^mJG$=`QJ0CB0 znHTD{WxUR&KV$0ePTG-)AQUaFW^YXd`<9KCj0`zp4`y6CXF|^u0~ztUptWNJ{+ zAQAHJR=x$NxKA`ttsMpFVuwUqvj=xgQ(Xeu3>@<2ag0dP2t<=q1 zu_Q*QrxKrs^6A9~$z8X6zE$5l(q|<-8X`^cZygVe``FU);(^|?+5&pgd9NPxNR)(= zJ<%a|M)s>o-yW+ddTYRP(9Z5o^dTOW*lMaga}0jC07G#ExjSpnbf4|I?en-ouK|S} z&XvI4v-|T2PA5Y$lG+Ka%4eBf6^Z8enUp#EfYn)T4Ee=1>&G7itkaDRjJNw4R`97Jf*AClzZcThJBtJ>MelxGuC%o+g>=6Hl?*A9r0DOwB9CR`@! zAo!UrGVo$vIn@~Dp}pidE9LK2?p&6!iWMte{ogZ2S@=y2U8^_b6Q7jtqy*nY8Ke|7hEA*{9JwE&4^6ygKcn(GT71}l=uX~6hxzwxV<06($!QX z4vT=(&yWX7T)Wm+CDGNZ7$n8&Gnvl%s%pDKJHXV%-)Xb6>kP`5zEG6Os*^&b@!fr- zmIQChG%Zde_V`>e2q(+ww=KK9QvkbK7jq#m&$o9;;l!e{N6HQ7sdz;U2itQy&A&?b ze|%4O6Wu((dw@LNzS^vbd(JSblxJ;BuTm<2S4}H<% zUf5!Uf9_R|B?_{tB}6~ZFl}44LHc^6 z*n2zj2La5-oV<+U+h0{wX){V~2*dU=NQE0%e$sY@k(tjGfQ^pI!hY~8OwP)Bhlb?w z3HT_a)30A&glZmT`Dgw5z5??4shUrBoC4`y znO%4V)b9(g%&0o}fB(4f`}!itd|&|3#~)sJ_4kkezoWGx|8HgjX7ztQ?f(~p(;px& zpJ{kTHHR5ZP@`3f&-oxtxvis!ufU#+!HxTSJ3`z(YvE19m6-8MH-4M>y3(!XHriQab1K=JH3Tbh%rd|znO+_}H_8u!^wZA=Z zULEPSG-z`-gw4YL@wb<>8=2n*N}QB`d(j$?pUeXsE)G=tjTPG4=-I_T?fL^x^6^6- z0hwM8sh4f=^{y;%WK29E@WqS6Rr}w-bUS#V-rBFhxQkTp_obd=-V=h+Dlrvk0C2-2 z{bQ?In?v_305>~<9TY1yYNI^h{QsNJAE@Z+KY9OOG<%hzCm5<~OKOKoK!8OQ5KeK) zTu?l-9@aH#?41x?1xKEVE(&Y}IyF7*Pu2cHtG4&ja^8VX=!W0p#S#4_PTb$kKzZq^ zyZ7eVktv+hS!VE>)bW~5EZxK73*m> z&w~bBK4D>~obm>NR|<;CwTf_Y@$O$3xN|>uM?66R%;6C~6i`o5AU!D~J7$cxE^?Xq z#LnD8dC#vK0;H}Ud|t?&>kRX4qzDhx)_eBR_S)Tzf!V9yFP9e@lt;7GDjAwIJCQ~R1TuPj%I*Ze<3GiF5m31o zUmPfr08s&BLiGyjW<3tQHFiSOYt4F~Zjux)W)}}oNGTqaEg2TE%jl@YxTCjcGs~x!st>U9^6Aw!ombG^ zy83b8TNM@@tQ`xgLM`TDvX-aicb{~A(BYRD{A6~AV%qW|DrS|7AdJ*|APopZ3%X5q zdRQ9hhZ2rjTq289_cll&SV1AZ^w*1%gP%;_fIU-c7SeHE*ktC_bXy8)#)6?NnS^Hy z`&4xYNw>2&Eq_o-l?N~nnuA}`7X~sD} zdFp>*2#vUIW$@k1k3^r1ez(8IO<<_1imMOGiqerEv@^ihARAVfQnviZyZu{dzr1_* z7ZMbMDz>H)&U4P2yp?%O{Cfw4k7!$f5CjUe2u;Wd0C`=)?mjWncN?qNAlhwk@pHKR zhYN!_L+x?0bEMYIRY~&cXI&62M!4t%!a+OyoP}& zv(?B-Z}omLMoxesZbJy1_>ZFrYl{QDpe6%o;3BcOFriLrzlMANA&8}^eH4Rw{LQOt zBF7(uksnPb5R_IPfEp4Vt(M%Txaq!ev8_dHn#&;ISo5M=K#UTa>efdUtLijtW`Ze* z=YTH~j6wPBahcoVoGG_Fwu1SLkDI*Nx1$tqEwIa!_^g!RcHcg90PY5IKBGhs< zGx1T_dUW@*Lr3hbP@nA$2a=UvUkH!#jcNm$D$(nVRFCBJHn?0c4f>gn{-*_)lnd@7 zmxX?xQXl|AVtzgBXa}DydM5~0wOAomUJ%|ZAa5?d@&j8SfP2LucQYoAP88IULm5U6 zQ;nEHupjtLKlUaxltF%Mz+{DLSstj1_vU%(D$A8>w~n}+NkK}102ZY7+-b$(DTVrs|G`@SL0_po|It5@P96R7t3Gn=90Y=s z(5OxkX2bzT%jDZd%9L(V#N$E#1Wnu=1<*roAh^0LA84G}H7eZQ1|1N{eYl2FuHwTN F{{`EAYqtOZ literal 8471 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 AIsgCw literal 0 HcmV?d00001 diff --git a/documentation/images/filer_ruleslist.png b/documentation/images/filer_ruleslist.png index 8d16f4c10d1fd25a81d268c387f2d0539508b212..9c8498e7d05b817edc2f698e3d31cbfb01329ebe 100644 GIT binary patch literal 12390 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 I!1R6p2gXVMqyPW_ literal 10135 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 literal 0 HcmV?d00001 From 1f193c9211a6a0d029cefb353158d0e75274b5d6 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 3 May 2016 17:51:33 +0200 Subject: [PATCH 10/10] Clean up. Ready for release. Removed no longer needed AutoFiler source files. Moved AutoFiler source to Filer's source. Moved all source up directly into the "source" folder. Changed Makefiles to release mode. --- sources/{Filer => }/ActionView.cpp | 0 sources/{Filer => }/ActionView.h | 0 sources/{AutoFiler => }/AutoFiler.cpp | 0 sources/{AutoFiler => }/AutoFiler.h | 0 sources/{AutoFiler => }/AutoFiler.iom | Bin sources/{AutoFiler => }/AutoFiler.rdef | 2 +- sources/AutoFiler/AutoFilerPrefs.cpp | 24 - sources/AutoFiler/AutoFilerPrefs.iom | Bin 21973 -> 0 bytes sources/AutoFiler/AutoFilerPrefs.rdef | 50 -- sources/AutoFiler/Makefile_settings | 128 --- sources/AutoFiler/PrefWindow.cpp | 371 -------- sources/AutoFiler/PrefWindow.h | 42 - sources/{Filer => }/AutoFilerTab.cpp | 0 sources/{Filer => }/AutoFilerTab.h | 0 sources/{Filer => }/AutoTextControl.cpp | 0 sources/{Filer => }/AutoTextControl.h | 0 sources/{Filer => }/CppSQLite3.cpp | 0 sources/{Filer => }/CppSQLite3.h | 0 sources/{Filer => }/Database.cpp | 0 sources/{Filer => }/Database.h | 0 sources/{Filer => }/DropZoneTab.cpp | 1 - sources/{Filer => }/DropZoneTab.h | 2 - sources/{Filer => }/FSUtils.cpp | 0 sources/{Filer => }/FSUtils.h | 0 sources/{Filer => }/Filer.iom | Bin sources/{Filer => }/Filer.rdef | 2 +- sources/Filer/ObjectList.h | 810 ------------------ sources/{Filer => }/FilerDefs.h | 0 sources/{Filer => }/FilerRule.cpp | 0 sources/{Filer => }/FilerRule.h | 0 sources/{Filer => }/FilerTypes.h | 0 sources/{Filer => }/HelpTab.cpp | 0 sources/{Filer => }/HelpTab.h | 0 sources/{Filer => }/MainWindow.cpp | 0 sources/{Filer => }/MainWindow.h | 0 sources/{Filer => }/Makefile | 2 +- .../Makefile => Makefile_AutoFiler} | 0 sources/{AutoFiler => }/ObjectList.h | 0 sources/{Filer => }/PatternProcessor.cpp | 0 sources/{Filer => }/PatternProcessor.h | 0 sources/{Filer => }/RefStorage.cpp | 0 sources/{Filer => }/RefStorage.h | 0 sources/{Filer => }/ReplicantWindow.cpp | 0 sources/{Filer => }/ReplicantWindow.h | 0 sources/{Filer => }/RuleEditWindow.cpp | 0 sources/{Filer => }/RuleEditWindow.h | 0 sources/{Filer => }/RuleItem.cpp | 0 sources/{Filer => }/RuleItem.h | 0 sources/{Filer => }/RuleRunner.cpp | 0 sources/{Filer => }/RuleRunner.h | 0 sources/{Filer => }/RuleTab.cpp | 0 sources/{Filer => }/RuleTab.h | 0 sources/{Filer => }/TestView.cpp | 0 sources/{Filer => }/TestView.h | 0 sources/{Filer => }/TypedRefFilter.cpp | 0 sources/{Filer => }/TypedRefFilter.h | 0 sources/{Filer => }/main.cpp | 1 - sources/{Filer => }/main.h | 0 sources/{Filer => }/sqlite3.h | 0 59 files changed, 3 insertions(+), 1432 deletions(-) rename sources/{Filer => }/ActionView.cpp (100%) rename sources/{Filer => }/ActionView.h (100%) rename sources/{AutoFiler => }/AutoFiler.cpp (100%) rename sources/{AutoFiler => }/AutoFiler.h (100%) rename sources/{AutoFiler => }/AutoFiler.iom (100%) rename sources/{AutoFiler => }/AutoFiler.rdef (98%) delete mode 100644 sources/AutoFiler/AutoFilerPrefs.cpp delete mode 100644 sources/AutoFiler/AutoFilerPrefs.iom delete mode 100644 sources/AutoFiler/AutoFilerPrefs.rdef delete mode 100644 sources/AutoFiler/Makefile_settings delete mode 100644 sources/AutoFiler/PrefWindow.cpp delete mode 100644 sources/AutoFiler/PrefWindow.h rename sources/{Filer => }/AutoFilerTab.cpp (100%) rename sources/{Filer => }/AutoFilerTab.h (100%) rename sources/{Filer => }/AutoTextControl.cpp (100%) rename sources/{Filer => }/AutoTextControl.h (100%) rename sources/{Filer => }/CppSQLite3.cpp (100%) rename sources/{Filer => }/CppSQLite3.h (100%) rename sources/{Filer => }/Database.cpp (100%) rename sources/{Filer => }/Database.h (100%) rename sources/{Filer => }/DropZoneTab.cpp (99%) rename sources/{Filer => }/DropZoneTab.h (97%) rename sources/{Filer => }/FSUtils.cpp (100%) rename sources/{Filer => }/FSUtils.h (100%) rename sources/{Filer => }/Filer.iom (100%) rename sources/{Filer => }/Filer.rdef (94%) delete mode 100644 sources/Filer/ObjectList.h rename sources/{Filer => }/FilerDefs.h (100%) rename sources/{Filer => }/FilerRule.cpp (100%) rename sources/{Filer => }/FilerRule.h (100%) rename sources/{Filer => }/FilerTypes.h (100%) rename sources/{Filer => }/HelpTab.cpp (100%) rename sources/{Filer => }/HelpTab.h (100%) rename sources/{Filer => }/MainWindow.cpp (100%) rename sources/{Filer => }/MainWindow.h (100%) rename sources/{Filer => }/Makefile (99%) rename sources/{AutoFiler/Makefile => Makefile_AutoFiler} (100%) rename sources/{AutoFiler => }/ObjectList.h (100%) rename sources/{Filer => }/PatternProcessor.cpp (100%) rename sources/{Filer => }/PatternProcessor.h (100%) rename sources/{Filer => }/RefStorage.cpp (100%) rename sources/{Filer => }/RefStorage.h (100%) rename sources/{Filer => }/ReplicantWindow.cpp (100%) rename sources/{Filer => }/ReplicantWindow.h (100%) rename sources/{Filer => }/RuleEditWindow.cpp (100%) rename sources/{Filer => }/RuleEditWindow.h (100%) rename sources/{Filer => }/RuleItem.cpp (100%) rename sources/{Filer => }/RuleItem.h (100%) rename sources/{Filer => }/RuleRunner.cpp (100%) rename sources/{Filer => }/RuleRunner.h (100%) rename sources/{Filer => }/RuleTab.cpp (100%) rename sources/{Filer => }/RuleTab.h (100%) rename sources/{Filer => }/TestView.cpp (100%) rename sources/{Filer => }/TestView.h (100%) rename sources/{Filer => }/TypedRefFilter.cpp (100%) rename sources/{Filer => }/TypedRefFilter.h (100%) rename sources/{Filer => }/main.cpp (98%) rename sources/{Filer => }/main.h (100%) rename sources/{Filer => }/sqlite3.h (100%) diff --git a/sources/Filer/ActionView.cpp b/sources/ActionView.cpp similarity index 100% rename from sources/Filer/ActionView.cpp rename to sources/ActionView.cpp diff --git a/sources/Filer/ActionView.h b/sources/ActionView.h similarity index 100% rename from sources/Filer/ActionView.h rename to sources/ActionView.h diff --git a/sources/AutoFiler/AutoFiler.cpp b/sources/AutoFiler.cpp similarity index 100% rename from sources/AutoFiler/AutoFiler.cpp rename to sources/AutoFiler.cpp diff --git a/sources/AutoFiler/AutoFiler.h b/sources/AutoFiler.h similarity index 100% rename from sources/AutoFiler/AutoFiler.h rename to sources/AutoFiler.h diff --git a/sources/AutoFiler/AutoFiler.iom b/sources/AutoFiler.iom similarity index 100% rename from sources/AutoFiler/AutoFiler.iom rename to sources/AutoFiler.iom diff --git a/sources/AutoFiler/AutoFiler.rdef b/sources/AutoFiler.rdef similarity index 98% rename from sources/AutoFiler/AutoFiler.rdef rename to sources/AutoFiler.rdef index 8be205b..37d8288 100644 --- a/sources/AutoFiler/AutoFiler.rdef +++ b/sources/AutoFiler.rdef @@ -6,7 +6,7 @@ resource app_flags B_SINGLE_LAUNCH | B_BACKGROUND_APP; resource app_version { major = 1, - middle = 0, + middle = 1, minor = 0, variety = 5, diff --git a/sources/AutoFiler/AutoFilerPrefs.cpp b/sources/AutoFiler/AutoFilerPrefs.cpp deleted file mode 100644 index 1485068..0000000 --- a/sources/AutoFiler/AutoFilerPrefs.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include "PrefWindow.h" - -class App : public BApplication -{ -public: - App(void); -}; - - -App::App(void) - : BApplication("application/x-vnd.dw-AutoFilerPrefs") -{ - PrefWindow *prefwin = new PrefWindow(); - prefwin->Show(); -} - - -int -main(void) -{ - App().Run(); - return 0; -} \ No newline at end of file diff --git a/sources/AutoFiler/AutoFilerPrefs.iom b/sources/AutoFiler/AutoFilerPrefs.iom deleted file mode 100644 index a8826122a86f6eeebc9590ac37fa214acd2a8c74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21973 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 diff --git a/sources/AutoFiler/AutoFilerPrefs.rdef b/sources/AutoFiler/AutoFilerPrefs.rdef deleted file mode 100644 index 6a5e981..0000000 --- a/sources/AutoFiler/AutoFilerPrefs.rdef +++ /dev/null @@ -1,50 +0,0 @@ -resource app_signature "application/x-vnd.dw-AutoFilerPrefs"; - -resource file_types message; - -resource app_flags B_SINGLE_LAUNCH; - -resource app_version { - major = 1, - middle = 0, - minor = 0, - - variety = 5, - internal = 0, - - short_info = "Settings app for AutoFiler watcher daemon", - long_info = "Settings app for AutoFiler watcher daemon" -}; - -resource vector_icon { - $"6E6369660A0500040054020006023B019B3AA235BC243E3C71D248D17C498491" - $"00E78FE5FFC967C3020006023BA71138D0C8BBF4B83E90E64AED7C485BD7008A" - $"1D86FFB039B502000602BB6FCBB8D4C839AA71BC3992492FF148D96A00FF90F8" - $"FFFDEAFF0366006403FFC0FE03AD38AB030100000200160239F20638AB65BE3D" - $"D63F501B4A4E27488B2600EBFFAD140A0626543A464C455C4B4C603E600A0638" - $"22262E264F3C5A4E484E2A0A04262E264F3C5A3C370A043C373C5A4E484E2A0A" - $"043822262E3C374E2A0A042832284E3A573A390A042A4D2B4638492A430A042A" - $"4D365238492B460A042A4D3854384936520A042E4CBB2BC5D3BB2BC5072E4A0A" - $"042C49344D344B2C470A042A352A402B38383B0A0436442A403846383B0A042B" - $"382A403644383B0A042EBE672EBF33BB2DC03FBB2DBF730A042CBD292CBDF534" - $"3F343D08022A4E2A540221B97FBE29B97FBE29B891BE35B6F7BEFAB7B4BE80B6" - $"F7BEFAB728BFCEB6F2BF78B728BFCEB798C07BB798C07BB70AC0E7B661C228B6" - $"9DC17BB661C228B59EC1F5B59EC1F5B53BC1DBB4C3C204B4C3C204B4A8C26EB4" - $"9AC351B49AC2DEB49AC3CBB4C7C4AFB4A9C440B4C7C4AFB5A1C4BDB53EC4D8B5" - $"A1C4BDB665C486B665C486B6A1C52FB79BC62CB70EC5C2B79BC62CB72CC6D6B7" - $"2CC6D6B6F5C72CB6FAC7ABB6FAC7ABB7B6C824B980C87AB892C86EB980C87AB9" - $"D0C7B3B9CBC818B9D0C7B3B9D9C6E4B9D9C6E433C6E1BBCEC644BB3EC6A6BBCE" - $"C644BC4DC6E3BC4DC6E3BC8CC732BD05C757BD05C757BDB6C6C7BE97C531BE42" - $"C60ABE97C531BDF2C4A8BE50C4CEBDF2C4A8BD33C45CBD33C45CBD4CC408BD59" - $"C352BD59C3AEBD59C2FABD36C252BD4DC2A4BD36C252BDF3C20BBDF3C20BBE53" - $"C1E7BE9CC17EBE9CC17EBE49C0A3BD0ABF51BDBDBFE3BD0ABF51BC53BFC6BC94" - $"BF76BC53BFC6BBD4C065BBD4C065BB44C001B9D940BA96BFC4B9D940B9D0BEF1" - $"B9D0BEF1B9CCBE8BB980BE29B980BE29B980BE290204344934C2AC34C3FE314C" - $"BA6F4CB91D4C2E492EC3FF2EC2AD3146B91C46BA6E46060EA6996D062C424830" - $"4A34484238464C344F5C305E345E2C5E2C5C4F284C46110A010100000A000110" - $"1001178420040A00011030302901178420040A00011030401B01178420040A00" - $"01011001178400040A020102000A030103000A040104000A050105000A06020B" - $"06000A0202070D000A07020C08000A0302090E0815FF0A00020A0F0815FF0A08" - $"011338421C15FF01178402040A08011338421C001501178602040A0901132042" - $"1C" -}; diff --git a/sources/AutoFiler/Makefile_settings b/sources/AutoFiler/Makefile_settings deleted file mode 100644 index e514803..0000000 --- a/sources/AutoFiler/Makefile_settings +++ /dev/null @@ -1,128 +0,0 @@ -## Haiku Generic Makefile v2.6 ## - -## Fill in this file to specify the project being created, and the referenced -## Makefile-Engine will do all of the hard work for you. This handles any -## architecture of Haiku. - -# The name of the binary. -NAME = AutoFiler\ Settings - -# The type of binary, must be one of: -# APP: Application -# SHARED: Shared library or add-on -# STATIC: Static library archive -# DRIVER: Kernel driver -TYPE = APP - -# If you plan to use localization, specify the application's MIME signature. -APP_MIME_SIG = application/x-vnd.dw-AutoFilerPrefs - -# The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are -# so that Pe and Eddie can fill them in for you. -#%{ -# @src->@ - -# Specify the source files to use. Full paths or paths relative to the -# Makefile can be included. All files, regardless of directory, will have -# their object files created in the common object directory. Note that this -# means this Makefile will not work correctly if two source files with the -# same name (source.c or source.cpp) are included from different directories. -# Also note that spaces in folder names do not work well with this Makefile. -SRCS = AutoFilerPrefs.cpp RefStorage.cpp PrefWindow.cpp TypedRefFilter.cpp - -# Specify the resource definition files to use. Full or relative paths can be -# used. -RDEFS = AutoFilerPrefs.rdef - -# Specify the resource files to use. Full or relative paths can be used. -# Both RDEFS and RSRCS can be utilized in the same Makefile. -RSRCS = - -# End Pe/Eddie support. -# @<-src@ -#%} - -# Specify libraries to link against. -# There are two acceptable forms of library specifications: -# - if your library follows the naming pattern of libXXX.so or libXXX.a, -# you can simply specify XXX for the library. (e.g. the entry for -# "libtracker.so" would be "tracker") -# -# - for GCC-independent linking of standard C++ libraries, you can use -# $(STDCPPLIBS) instead of the raw "stdc++[.r4] [supc++]" library names. -# -# - if your library does not follow the standard library naming scheme, -# you need to specify the path to the library and it's name. -# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") -LIBS = be tracker - -# Specify additional paths to directories following the standard libXXX.so -# or libXXX.a naming scheme. You can specify full paths or paths relative -# to the Makefile. The paths included are not parsed recursively, so -# include all of the paths where libraries must be found. Directories where -# source files were specified are automatically included. -LIBPATHS = - -# Additional paths to look for system headers. These use the form -# "#include
". Directories that contain the files in SRCS are -# NOT auto-included here. -SYSTEM_INCLUDE_PATHS = - -# Additional paths paths to look for local headers. These use the form -# #include "header". Directories that contain the files in SRCS are -# automatically included. -LOCAL_INCLUDE_PATHS = - -# Specify the level of optimization that you want. Specify either NONE (O0), -# SOME (O1), FULL (O2), or leave blank (for the default optimization level). -OPTIMIZE := FULL - -# Specify the codes for languages you are going to support in this -# application. The default "en" one must be provided too. "make catkeys" -# will recreate only the "locales/en.catkeys" file. Use it as a template -# for creating catkeys for other languages. All localization files must be -# placed in the "locales" subdirectory. -LOCALES = - -# Specify all the preprocessor symbols to be defined. The symbols will not -# have their values set automatically; you must supply the value (if any) to -# use. For example, setting DEFINES to "DEBUG=1" will cause the compiler -# option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass -# "-DDEBUG" on the compiler's command line. -DEFINES = - -# Specify the warning level. Either NONE (suppress all warnings), -# ALL (enable all warnings), or leave blank (enable default warnings). -WARNINGS = - -# With image symbols, stack crawls in the debugger are meaningful. -# If set to "TRUE", symbols will be created. -SYMBOLS := - -# Includes debug information, which allows the binary to be debugged easily. -# If set to "TRUE", debug info will be created. -DEBUGGER := - -# Specify any additional compiler flags to be used. -COMPILER_FLAGS = -Woverloaded-virtual -funsigned-bitfields -Wwrite-strings - -# Specify any additional linker flags to be used. -LINKER_FLAGS = - -# Specify the version of this binary. Example: -# -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL" -# This may also be specified in a resource. -APP_VERSION := - -# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install -# location in the /dev hierarchy. Example: -# DRIVER_PATH = video/usb -# will instruct the "driverinstall" rule to place a symlink to your driver's -# binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will -# appear at /dev/video/usb when loaded. The default is "misc". -DRIVER_PATH = - -## Include the Makefile-Engine -DEVEL_DIRECTORY := \ - $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY) -include $(DEVEL_DIRECTORY)/etc/makefile-engine diff --git a/sources/AutoFiler/PrefWindow.cpp b/sources/AutoFiler/PrefWindow.cpp deleted file mode 100644 index db21f65..0000000 --- a/sources/AutoFiler/PrefWindow.cpp +++ /dev/null @@ -1,371 +0,0 @@ -/* - Released under the MIT license. - Written by DarkWyrm , Copyright 2008 - Contributed by: Humdinger , 2016 -*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "PrefWindow.h" -#include "RefStorage.h" -#include "TypedRefFilter.h" - -#include - - -const BRect kDefaultFrame(100,100,500,400); - -enum -{ - M_SHOW_ADD_PANEL = 'shaw', - M_SHOW_EDIT_PANEL = 'shew', - M_REMOVE_FOLDER = 'rmfl', - M_FOLDER_SELECTED = 'flsl', - M_FOLDER_CHOSEN = 'flch' -}; - -PrefWindow::PrefWindow(void) - : BWindow(LoadFrame(),"AutoFiler Settings",B_TITLED_WINDOW, - B_ASYNCHRONOUS_CONTROLS) -{ - LoadFolders(); - - AddShortcut('a',B_COMMAND_KEY,new BMessage(M_SHOW_ADD_PANEL)); - AddShortcut('c',B_COMMAND_KEY,new BMessage(M_SHOW_EDIT_PANEL)); - - BView *top = new BView(Bounds(),"top",B_FOLLOW_ALL,B_WILL_DRAW); - top->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - AddChild(top); - - BStringView *folderLabel = new BStringView(BRect(10,5,11,6),"folderlabel", - "Automatically run Filer on the contents of these folders:"); - folderLabel->ResizeToPreferred(); - top->AddChild(folderLabel); - - BRect rect(Bounds().InsetByCopy(10,10)); - rect.top = folderLabel->Frame().bottom + 5; - rect.right -= B_V_SCROLL_BAR_WIDTH; - - fFolderList = new BListView(rect,"rulelist",B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL); - fScrollView = new BScrollView("listscroll",fFolderList, - B_FOLLOW_ALL,0,true,true); - fScrollView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - top->AddChild(fScrollView); - fFolderList->SetSelectionMessage(new BMessage(M_FOLDER_SELECTED)); - fFolderList->SetInvocationMessage(new BMessage(M_SHOW_EDIT_PANEL)); - fScrollView->ScrollBar(B_HORIZONTAL)->SetRange(0.0,0.0); - - fAutorunBox = new BCheckBox(BRect(0,0,1,1),"autorunbox","Run AutoFiler on system startup", - new BMessage, B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fAutorunBox->ResizeToPreferred(); - fAutorunBox->MoveTo((Bounds().Width() - fAutorunBox->Bounds().Width()) / 2.0, - Bounds().bottom - fAutorunBox->Bounds().Height() - 10.0); - // add as child later - - BPath path; - find_directory(B_USER_SETTINGS_DIRECTORY, &path); - path.Append(gPrefsPath); - - BNode node(path.Path()); - bool autorun = true; - if (node.InitCheck() == B_OK) - { - bool tmpbool; - if (node.ReadAttr("autorun",B_BOOL_TYPE,0,(void*)&tmpbool,sizeof(bool)) > 0) - autorun = tmpbool; - } - if (autorun) - fAutorunBox->SetValue(B_CONTROL_ON); - - fAddButton = new BButton(BRect(0,0,1,1),"addbutton","Add…", - new BMessage(M_SHOW_ADD_PANEL), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fAddButton->ResizeToPreferred(); - fAddButton->MoveTo(10,fAutorunBox->Frame().top - 5.0 - fAddButton->Bounds().IntegerHeight()); - top->AddChild(fAddButton); - - fChangeButton = new BButton(BRect(0,0,1,1),"editbutton","Edit…", - new BMessage(M_SHOW_EDIT_PANEL), - B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fChangeButton->ResizeToPreferred(); - fChangeButton->MoveTo((Bounds().Width() - fChangeButton->Bounds().Width()) / 2.0, - fAddButton->Frame().top); - top->AddChild(fChangeButton); - fChangeButton->SetEnabled(false); - - - fRemoveButton = new BButton(BRect(0,0,1,1),"removebutton","Remove", - new BMessage(M_REMOVE_FOLDER), - B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); - fRemoveButton->ResizeToPreferred(); - fRemoveButton->MoveTo(Bounds().Width() - fRemoveButton->Bounds().Width() - 10, - fAddButton->Frame().top); - top->AddChild(fRemoveButton); - fRemoveButton->SetEnabled(false); - - top->AddChild(fAutorunBox); - - fScrollView->ResizeTo(Bounds().Width() - 20.0, fAddButton->Frame().top - 10.0 - - fScrollView->Frame().top); - - float minwidth = (fRemoveButton->Bounds().Width() * 3.0) + 40; - SetSizeLimits(minwidth, 30000, 200, 30000); - -// fRefFilter = new TypedRefFilter("application/x-vnd.Be-directory",B_DIRECTORY_NODE); - fRefFilter = new TypedRefFilter("",B_DIRECTORY_NODE); - fFilePanel = new BFilePanel(B_OPEN_PANEL,new BMessenger(this), NULL,B_DIRECTORY_NODE,false, - NULL,fRefFilter); - - gRefLock.Lock(); - for (int32 i = 0; i < gRefStructList.CountItems(); i++) - { - RefStorage *refholder = (RefStorage*)gRefStructList.ItemAt(i); - fFolderList->AddItem(new BStringItem(BPath(&refholder->ref).Path())); - } - gRefLock.Unlock(); - - fFolderList->MakeFocus(); - if (fFolderList->CountItems() > 0) - fFolderList->Select(0L); -} - - -PrefWindow::~PrefWindow(void) -{ - delete fFilePanel; -} - - -bool -PrefWindow::QuitRequested(void) -{ - SaveFolders(); - SaveFrame(); - - // save autorun value - bool autorun = (fAutorunBox->Value() == B_CONTROL_ON); - - BPath path; - find_directory(B_USER_SETTINGS_DIRECTORY, &path); - path.Append(gPrefsPath); - - BNode node(path.Path()); - if (node.InitCheck() == B_OK) - node.WriteAttr("autorun",B_BOOL_TYPE,0,(void*)&autorun,sizeof(bool)); - - if (autorun) - EnableAutorun(); - else - DisableAutorun(); - - // if AutoFiler is running, tell it to refresh its folders - if (be_roster->IsRunning("application/x-vnd.dw-AutoFiler")) - { - BMessage msg(M_REFRESH_FOLDERS); - BMessenger msgr("application/x-vnd.dw-AutoFiler"); - msgr.SendMessage(&msg); - } - - - be_app->PostMessage(B_QUIT_REQUESTED); - return true; -} - - -void -PrefWindow::MessageReceived(BMessage *msg) -{ - switch (msg->what) - { - case M_SHOW_ADD_PANEL: - { - BMessage panelmsg(M_FOLDER_CHOSEN); - fFilePanel->SetMessage(&panelmsg); - fFilePanel->Show(); - break; - } - case M_SHOW_EDIT_PANEL: - { - int32 selection = fFolderList->CurrentSelection(); - if (selection < 0) - break; - - BStringItem *item = (BStringItem*)fFolderList->ItemAt(selection); - fFilePanel->SetPanelDirectory(item->Text()); - - BMessage panelmsg(M_FOLDER_CHOSEN); - panelmsg.AddInt32("index",selection); - fFilePanel->SetMessage(&panelmsg); - fFilePanel->Show(); - break; - } - case M_REMOVE_FOLDER: - { - int32 selection = fFolderList->CurrentSelection(); - if (selection < 0) - break; - - BStringItem *item = (BStringItem*)fFolderList->RemoveItem(selection); - delete item; - - gRefLock.Lock(); - RefStorage *refholder = (RefStorage*) gRefStructList.RemoveItem(selection); - delete refholder; - gRefLock.Unlock(); - - break; - } - case M_FOLDER_SELECTED: - { - int32 selection = fFolderList->CurrentSelection(); - - bool value = (selection >= 0); - - fChangeButton->SetEnabled(value); - fRemoveButton->SetEnabled(value); - - break; - } - case M_FOLDER_CHOSEN: - { - int32 index; - if (msg->FindInt32("index",&index) != B_OK) - index = -1; - - entry_ref ref; - if (msg->FindRef("refs",&ref) != B_OK) - break; - - BStringItem *item = (BStringItem*) fFolderList->ItemAt(index); - if (item) - { - gRefLock.Lock(); - RefStorage *refholder = (RefStorage*) gRefStructList.ItemAt(index); - refholder->SetData(ref); - gRefLock.Unlock(); - } - else - { - item = new BStringItem(""); - fFolderList->AddItem(item); - - gRefLock.Lock(); - gRefStructList.AddItem(new RefStorage(ref)); - gRefLock.Unlock(); - } - - item->SetText(BPath(&ref).Path()); - fFolderList->Invalidate(); - break; - } - default: - BWindow::MessageReceived(msg); - } -} - - -BRect -PrefWindow::LoadFrame(void) -{ - BRect frame(kDefaultFrame); - - BPath path; - find_directory(B_USER_SETTINGS_DIRECTORY, &path); - path.Append(gPrefsPath); - - BNode node(path.Path()); - if (node.InitCheck() == B_OK) - { - BRect r; - if (node.ReadAttr("windowframe",B_RECT_TYPE,0,(void*)&r,sizeof(BRect)) > 0) - frame = r; - } - - return frame; -} - - -void -PrefWindow::SaveFrame(void) -{ - BRect r(Frame()); - BPath path; - find_directory(B_USER_SETTINGS_DIRECTORY, &path); - path.Append(gPrefsPath); - - BNode node(path.Path()); - if (node.InitCheck() == B_OK) - node.WriteAttr("windowframe",B_RECT_TYPE,0,(void*)&r,sizeof(BRect)); -} - - -void -PrefWindow::FrameResized(float width, float height) -{ - float x = fAddButton->Frame().right + ((fRemoveButton->Frame().left - - fAddButton->Frame().right) / 2.0); - fChangeButton->MoveTo(x - (fChangeButton->Bounds().Width() / 2.0), - fAddButton->Frame().top); -} - - -void -PrefWindow::EnableAutorun(void) -{ - BDirectory destDir; - BPath destPath; - find_directory(B_USER_SETTINGS_DIRECTORY, &destPath); - - status_t ret = destPath.Append("boot"); - if (ret == B_OK) - ret = create_directory(destPath.Path(), 0777); - - ret = destPath.Append("launch"); - if (ret == B_OK) - ret = create_directory(destPath.Path(), 0777); - - if (ret == B_OK) { - destDir = BDirectory(destPath.Path()); - ret = destDir.InitCheck(); - } - - if (ret != B_OK) - return; - - destPath.Append("AutoFiler"); - - app_info info; - BPath linkPath; - be_roster->GetActiveAppInfo(&info); - BEntry entry(&info.ref); - - entry.GetPath(&linkPath); - linkPath.GetParent(&linkPath); - linkPath.Append("AutoFiler"); - destDir.CreateSymLink(destPath.Path(), linkPath.Path(), NULL); -} - - -void -PrefWindow::DisableAutorun(void) -{ - BPath path; - - if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) < B_OK) - return; - status_t ret = path.Append("boot/launch/AutoFiler"); - - if (ret == B_OK) { - BEntry entry(path.Path()); - entry.Remove(); - } -} - diff --git a/sources/AutoFiler/PrefWindow.h b/sources/AutoFiler/PrefWindow.h deleted file mode 100644 index 8466b63..0000000 --- a/sources/AutoFiler/PrefWindow.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef PREFWIN_H -#define PREFWIN_H - -#include -#include -#include -#include -#include -#include -#include - -class TypedRefFilter; - -class PrefWindow : public BWindow -{ -public: - PrefWindow(void); - ~PrefWindow(void); - bool QuitRequested(void); - void MessageReceived(BMessage *msg); - void FrameResized(float width, float height); - -private: - BRect LoadFrame(void); - void SaveFrame(void); - void EnableAutorun(void); - void DisableAutorun(void); - - BListView *fFolderList; - BScrollView *fScrollView; - - BButton *fAddButton, - *fChangeButton, - *fRemoveButton; - - BFilePanel *fFilePanel; - TypedRefFilter *fRefFilter; - - BCheckBox *fAutorunBox; -}; - -#endif diff --git a/sources/Filer/AutoFilerTab.cpp b/sources/AutoFilerTab.cpp similarity index 100% rename from sources/Filer/AutoFilerTab.cpp rename to sources/AutoFilerTab.cpp diff --git a/sources/Filer/AutoFilerTab.h b/sources/AutoFilerTab.h similarity index 100% rename from sources/Filer/AutoFilerTab.h rename to sources/AutoFilerTab.h diff --git a/sources/Filer/AutoTextControl.cpp b/sources/AutoTextControl.cpp similarity index 100% rename from sources/Filer/AutoTextControl.cpp rename to sources/AutoTextControl.cpp diff --git a/sources/Filer/AutoTextControl.h b/sources/AutoTextControl.h similarity index 100% rename from sources/Filer/AutoTextControl.h rename to sources/AutoTextControl.h diff --git a/sources/Filer/CppSQLite3.cpp b/sources/CppSQLite3.cpp similarity index 100% rename from sources/Filer/CppSQLite3.cpp rename to sources/CppSQLite3.cpp diff --git a/sources/Filer/CppSQLite3.h b/sources/CppSQLite3.h similarity index 100% rename from sources/Filer/CppSQLite3.h rename to sources/CppSQLite3.h diff --git a/sources/Filer/Database.cpp b/sources/Database.cpp similarity index 100% rename from sources/Filer/Database.cpp rename to sources/Database.cpp diff --git a/sources/Filer/Database.h b/sources/Database.h similarity index 100% rename from sources/Filer/Database.h rename to sources/Database.h diff --git a/sources/Filer/DropZoneTab.cpp b/sources/DropZoneTab.cpp similarity index 99% rename from sources/Filer/DropZoneTab.cpp rename to sources/DropZoneTab.cpp index 17fa03e..558ed52 100644 --- a/sources/Filer/DropZoneTab.cpp +++ b/sources/DropZoneTab.cpp @@ -152,7 +152,6 @@ void DropZone::MessageReceived(BMessage* msg) { if (msg->WasDropped()) { - BMessenger messenger(be_app); msg->what = B_REFS_RECEIVED; be_roster->Launch(kFilerSignature, msg); } diff --git a/sources/Filer/DropZoneTab.h b/sources/DropZoneTab.h similarity index 97% rename from sources/Filer/DropZoneTab.h rename to sources/DropZoneTab.h index 3b15c34..8cadcb1 100644 --- a/sources/Filer/DropZoneTab.h +++ b/sources/DropZoneTab.h @@ -15,8 +15,6 @@ const pattern stripePattern = {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}; -class _EXPORT DropZone; - class DropZone : public BView { public: diff --git a/sources/Filer/FSUtils.cpp b/sources/FSUtils.cpp similarity index 100% rename from sources/Filer/FSUtils.cpp rename to sources/FSUtils.cpp diff --git a/sources/Filer/FSUtils.h b/sources/FSUtils.h similarity index 100% rename from sources/Filer/FSUtils.h rename to sources/FSUtils.h diff --git a/sources/Filer/Filer.iom b/sources/Filer.iom similarity index 100% rename from sources/Filer/Filer.iom rename to sources/Filer.iom diff --git a/sources/Filer/Filer.rdef b/sources/Filer.rdef similarity index 94% rename from sources/Filer/Filer.rdef rename to sources/Filer.rdef index 7dfc664..832f079 100644 --- a/sources/Filer/Filer.rdef +++ b/sources/Filer.rdef @@ -15,7 +15,7 @@ resource app_version { internal = 0, short_info = "Automatic file organizer", - long_info = "A tool to rename/copy/move and otherise process files" + long_info = "A tool to rename/copy/move and otherwise process files" }; resource vector_icon { diff --git a/sources/Filer/ObjectList.h b/sources/Filer/ObjectList.h deleted file mode 100644 index f2556ad..0000000 --- a/sources/Filer/ObjectList.h +++ /dev/null @@ -1,810 +0,0 @@ -/* -Open Tracker License - -Terms and Conditions - -Copyright (c) 1991-2000, Be Incorporated. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice applies to all licensees -and shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Be Incorporated shall not be -used in advertising or otherwise to promote the sale, use or other dealings in -this Software without prior written authorization from Be Incorporated. - -Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks -of Be Incorporated in the United States and other countries. Other brand product -names are registered trademarks or trademarks of their respective holders. -All rights reserved. -*/ - -/**************************************************************************** -** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ** -** ** -** DANGER, WILL ROBINSON! ** -** ** -** The interfaces contained here are part of BeOS's ** -** ** -** >> PRIVATE NOT FOR PUBLIC USE << ** -** ** -** implementation. ** -** ** -** These interfaces WILL CHANGE in future releases. ** -** If you use them, your app WILL BREAK at some future time. ** -** ** -** (And yes, this does mean that binaries built from OpenTracker will not ** -** be compatible with some future releases of the OS. When that happens, ** -** we will provide an updated version of this file to keep compatibility.) ** -** ** -** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ** -****************************************************************************/ - -// -// ObjectList is a wrapper around BList that adds type safety, -// optional object ownership, search, insert operations, etc. -// - -#ifndef __OBJECT_LIST__ -#define __OBJECT_LIST__ - -#ifndef _BE_H -#include -#endif - -#include - -template class BObjectList; - -template -struct UnaryPredicate { - - virtual int operator()(const T *) const - // virtual could be avoided here if FindBinaryInsertionIndex, - // etc. were member template functions - { return 0; } - -private: - static int _unary_predicate_glue(const void *item, void *context); - -friend class BObjectList; -}; - -template -int -UnaryPredicate::_unary_predicate_glue(const void *item, void *context) -{ - return ((UnaryPredicate *)context)->operator()((const T *)item); -} - - -class _PointerList_ : public BList { -public: - _PointerList_(const _PointerList_ &list); - _PointerList_(int32 itemsPerBlock = 20, bool owning = false); - ~_PointerList_(); - - typedef void *(* GenericEachFunction)(void *, void *); - typedef int (* GenericCompareFunction)(const void *, const void *); - typedef int (* GenericCompareFunctionWithState)(const void *, const void *, - void *); - typedef int (* UnaryPredicateGlue)(const void *, void *); - - void *EachElement(GenericEachFunction, void *); - void SortItems(GenericCompareFunction); - void SortItems(GenericCompareFunctionWithState, void *state); - void HSortItems(GenericCompareFunction); - void HSortItems(GenericCompareFunctionWithState, void *state); - - void *BinarySearch(const void *, GenericCompareFunction) const; - void *BinarySearch(const void *, GenericCompareFunctionWithState, void *state) const; - - int32 BinarySearchIndex(const void *, GenericCompareFunction) const; - int32 BinarySearchIndex(const void *, GenericCompareFunctionWithState, void *state) const; - int32 BinarySearchIndexByPredicate(const void *, UnaryPredicateGlue) const; - - bool Owning() const; - bool ReplaceItem(int32, void *); - -protected: - bool owning; - -}; - -template -class BObjectList : private _PointerList_ { -public: - - // iteration and sorting - typedef T *(* EachFunction)(T *, void *); - typedef const T *(* ConstEachFunction)(const T *, void *); - typedef int (* CompareFunction)(const T *, const T *); - typedef int (* CompareFunctionWithState)(const T *, const T *, void *state); - - BObjectList(int32 itemsPerBlock = 20, bool owning = false); - BObjectList(const BObjectList &list); - // clones list; if list is owning, makes copies of all - // the items - - virtual ~BObjectList(); - - BObjectList &operator=(const BObjectList &list); - // clones list; if list is owning, makes copies of all - // the items - - // adding and removing - // ToDo: - // change Add calls to return const item - bool AddItem(T *); - bool AddItem(T *, int32); - bool AddList(BObjectList *); - bool AddList(BObjectList *, int32); - - bool RemoveItem(T *, bool deleteIfOwning = true); - // if owning, deletes the removed item - T *RemoveItemAt(int32); - // returns the removed item - - void MakeEmpty(); - - // item access - T *ItemAt(int32) const; - - bool ReplaceItem(int32 index, T *); - // if list is owning, deletes the item at first - T *SwapWithItem(int32 index, T *newItem); - // same as ReplaceItem, except does not delete old item at , - // returns it instead - - T *FirstItem() const; - T *LastItem() const; - - // misc. getters - int32 IndexOf(const T *) const; - bool HasItem(const T *) const; - bool IsEmpty() const; - int32 CountItems() const; - - T *EachElement(EachFunction, void *); - const T *EachElement(ConstEachFunction, void *) const; - - void SwapItems(int32, int32); - - void SortItems(CompareFunction); - void SortItems(CompareFunctionWithState, void *state); - void HSortItems(CompareFunction); - void HSortItems(CompareFunctionWithState, void *state); - - // linear search, returns first item that matches predicate - const T *FindIf(const UnaryPredicate &) const; - T *FindIf(const UnaryPredicate &); - - // list must be sorted with CompareFunction for these to work - const T *BinarySearch(const T &, CompareFunction) const; - const T *BinarySearch(const T &, CompareFunctionWithState, void *state) const; - - // Binary insertion - list must be sorted with CompareFunction for - // these to work - - // simple insert - void BinaryInsert(T *, CompareFunction); - void BinaryInsert(T *, CompareFunctionWithState, void *state); - void BinaryInsert(T *, const UnaryPredicate &); - - // unique insert, returns false if item already in list - bool BinaryInsertUnique(T *, CompareFunction); - bool BinaryInsertUnique(T *, CompareFunctionWithState, void *state); - bool BinaryInsertUnique(T *, const UnaryPredicate &); - - // insert a copy of the item, returns new inserted item - T *BinaryInsertCopy(const T ©This, CompareFunction); - T *BinaryInsertCopy(const T ©This, CompareFunctionWithState, void *state); - - // insert a copy of the item if not in list already - // returns new inserted item or existing item in case of a conflict - T *BinaryInsertCopyUnique(const T ©This, CompareFunction); - T *BinaryInsertCopyUnique(const T ©This, CompareFunctionWithState, void *state); - - - int32 FindBinaryInsertionIndex(const UnaryPredicate &, bool *alreadyInList = 0) const; - // returns either the index into which a new item should be inserted - // or index of an existing item that matches the predicate - - // deprecated API, will go away - BList *AsBList() - { return this; } - const BList *AsBList() const - { return this; } -private: - void SetItem(int32, T *); -}; - -template -Result -WhileEachListItem(BObjectList *list, Result (Item::*func)(Param1), Param1 p1) -{ - Result result = 0; - int32 count = list->CountItems(); - - for (int32 index = 0; index < count; index++) - if ((result = (list->ItemAt(index)->*func)(p1)) != 0) - break; - - return result; -} - -template -Result -WhileEachListItem(BObjectList *list, Result (*func)(Item *, Param1), Param1 p1) -{ - Result result = 0; - int32 count = list->CountItems(); - - for (int32 index = 0; index < count; index++) - if ((result = (*func)(list->ItemAt(index), p1)) != 0) - break; - - return result; -} - -template -Result -WhileEachListItem(BObjectList *list, Result (Item::*func)(Param1, Param2), - Param1 p1, Param2 p2) -{ - Result result = 0; - int32 count = list->CountItems(); - - for (int32 index = 0; index < count; index++) - if ((result = (list->ItemAt(index)->*func)(p1, p2)) != 0) - break; - - return result; -} - -template -Result -WhileEachListItem(BObjectList *list, Result (*func)(Item *, Param1, Param2), - Param1 p1, Param2 p2) -{ - Result result = 0; - int32 count = list->CountItems(); - - for (int32 index = 0; index < count; index++) - if ((result = (*func)(list->ItemAt(index), p1, p2)) != 0) - break; - - return result; -} - -template -Result -WhileEachListItem(BObjectList *list, Result (*func)(Item *, Param1, Param2, - Param3, Param4), Param1 p1, Param2 p2, Param3 p3, Param4 p4) -{ - Result result = 0; - int32 count = list->CountItems(); - - for (int32 index = 0; index < count; index++) - if ((result = (*func)(list->ItemAt(index), p1, p2, p3, p4)) != 0) - break; - - return result; -} - -template -void -EachListItemIgnoreResult(BObjectList *list, Result (Item::*func)()) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (list->ItemAt(index)->*func)(); -} - -template -void -EachListItem(BObjectList *list, void (*func)(Item *, Param1), Param1 p1) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (func)(list->ItemAt(index), p1); -} - -template -void -EachListItem(BObjectList *list, void (Item::*func)(Param1, Param2), - Param1 p1, Param2 p2) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (list->ItemAt(index)->*func)(p1, p2); -} - -template -void -EachListItem(BObjectList *list, void (*func)(Item *,Param1, Param2), - Param1 p1, Param2 p2) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (func)(list->ItemAt(index), p1, p2); -} - -template -void -EachListItem(BObjectList *list, void (*func)(Item *,Param1, Param2, - Param3), Param1 p1, Param2 p2, Param3 p3) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (func)(list->ItemAt(index), p1, p2, p3); -} - - -template -void -EachListItem(BObjectList *list, void (*func)(Item *,Param1, Param2, - Param3, Param4), Param1 p1, Param2 p2, Param3 p3, Param4 p4) -{ - int32 count = list->CountItems(); - for (int32 index = 0; index < count; index++) - (func)(list->ItemAt(index), p1, p2, p3, p4); -} - -// inline code - -inline bool -_PointerList_::Owning() const -{ - return owning; -} - -template -BObjectList::BObjectList(int32 itemsPerBlock, bool owning) - : _PointerList_(itemsPerBlock, owning) -{ -} - -template -BObjectList::BObjectList(const BObjectList &list) - : _PointerList_(list) -{ - owning = list.owning; - if (owning) { - // make our own copies in an owning list - int32 count = list.CountItems(); - for (int32 index = 0; index < count; index++) { - T *item = list.ItemAt(index); - if (item) - item = new T(*item); - SetItem(index, item); - } - } -} - -template -BObjectList::~BObjectList() -{ - if (Owning()) - // have to nuke elements first - MakeEmpty(); - -} - -template -BObjectList & -BObjectList::operator=(const BObjectList &list) -{ - owning = list.owning; - BObjectList &result = (BObjectList &)_PointerList_::operator=(list); - if (owning) { - // make our own copies in an owning list - int32 count = list.CountItems(); - for (int32 index = 0; index < count; index++) { - T *item = list.ItemAt(index); - if (item) - item = new T(*item); - SetItem(index, item); - } - } - return result; -} - -template -bool -BObjectList::AddItem(T *item) -{ - // need to cast to void * to make T work for const pointers - return _PointerList_::AddItem((void *)item); -} - -template -bool -BObjectList::AddItem(T *item, int32 atIndex) -{ - return _PointerList_::AddItem((void *)item, atIndex); -} - -template -bool -BObjectList::AddList(BObjectList *newItems) -{ - return _PointerList_::AddList(newItems); -} - -template -bool -BObjectList::AddList(BObjectList *newItems, int32 atIndex) -{ - return _PointerList_::AddList(newItems, atIndex); -} - - -template -bool -BObjectList::RemoveItem(T *item, bool deleteIfOwning) -{ - bool result = _PointerList_::RemoveItem((void *)item); - - if (result && Owning() && deleteIfOwning) - delete item; - - return result; -} - -template -T * -BObjectList::RemoveItemAt(int32 index) -{ - return (T *)_PointerList_::RemoveItem(index); -} - -template -inline T * -BObjectList::ItemAt(int32 index) const -{ - return (T *)_PointerList_::ItemAt(index); -} - -template -bool -BObjectList::ReplaceItem(int32 index, T *item) -{ - if (owning) - delete ItemAt(index); - return _PointerList_::ReplaceItem(index, (void *)item); -} - -template -T * -BObjectList::SwapWithItem(int32 index, T *newItem) -{ - T *result = ItemAt(index); - _PointerList_::ReplaceItem(index, (void *)newItem); - return result; -} - -template -void -BObjectList::SetItem(int32 index, T *newItem) -{ - _PointerList_::ReplaceItem(index, (void *)newItem); -} - -template -int32 -BObjectList::IndexOf(const T *item) const -{ - return _PointerList_::IndexOf((void *)item); -} - -template -T * -BObjectList::FirstItem() const -{ - return (T *)_PointerList_::FirstItem(); -} - -template -T * -BObjectList::LastItem() const -{ - return (T *)_PointerList_::LastItem(); -} - -template -bool -BObjectList::HasItem(const T *item) const -{ - return _PointerList_::HasItem((void *)item); -} - -template -bool -BObjectList::IsEmpty() const -{ - return _PointerList_::IsEmpty(); -} - -template -int32 -BObjectList::CountItems() const -{ - return _PointerList_::CountItems(); -} - -template -void -BObjectList::MakeEmpty() -{ - if (owning) { - int32 count = CountItems(); - for (int32 index = 0; index < count; index++) - delete ItemAt(index); - } - _PointerList_::MakeEmpty(); -} - -template -T * -BObjectList::EachElement(EachFunction func, void *params) -{ - return (T *)_PointerList_::EachElement((GenericEachFunction)func, params); -} - - -template -const T * -BObjectList::EachElement(ConstEachFunction func, void *params) const -{ - return (const T *) - const_cast *>(this)->_PointerList_::EachElement( - (GenericEachFunction)func, params); -} - -template -const T * -BObjectList::FindIf(const UnaryPredicate &predicate) const -{ - int32 count = CountItems(); - for (int32 index = 0; index < count; index++) - if (predicate.operator()(ItemAt(index)) == 0) - return ItemAt(index); - return 0; -} - -template -T * -BObjectList::FindIf(const UnaryPredicate &predicate) -{ - int32 count = CountItems(); - for (int32 index = 0; index < count; index++) - if (predicate.operator()(ItemAt(index)) == 0) - return ItemAt(index); - return 0; -} - - -template -void -BObjectList::SwapItems(int32 one, int32 two) -{ - _PointerList_::SwapItems(one, two); -} - - -template -void -BObjectList::SortItems(CompareFunction function) -{ - _PointerList_::SortItems((GenericCompareFunction)function); -} - -template -void -BObjectList::SortItems(CompareFunctionWithState function, void *state) -{ - _PointerList_::SortItems((GenericCompareFunctionWithState)function, state); -} - -template -void -BObjectList::HSortItems(CompareFunction function) -{ - _PointerList_::HSortItems((GenericCompareFunction)function); -} - -template -void -BObjectList::HSortItems(CompareFunctionWithState function, void *state) -{ - _PointerList_::HSortItems((GenericCompareFunctionWithState)function, state); -} - -template -const T * -BObjectList::BinarySearch(const T &key, CompareFunction func) const -{ - return (const T *)_PointerList_::BinarySearch(&key, - (GenericCompareFunction)func); -} - -template -const T * -BObjectList::BinarySearch(const T &key, CompareFunctionWithState func, void *state) const -{ - return (const T *)_PointerList_::BinarySearch(&key, - (GenericCompareFunctionWithState)func, state); -} - -template -void -BObjectList::BinaryInsert(T *item, CompareFunction func) -{ - int32 index = _PointerList_::BinarySearchIndex(item, - (GenericCompareFunction)func); - if (index >= 0) - // already in list, add after existing - AddItem(item, index + 1); - else - AddItem(item, -index - 1); -} - -template -void -BObjectList::BinaryInsert(T *item, CompareFunctionWithState func, void *state) -{ - int32 index = _PointerList_::BinarySearchIndex(item, - (GenericCompareFunctionWithState)func, state); - if (index >= 0) - // already in list, add after existing - AddItem(item, index + 1); - else - AddItem(item, -index - 1); -} - -template -bool -BObjectList::BinaryInsertUnique(T *, CompareFunction func) -{ - int32 index = _PointerList_::BinarySearchIndex(item, - (GenericCompareFunction)func); - if (index >= 0) - return false; - - AddItem(item, -index - 1); - return true; -} - -template -bool -BObjectList::BinaryInsertUnique(T *, CompareFunctionWithState func, void *state) -{ - int32 index = _PointerList_::BinarySearchIndex(item, - (GenericCompareFunctionWithState)func, state); - if (index >= 0) - return false; - - AddItem(item, -index - 1); - return true; -} - - -template -T * -BObjectList::BinaryInsertCopy(const T ©This, CompareFunction func) -{ - int32 index = _PointerList_::BinarySearchIndex(©This, - (GenericCompareFunction)func); - - if (index >= 0) - index++; - else - index = -index - 1; - - T *newItem = new T(copyThis); - AddItem(newItem, index); - return newItem; -} - -template -T * -BObjectList::BinaryInsertCopy(const T ©This, CompareFunctionWithState func, void *state) -{ - int32 index = _PointerList_::BinarySearchIndex(©This, - (GenericCompareFunctionWithState)func, state); - - if (index >= 0) - index++; - else - index = -index - 1; - - T *newItem = new T(copyThis); - AddItem(newItem, index); - return newItem; -} - -template -T * -BObjectList::BinaryInsertCopyUnique(const T ©This, CompareFunction func) -{ - int32 index = _PointerList_::BinarySearchIndex(©This, - (GenericCompareFunction)func); - if (index >= 0) - return ItemAt(index); - - index = -index - 1; - T *newItem = new T(copyThis); - AddItem(newItem, index); - return newItem; -} - -template -T * -BObjectList::BinaryInsertCopyUnique(const T ©This, CompareFunctionWithState func, - void *state) -{ - int32 index = _PointerList_::BinarySearchIndex(©This, - (GenericCompareFunctionWithState)func, state); - if (index >= 0) - return ItemAt(index); - - index = -index - 1; - T *newItem = new T(copyThis); - AddItem(newItem, index); - return newItem; -} - -template -int32 -BObjectList::FindBinaryInsertionIndex(const UnaryPredicate &pred, bool *alreadyInList) - const -{ - int32 index = _PointerList_::BinarySearchIndexByPredicate(&pred, - (UnaryPredicateGlue)&UnaryPredicate::_unary_predicate_glue); - - if (alreadyInList) - *alreadyInList = index >= 0; - - if (index < 0) - index = -index - 1; - - return index; -} - -template -void -BObjectList::BinaryInsert(T *item, const UnaryPredicate &pred) -{ - int32 index = FindBinaryInsertionIndex(pred); - AddItem(item, index); -} - -template -bool -BObjectList::BinaryInsertUnique(T *item, const UnaryPredicate &pred) -{ - bool alreadyInList; - int32 index = FindBinaryInsertionIndex(pred, &alreadyInList); - if (alreadyInList) - return false; - - AddItem(item, index); - return true; -} - - -#endif diff --git a/sources/Filer/FilerDefs.h b/sources/FilerDefs.h similarity index 100% rename from sources/Filer/FilerDefs.h rename to sources/FilerDefs.h diff --git a/sources/Filer/FilerRule.cpp b/sources/FilerRule.cpp similarity index 100% rename from sources/Filer/FilerRule.cpp rename to sources/FilerRule.cpp diff --git a/sources/Filer/FilerRule.h b/sources/FilerRule.h similarity index 100% rename from sources/Filer/FilerRule.h rename to sources/FilerRule.h diff --git a/sources/Filer/FilerTypes.h b/sources/FilerTypes.h similarity index 100% rename from sources/Filer/FilerTypes.h rename to sources/FilerTypes.h diff --git a/sources/Filer/HelpTab.cpp b/sources/HelpTab.cpp similarity index 100% rename from sources/Filer/HelpTab.cpp rename to sources/HelpTab.cpp diff --git a/sources/Filer/HelpTab.h b/sources/HelpTab.h similarity index 100% rename from sources/Filer/HelpTab.h rename to sources/HelpTab.h diff --git a/sources/Filer/MainWindow.cpp b/sources/MainWindow.cpp similarity index 100% rename from sources/Filer/MainWindow.cpp rename to sources/MainWindow.cpp diff --git a/sources/Filer/MainWindow.h b/sources/MainWindow.h similarity index 100% rename from sources/Filer/MainWindow.h rename to sources/MainWindow.h diff --git a/sources/Filer/Makefile b/sources/Makefile similarity index 99% rename from sources/Filer/Makefile rename to sources/Makefile index 75eb40e..250f0ae 100644 --- a/sources/Filer/Makefile +++ b/sources/Makefile @@ -104,7 +104,7 @@ SYMBOLS := # Includes debug information, which allows the binary to be debugged easily. # If set to "TRUE", debug info will be created. -DEBUGGER := TRUE +DEBUGGER := # Specify any additional compiler flags to be used. COMPILER_FLAGS = -Woverloaded-virtual -funsigned-bitfields -Wwrite-strings diff --git a/sources/AutoFiler/Makefile b/sources/Makefile_AutoFiler similarity index 100% rename from sources/AutoFiler/Makefile rename to sources/Makefile_AutoFiler diff --git a/sources/AutoFiler/ObjectList.h b/sources/ObjectList.h similarity index 100% rename from sources/AutoFiler/ObjectList.h rename to sources/ObjectList.h diff --git a/sources/Filer/PatternProcessor.cpp b/sources/PatternProcessor.cpp similarity index 100% rename from sources/Filer/PatternProcessor.cpp rename to sources/PatternProcessor.cpp diff --git a/sources/Filer/PatternProcessor.h b/sources/PatternProcessor.h similarity index 100% rename from sources/Filer/PatternProcessor.h rename to sources/PatternProcessor.h diff --git a/sources/Filer/RefStorage.cpp b/sources/RefStorage.cpp similarity index 100% rename from sources/Filer/RefStorage.cpp rename to sources/RefStorage.cpp diff --git a/sources/Filer/RefStorage.h b/sources/RefStorage.h similarity index 100% rename from sources/Filer/RefStorage.h rename to sources/RefStorage.h diff --git a/sources/Filer/ReplicantWindow.cpp b/sources/ReplicantWindow.cpp similarity index 100% rename from sources/Filer/ReplicantWindow.cpp rename to sources/ReplicantWindow.cpp diff --git a/sources/Filer/ReplicantWindow.h b/sources/ReplicantWindow.h similarity index 100% rename from sources/Filer/ReplicantWindow.h rename to sources/ReplicantWindow.h diff --git a/sources/Filer/RuleEditWindow.cpp b/sources/RuleEditWindow.cpp similarity index 100% rename from sources/Filer/RuleEditWindow.cpp rename to sources/RuleEditWindow.cpp diff --git a/sources/Filer/RuleEditWindow.h b/sources/RuleEditWindow.h similarity index 100% rename from sources/Filer/RuleEditWindow.h rename to sources/RuleEditWindow.h diff --git a/sources/Filer/RuleItem.cpp b/sources/RuleItem.cpp similarity index 100% rename from sources/Filer/RuleItem.cpp rename to sources/RuleItem.cpp diff --git a/sources/Filer/RuleItem.h b/sources/RuleItem.h similarity index 100% rename from sources/Filer/RuleItem.h rename to sources/RuleItem.h diff --git a/sources/Filer/RuleRunner.cpp b/sources/RuleRunner.cpp similarity index 100% rename from sources/Filer/RuleRunner.cpp rename to sources/RuleRunner.cpp diff --git a/sources/Filer/RuleRunner.h b/sources/RuleRunner.h similarity index 100% rename from sources/Filer/RuleRunner.h rename to sources/RuleRunner.h diff --git a/sources/Filer/RuleTab.cpp b/sources/RuleTab.cpp similarity index 100% rename from sources/Filer/RuleTab.cpp rename to sources/RuleTab.cpp diff --git a/sources/Filer/RuleTab.h b/sources/RuleTab.h similarity index 100% rename from sources/Filer/RuleTab.h rename to sources/RuleTab.h diff --git a/sources/Filer/TestView.cpp b/sources/TestView.cpp similarity index 100% rename from sources/Filer/TestView.cpp rename to sources/TestView.cpp diff --git a/sources/Filer/TestView.h b/sources/TestView.h similarity index 100% rename from sources/Filer/TestView.h rename to sources/TestView.h diff --git a/sources/Filer/TypedRefFilter.cpp b/sources/TypedRefFilter.cpp similarity index 100% rename from sources/Filer/TypedRefFilter.cpp rename to sources/TypedRefFilter.cpp diff --git a/sources/Filer/TypedRefFilter.h b/sources/TypedRefFilter.h similarity index 100% rename from sources/Filer/TypedRefFilter.h rename to sources/TypedRefFilter.h diff --git a/sources/Filer/main.cpp b/sources/main.cpp similarity index 98% rename from sources/Filer/main.cpp rename to sources/main.cpp index 5fadb3f..51d72a2 100644 --- a/sources/Filer/main.cpp +++ b/sources/main.cpp @@ -77,7 +77,6 @@ App::RefsReceived(BMessage* msg) int32 i = 0; while (msg->FindRef("refs",i, &tempRef) == B_OK) { - printf ("File dropped: %s\n", tempRef.name); BEntry entry(&tempRef); if (entry.Exists()) { diff --git a/sources/Filer/main.h b/sources/main.h similarity index 100% rename from sources/Filer/main.h rename to sources/main.h diff --git a/sources/Filer/sqlite3.h b/sources/sqlite3.h similarity index 100% rename from sources/Filer/sqlite3.h rename to sources/sqlite3.h