X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=ede;a=blobdiff_plain;f=explorer%2Fsrc%2FExplorerWindow.ec;h=eb690c357346f4d565071809d44ed97c94a6e34e;hp=bdfe37323f59ec8dfd33c9f3a680ba0f8d0dbece;hb=HEAD;hpb=36c3b8012682a36987d0cbeb2399fe003cf7622f diff --git a/explorer/src/ExplorerWindow.ec b/explorer/src/ExplorerWindow.ec index bdfe373..eb690c3 100644 --- a/explorer/src/ExplorerWindow.ec +++ b/explorer/src/ExplorerWindow.ec @@ -1,32 +1,150 @@ import "Explorer" -import "IconBag" -import "ToolBar" +//import "IconBag" +//import "ToolBar" +import "SearchBox" + +#ifdef _DEBUG + define title = "Ecere Explorer (Debug)"; +#else + define title = "Ecere Explorer"; +#endif + +/* +define backgroundColor = Color { 30, 40, 50 }; //Color { 20, 20, 60 }; +define foregroundColor = lightGray; //white; +define selectionColor = lightYellow; +define selectionText = Color { 20, 30, 40 }; +define toolBarBackgroundColor = backgroundColor;//white; //Color { 240, 240, 250 }; +define toolBarForegroundColor = foregroundColor;//white; //Color { 240, 240, 250 }; +*/ +define backgroundColor = Color { 155, 170, 160 }; +//define backgroundColor = Color { 250, 250, 255 }; +//define backgroundColor = beige;//white; //Color { 128, 145, 175 }; //200, 224, 224 }; //lightGray; +define foregroundColor = Color { 45, 45, 45 };//black; +define selectionColor = Color { 80, 140, 110 };//app.currentSkin.selectionColor; +define selectionText = black;//app.currentSkin.selectionText; +define toolBarBackgroundColor = Color { 170, 187, 176 }; //backgroundColor;//white; //Color { 240, 240, 250 }; +define toolBarForegroundColor = foregroundColor;//white; //Color { 240, 240, 250 }; enum ExplorerToolId { none, newWindow, goBack, goForward, goUp, goHome, + newFile, newFolder, + browse, + panelTree, panelSearch, + addressBar, + refresh, + viewList, viewDetails, viewIcons, viewCards, viewShowcase, viewTree, viewCustom, + previewPictures, + + searchInFileName, + inFileNameMatchCase, + inFileNameMatchWord, + searchInFileContent, + inFileContentMatchCase, + inFileContentMatchWord, + searchInSubDirs, + searchStart, + searchStop, + + hasHeader +}; + +enum Icon +{ + missing, + newWindow, goBack, goForward, goUp, goHome, newFile, newFolder, browse, panelTree, panelSearch, addressBar, refresh, - viewList, viewDetails, viewIcons, viewCards, viewShowcase, viewCustom, - previewPictures + viewList, viewDetails, viewIcons, viewCards, viewShowcase, viewTree, viewCustom, + previewPictures, + searchInFileName, inFileNameMatchCase, inFileNameMatchWord, + searchInFileContent, inFileContentMatchCase, inFileContentMatchWord, + searchInSubDirs, searchStart, searchStop, + hasHeader }; +static const char * iconNames[Icon::enumSize] = +{ + "<:ecere>emblems/unreadable.png", /* missing */ + + "<:ecere>actions/windowNew.png", /* newWindow */ + "<:ecere>actions/goPrevious.png", /* goBack */ + "<:ecere>actions/goNext.png", /* goForward */ + "<:ecere>actions/goUp.png", /* goUp */ + "<:ecere>actions/goHome.png", /* goHome */ + "<:ecere>mimeTypes/file.png", /* newFile */ + "<:ecere>actions/folderNew.png", /* newFolder */ + + ":browse.png", /* browse */ + + ":panel-tree.png", /* panelTree */ + "<:ecere>actions/editFind.png", /* panelSearch */ + + "", /* addressBar */ + + "<:ecere>actions/viewRefresh.png", /* refresh */ + + ":view-list.png", /* viewList */ + ":view-details.png", /* viewDetails */ + ":view-icons.png", /* viewIcons */ + ":view-cards.png", /* viewCards */ + ":view-showcase-right.png", /* viewShowcase */ + ":panel-tree.png", /* viewTree */ + ":view-custom.png", /* viewCustom */ + + "<:ecere>mimeTypes/image.png", /* previewPictures */ + + "", /* searchInFileName */ + "<:ecere>emblems/unreadable.png", /* inFileNameMatchCase */ + "<:ecere>emblems/unreadable.png", /* inFileNameMatchWord */ + "", /* searchInFileContent */ + "<:ecere>emblems/unreadable.png", /* inFileContentMatchCase */ + "<:ecere>emblems/unreadable.png", /* inFileContentMatchWord */ + ":browse.png", /* searchInSubDirs */ + "<:ecere>actions/editFind.png", /* searchStart */ + "<:ecere>emblems/unreadable.png", /* searchStop */ + "<:ecere>emblems/unreadable.png" /* hasHeader */ +}; + +class IconToolButton : ToolButton +{ + //inactive = true; + //bitmapAlignment = left; + + property Icon icon + { + set + { + bitmap = BitmapResource { fileName = iconNames[value], alphaBlend = true }; + //id = value; + } + } +} + +class ToggleIconToolButton : IconToolButton +{ + toggle = true; +} + class ExplorerWindow : Window { - text = "Ecere Explorer"; - background = activeBorder; + text = title; + background = backgroundColor; borderStyle = sizable; hasMaximize = true; hasMinimize = true; hasClose = true; - //hasMenuBar = true; + hasMenuBar = true; //tabCycle = true; size = { 840, 480 }; minClientSize = { 600, 300 }; nativeDecorations = true; + tabCycle = true; + icon = { ":explorerIcon.png" }; /* bool userMode; @@ -34,25 +152,33 @@ class ExplorerWindow : Window int treeSplit; int searchSplit; - + ExplorerToolId lastViewId; +*/ + + bool treeInitialized; + int historyIndex; + Array history { }; + menu = Menu { }; - + Menu fileMenu { menu, "File", f }; Menu windowMenu { menu, "Window", w }; - MenuItem newWindow - { - windowMenu, "New Window", n; - - bool NotifySelect(MenuItem selection, Modifiers mods) - { - ExplorerWindow { }.Create(); - return true; - } - }; -*/ + MenuItem itemNewWindow { windowMenu, "New Window", n, NotifySelect = NewWindow_NotifySelect }; + + bool NewWindow_NotifySelect(MenuItem selection, Modifiers mods) + { + //ExplorerWindow { }.Create(); + ExplorerWindow w { };//.Create(); + w.location = location; + w.view.autoLoad = true; + w.Create(); + w.Activate(); // tocheck: not working? + return true; + } +#if 0 IconBag iconBag { //window = guiApp.desktop; @@ -60,42 +186,22 @@ class ExplorerWindow : Window alphaBlend = true; iconNames = [ - "<:ecere>emblems/unreadable.png", /* none */ - - "<:ecere>actions/windowNew.png", /* newWindow */ - "<:ecere>actions/goPrevious.png", /* goBack */ - "<:ecere>actions/goNext.png", /* goForward */ - "<:ecere>actions/goUp.png", /* goUp */ - "<:ecere>actions/goHome.png", /* goHome */ - - ":browse.png", /* browse */ - - ":panel-tree.png", /* panelTree */ - "<:ecere>actions/editFind.png", /* panelSearch */ - - "<:ecere>emblems/unreadable.png", /* addressBar */ - - "<:ecere>actions/viewRefresh.png", /* refresh */ - - ":view-list.png", /* viewList */ - ":view-details.png", /* viewDetails */ - ":view-icons.png", /* viewIcons */ - ":view-cards.png", /* viewCards */ - ":view-showcase-right.png", /* viewShowcase */ - ":view-custom.png", /* viewCustom */ - - "<:ecere>mimeTypes/image.png" /* previewPictures */ ]; }; +#endif Stacker stack { this; gap = 0; direction = vertical; - background = activeBorder; - //opacity = 1.0f; - + background = backgroundColor; + opacity = 0.0f; + tabCycle = true; + + flipper = panels; + flipSpring = true; + anchor = { left = 0, top = 0, right = 0, bottom = 0 }; //moveable = false; }; @@ -103,78 +209,202 @@ class ExplorerWindow : Window ToolBar/**/ toolBar { stack, this; - iconBag = iconBag; size = { h = 32 }; //moveable = false; + borderStyle = none; + background = toolBarBackgroundColor; + tabCycle = true; + + //iconBag = iconBag; + inactive = false; + + flipper = addressBar; + flipSpring = true; - void NotifyToolClick(ToolButton button) +#if 0 + bool NotifyClicked(Button button, int x, int y, Modifiers mods) { + bool noViewActivation = false; ExplorerToolId id = (ExplorerToolId)button.id; switch(id) { case none: break; case newWindow: - ExplorerWindow { }.Create(); + { + noViewActivation = true; + NewWindow_NotifySelect(null, 0); break; + } case goBack: case goForward: + historyIndex += id == goBack ? -1 : 1; + GoToHistoryIndex(/*false, false, */false); + break; + case goHome: + { + char * home = getenv("HOME"); + if(home && home[0] && FileExists(home).isDirectory) + location = home;//GoTo(home, false, false); break; + } case goUp: { char * path = view.path; - char * newPath = new char[strlen(path)]; + char * newPath = new char[strlen(path)+1]; StripLastDirectory(path, newPath); - view.path = newPath; + if(!newPath[0]) + { + newPath[0] = '/'; + newPath[1] = 0; + } + location = newPath;//GoTo(newPath, false, false); delete newPath; break; } + case newFile: + NewFile(view, null, 0); + break; + case newFolder: + NewFolder(view, null, 0); + break; case panelTree: - // TODO TOFIX : need to fix Stacker for this to work + SearchStop(); + //ToggleSearchMode(false); tree.visible = button.checked; + split.visible = button.checked; + if(button.checked) + { + split.rightPane = view; + view.anchor = { top = 0, bottom = 0, right = 0 }; + location = addressBar.path;//GoTo(addressBar.path, false, false); + ReadyTree(); + } + else + { + split.rightPane = null; + view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + } //search.visible = !button.checked; - panels.size = { panels.size.w, panels.size.h }; // TOFIX : another Stacker fix needed break; case panelSearch: - // TODO TOFIX : need to fix Stacker for this to work - //search.visible = button.checked; - tree.visible = !button.checked; - panels.size = { panels.size.w, panels.size.h }; // TOFIX : another Stacker fix needed + ToggleSearchMode(button.checked); + + //tree.visible = false; //!button.checked; + //split.visible = false; //!button.checked; + if(button.checked) + { + /*split.rightPane = view; + view.anchor = { top = 0, bottom = 0, right = 0 };*/ + //split.rightPane = null; + //view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + + //SearchStart(); + searchInFileName.Activate(); + } + else + { + //split.rightPane = null; + //view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + + location = addressBar.path;//GoTo(addressBar.path, false, false); + } break; case refresh: - if(tree.visible) - tree.Refresh(); - view.Refresh(); + Refresh(); break; case previewPictures: view.previewPictures = button.checked; view.Refresh(); break; case viewList: + view.details = false; + view.treeBranches = false; + view.Refresh(); + break; case viewDetails: + view.details = true; + view.treeBranches = false; + view.Refresh(); + break; case viewIcons: case viewCards: - case viewShowcase: //SwitchViews(toolId); + view.details = false; + view.treeBranches = false; + view.Refresh(); + break; + case viewShowcase: + view.preview = button.checked; + view.Refresh(); + break; + case viewTree: + view.treeBranches = button.checked; + view.Refresh(); + break; + case hasHeader: + view.hasHeader ^= true; break; } + if(!noViewActivation) + view.Activate(); + return true; } +#endif }; - Window s1 { toolBar, size = { w = 8 } }; - ToolButton goBack { toolBar, this, id = ExplorerToolId::goBack }; - Window s2 { toolBar, size = { w = 2 } }; - ToolButton goForward { toolBar, this, id = ExplorerToolId::goForward }; - Window s3 { toolBar, size = { w = 2 } }; - ToolButton refresh { toolBar, this, id = ExplorerToolId::refresh }; - Window s4 { toolBar, size = { w = 2 } }; - ToolButton goHome { toolBar, this, id = ExplorerToolId::goHome }; - Window s5 { toolBar, size = { w = 8 } }; + Window { toolBar, size = { w = 8 }, inactive = true }; + IconToolButton goBack { toolBar, this, icon = goBack, hotKey = { left, alt = true }, toolTip = "Back", disabled = true; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + historyIndex += -1; + GoToHistoryIndex(/*false, false, */false); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 2 }, inactive = true }; + IconToolButton goForward { toolBar, this, icon = goForward, hotKey = { right, alt = true }, toolTip = "Forward", disabled = true; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + historyIndex += 1; + GoToHistoryIndex(/*false, false, */false); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 2 }, inactive = true }; + IconToolButton refresh { toolBar, this, icon = refresh, hotKey = { r, ctrl = true }, toolTip = "Refresh"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + Refresh(); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 2 }, inactive = true }; + IconToolButton goHome { toolBar, this, icon = goHome, hotKey = { h, ctrl = true }, toolTip = "Go Home"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + char * home = getenv("HOME"); + if(home && home[0] && FileExists(home).isDirectory) + location = home;//GoTo(home, false, false); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; PathBox addressBar { toolBar, this; - size = { 300, 23 }, id = ExplorerToolId::addressBar; + size = { 300, 22 };//, icon = addressBar; typeExpected = directory; + borderStyle = deep; + background = toolBarBackgroundColor; + foreground = toolBarForegroundColor; + selectionColor = selectionColor; + selectionText = selectionText; + toolTip = "Location"; bool OnKeyDown(Key key, unichar ch) { @@ -188,33 +418,185 @@ class ExplorerWindow : Window bool NotifyModified(PathBox pathBox) { - view.path = pathBox.path; - return true; - } - }; - FlipStacker { toolBar, spring = previous }; - Window s6 { toolBar, size = { w = 8 } }; - ToolButton goUp { toolBar, this, id = ExplorerToolId::goUp }; - Window s7 { toolBar, size = { w = 8 } }; - GroupToggleToolButton selectedPanel; - GroupToggleToolButton panelTree { toolBar, this, id = ExplorerToolId::panelTree, selected = &selectedPanel, checked = true }; - GroupToggleToolButton panelSearch { toolBar, this, id = ExplorerToolId::panelSearch, selected = &selectedPanel }; - selectedPanel = panelTree; - Window s8 { toolBar, size = { w = 8 } }; - OptionToolButton selectedView; - OptionToolButton viewList { toolBar, this, id = ExplorerToolId::viewList, selected = &selectedView, checked = true }; - OptionToolButton viewDetails { toolBar, this, id = ExplorerToolId::viewDetails, selected = &selectedView }; - OptionToolButton viewIcons { toolBar, this, id = ExplorerToolId::viewIcons, selected = &selectedView }; - OptionToolButton viewTiles { toolBar, this, id = ExplorerToolId::viewCards, selected = &selectedView }; - OptionToolButton viewShowcase { toolBar, this, id = ExplorerToolId::viewShowcase, selected = &selectedView }; - selectedView = viewList; - Window s9 { toolBar, size = { w = 8 } }; - ToggleToolButton previewPictures { toolBar, this, id = ExplorerToolId::previewPictures }; - - Window s10 { toolBar, size = { w = 8 } }; - ToolButton newWindow { toolBar, this, id = ExplorerToolId::newWindow }; - Window s11 { toolBar, size = { w = 8 } }; + location = pathBox.path;//GoTo(pathBox.path, false, false); + return true; + } + }; + //FlipStacker { toolBar, spring = previous }; + Window { toolBar, size = { w = 8 }, inactive = true }; + IconToolButton newFile { toolBar, this, icon = newFile, hotKey = { l, ctrl = true }, toolTip = "Create New File"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + NewFile(view, null, 0); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 2 }, inactive = true }; + IconToolButton newFolder { toolBar, this, icon = newFolder, hotKey = { d, ctrl = true }, toolTip = "Create New Folder"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + NewFolder(view, null, 0); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; + IconToolButton goUp { toolBar, this, icon = goUp, hotKey = { up, alt = true }, toolTip = "Go to Parent Folder"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + const char * path = view.path; + char * newPath = new char[strlen(path)+1]; + StripLastDirectory(path, newPath); + if(!newPath[0]) + { + newPath[0] = '/'; + newPath[1] = 0; + } + location = newPath;//GoTo(newPath, false, false); + delete newPath; + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; + //GroupToggleIconToolButton selectedPanel; + ToggleIconToolButton panelTree { toolBar, this, icon = panelTree/*, selected = &selectedPanel*//*, checked = true*/, toolTip = "Toggle Tree Panel"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + SearchStop(); + //ToggleSearchMode(false); + tree.visible = button.checked; + split.visible = button.checked; + if(button.checked) + { + split.rightPane = view; + view.anchor = { top = 0, bottom = 0, right = 0 }; + location = addressBar.path;//GoTo(addressBar.path, false, false); + ReadyTree(); + } + else + { + split.rightPane = null; + view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + } + //search.visible = !button.checked; + view.Activate(); + return true; + } + }; + ToggleIconToolButton panelSearch { toolBar, this, icon = panelSearch, hotKey = { f, ctrl = true }/*, selected = &selectedPanel*/, toolTip = "Toggle Search"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + ToggleSearchMode(button.checked); + + //tree.visible = false; //!button.checked; + //split.visible = false; //!button.checked; + if(button.checked) + { + /*split.rightPane = view; + view.anchor = { top = 0, bottom = 0, right = 0 };*/ + //split.rightPane = null; + //view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + + //SearchStart(); + searchInFileName.Activate(); + } + else + { + //split.rightPane = null; + //view.anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + + location = addressBar.path;//GoTo(addressBar.path, false, false); + } + view.Activate(); + return true; + } + }; + //selectedPanel = panelTree; + Window { toolBar, size = { w = 8 }, inactive = true }; + /*OptionIconToolButton selectedView; + OptionIconToolButton viewList { toolBar, this, icon = viewList, selected = &selectedView, checked = true }; + OptionIconToolButton viewDetails { toolBar, this, icon = viewDetails, selected = &selectedView }; + OptionIconToolButton viewIcons { toolBar, this, icon = viewIcons, selected = &selectedView }; + OptionIconToolButton viewTiles { toolBar, this, icon = viewCards, selected = &selectedView }; + OptionIconToolButton viewShowcase { toolBar, this, icon = viewShowcase, selected = &selectedView }; + OptionIconToolButton viewTree { toolBar, this, icon = viewTree, selected = &selectedView }; + selectedView = viewList;*/ + //ToggleIconToolButton viewList { toolBar, this, icon = viewList, checked = true }; + /*case viewList: + view.details = false; + view.treeBranches = false; + view.Refresh(); + break;*/ + ToggleIconToolButton viewDetails { toolBar, this, icon = viewDetails, toolTip = "Toggle Listing Details"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + view.details = button.checked; + view.treeBranches = false; + view.Refresh(); + view.Activate(); + return true; + } + }; + /*case viewCards: + //SwitchViews(toolId); + view.details = false; + view.treeBranches = false; + view.Refresh(); + break;*/ + //ToggleIconToolButton viewIcons { toolBar, this, icon = viewIcons }; + //ToggleIconToolButton viewTiles { toolBar, this, icon = viewCards }; + ToggleIconToolButton viewShowcase { toolBar, this, icon = viewShowcase, toolTip = "Toggle Showcase"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + view.preview = button.checked; + view.Refresh(); + view.Activate(); + return true; + } + }; + ToggleIconToolButton viewTree { toolBar, this, icon = viewTree, hotKey = { t, ctrl = true }, toolTip = "Toggle Tree Listing"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + view.treeBranches = button.checked; + view.Refresh(); + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; + ToggleIconToolButton previewPictures { toolBar, this, icon = previewPictures, toolTip = "Toggle Picture Preview"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + view.previewPictures = button.checked; + view.Refresh(); + view.Activate(); + return true; + } + }; + + Window { toolBar, size = { w = 8 }, inactive = true }; + ToggleIconToolButton hasHeader { toolBar, this, icon = hasHeader, toolTip = "Toggle Listing Header"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + view.hasHeader ^= true; + view.Activate(); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; + IconToolButton newWindow { toolBar, this, icon = newWindow, hotKey = { w, ctrl = true }, toolTip = "Open New Window"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + NewWindow_NotifySelect(null, 0); + return true; + } + }; + Window { toolBar, size = { w = 8 }, inactive = true }; + +#if 0 /*void OnDestroy() { iconBag.window = null; @@ -231,51 +613,679 @@ class ExplorerWindow : Window { iconBag.Unload(); } +#endif Stacker panels { stack, this; gap = 0; direction = horizontal; - background = yellow;//activeBorder; - //opacity = 1.0f; + opacity = 0.0f; + tabCycle = true; anchor.left = 0; - anchor.bottom = 0; + //anchor.bottom = 0; anchor.right = 0; + + //size = { h = 400 }; }; //FlipStacker flipStack { stack, spring = previous }; + //Window searchSpace { stack, size = { h = 32 }, background = toolBarBackgroundColor, inactive = true, opacity = 0.0f }; + + ToolBar/**/ searchBar + { + stack, this; + size = { h = 32 }; + visible = false; + //moveable = false; + borderStyle = none; + background = toolBarBackgroundColor; + tabCycle = true; + //iconBag = iconBag; + inactive = false; + + flipper = searchInFileContent; + flipSpring = true; + +#if 0 + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + ExplorerToolId id = (ExplorerToolId)button.id; + switch(id) + { + case none: + break; + case searchStart: + SearchStart(); + break; + case searchStop: + SearchStop(); + break; + } + view.Activate(); + return true; + } +#endif + }; + + Window { searchBar, size = { w = 8 }, inactive = true }; + //Label { searchBar, this, labeledWindow = searchInFileName}; + //Window { searchBar, size = { w = 2 }, inactive = true }; + SearchBox searchInFileName + { + searchBar, this; + size = { 200, 22 };//, icon = searchInFileName; + borderStyle = deep; + background = toolBarBackgroundColor; + foreground = toolBarForegroundColor; + selectionColor = selectionColor; + selectionText = selectionText; + //text = "File Name:"; + caption = "Search File Names"; + toolTip = "Search File Names"; + + bool NotifyKeyDown(EditBox editBox, Key key, unichar ch) + { + if((SmartKey)key == enter) + SearchStart(); + return true; + } + + /*bool NotifyActivate(Window window, bool active, Window previous) + { + if(active) + { + toolBar.focusHolder = window; + } + return true; + }*/ + }; + Window { searchBar, size = { w = 2 }, inactive = true }; +#ifndef __WIN32__ + ToggleIconToolButton inFileNameMatchCase { searchBar, this, icon = inFileNameMatchCase, toolTip = "Toggle Match Case"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + return true; + } + }; +#endif + ToggleIconToolButton inFileNameMatchWord { searchBar, this, icon = inFileNameMatchWord, toolTip = "Toggle Match Whole Word"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + return true; + } + }; + Window { searchBar, size = { w = 8 }, inactive = true }; + //Label { searchBar, this, labeledWindow = searchInFileContent}; + //Window { searchBar, size = { w = 2 }, inactive = true }; + SearchBox searchInFileContent + { + searchBar, this; + size = { 200, 22 };//, icon = searchInFileContent; + borderStyle = deep; + background = toolBarBackgroundColor; + foreground = toolBarForegroundColor; + selectionColor = selectionColor; + selectionText = selectionText; + //text = "File Content:"; + caption = "Search File Contents"; + toolTip = "Search File Contents"; + + bool NotifyKeyDown(EditBox editBox, Key key, unichar ch) + { + if((SmartKey)key == enter) + SearchStart(); + return true; + } + + /*bool NotifyActivate(Window window, bool active, Window previous) + { + if(active) + toolBar.focusHolder = window; + return true; + }*/ + }; + //FlipStacker { searchBar, spring = previous }; + ToggleIconToolButton inFileContentMatchCase { searchBar, this, icon = inFileContentMatchCase, toolTip = "Toggle Match Case"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + return true; + } + }; + ToggleIconToolButton inFileContentMatchWord { searchBar, this, icon = inFileContentMatchWord, toolTip = "Toggle Match Whole Word"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + return true; + } + }; + Window { searchBar, size = { w = 8 }, inactive = true }; + ToggleIconToolButton searchInSubDirs { searchBar, this, icon = searchInSubDirs, checked = true, toolTip = "Toggle Include Subfolders"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + return true; + } + }; + Window { searchBar, size = { w = 8 }, inactive = true }; + IconToolButton searchStart { searchBar, this, icon = searchStart, hotKey = { s, ctrl = true }, toolTip = "Start Search"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + SearchStart(); + view.Activate(); + return true; + } + }; + Window { searchBar, size = { w = 8 }, inactive = true }; + IconToolButton searchStop { searchBar, this, icon = searchStop, hotKey = { escape }, disabled = true, toolTip = "Stop Search"; + bool NotifyClicked(Button button, int x, int y, Modifiers mods) + { + SearchStop(); + view.Activate(); + return true; + } + }; + Window { searchBar, size = { w = 8 }, inactive = true }; + + + + //Window { searchBar, size = { h = 1 } }; + /*SearchPanel searchPanel { panels, this; };*/ - /*Tree*/FileSystemBox tree + /*Window hack + { + panels, this; + anchor.top = 0; + anchor.bottom = 0; + anchor.right = 0; + borderStyle = none; + background = backgroundColor; + };*/ + + /*Tree*/FileSystemBox tree//; { panels, this; size = { w = 240 }; + borderStyle = none; + background = backgroundColor; + foreground = foregroundColor; + selectionColor = selectionColor; + selectionText = selectionText; + visible = false; anchor.top = 0; anchor.bottom = 0; - navigateFolders = true; + //anchor = { left = 0, top = 0, bottom = 0 }; + treeBranches = true; foldersOnly = true; - borderStyle = none; + autoLoad = false; + + bool NotifyNodeSelect(FileSystemBox box, FileSystemBoxSelection selection) + { + if(treeInitialized) + { + FileSystemNode node = selection.node; + if(node) + { + char p[MAX_LOCATION]; + node.GetPath(p); + location = node.path;//GoTo(node.path, false, true); + } + } + return true; + } + + /*bool NotifyActivate(Window window, bool active, Window previous) + { + if(active) + toolBar.focusHolder = window; + return true; + }*/ + }; + + PaneSplitter split + { + panels, this; visible = false; + leftPane = tree;//, rightPane = view; + split = 300; }; + //FileSystemCache testCache; FileSystemBox view { panels, this; + borderStyle = none; + background = backgroundColor; + foreground = foregroundColor; + selectionColor = selectionColor; + selectionText = selectionText; anchor.top = 0; anchor.bottom = 0; anchor.right = 0; + //anchor = { left = 2, top = 0, bottom = 0, right = 0 }; + locationBox = addressBar; navigateFolders = true; - borderStyle = none; + multiSelect = true; + autoLoad = false; + + //iteratorClass = class(FileSystemCacheIterator); + //iteratorClass = class(FileSystemIterator); + + bool NotifyIteratorInit(FileSystemBox box, FileSystemIterator fileSystemIterator) + { + //((FileSystemCacheIterator)fileSystemIterator).cache = testCache; + //((FileSystemIterator)fileSystemIterator) + return true; + } + + bool NotifyNodeOpen(FileSystemBox box, FileSystemBoxSelection selection) + { + FileSystemNode node = selection.node; + if(node) + { + if(node.type.isFile) + { + char path[MAX_LOCATION]; + //#ifndef __WIN32__ + // char command[MAX_LOCATION]; + // node.GetPath(path); + // /*_FileType t = node.type; + // if(t == ewsFile || t == epjFile || + // t == ecFile || t == ehFile || + // t == cppFile || t == hppFile || + // t == cFile || t == hFile || + // t == textFile || t == webFile)*/ + // sprintf(command, "gnome-open \"%s\"", path); + // /*else + // sprintf(command, "%s", path);*/ + // Execute(command); + //#else + node.GetPath(path); + ShellOpen(path); + //#endif + } + else if(node.type.isFolder) + location = node.path;//GoTo(node.path, true, false); + } + UpdateHistoryItem(selection); + return true; + } + + bool NotifyNodeSelect(FileSystemBox box, FileSystemBoxSelection selection) + { + if(!comparedLocations) + UpdateHistoryItem(selection); + return true; + } + + bool NotifyNodeMenu(FileSystemBox box, Menu menu, FileSystemBoxSelection selection) + { + char * text; + char * itemString; + FileSystemNode node = selection.node; + + //PrintLn(node.name); + if(box.selection.nodes.count == 1) + itemString = CopyString(node.name); + else + itemString = PrintString(box.selection.nodes.count, " items"); + text = PrintString("Open ", itemString); + MenuItem { menu, text, o, disabled = false; + NotifySelect = FileSystemBox::MenuOpen + /*bool FileSystemBox::NotifySelect(MenuItem selection, Modifiers mods) + { + for(node : this.selection.nodes) + { + // todo: somehow bring MenuOpen / OpenNode behavior ourside + } + return true; + }*/ + }; + //delete text; + if(node.type == folder) + { + text = PrintString("Open ", itemString, " in another window"); + MenuItem { menu, text, w, disabled = false; + bool FileSystemBox::NotifySelect(MenuItem selection, Modifiers mods) + { + for(node : this.selection.nodes) + { + ExplorerWindow ew { /*location = this.selection.node.path*/ };//.Create(); + ew.Create(); + ew.location = /*this.selection.*/node.path; + } + return true; + } + }; + //delete text; + MenuDivider { menu }; + text = PrintString("Open ", itemString, " in shell"); + MenuItem { menu, text, w, disabled = false; + bool FileSystemBox::NotifySelect(MenuItem selection, Modifiers mods) + { + for(node : this.selection.nodes) + { + if(node.stats.attribs) + ShellOpen(/*this.selection.*/node.path); + } + return true; + } + }; + //delete text; + MenuDivider { menu }; + MenuItem { menu, "Create File", w, NotifySelect = NewFile, disabled = false }; + MenuItem { menu, "Create Folder", w, NotifySelect = NewFolder, disabled = false }; + } + if(panelSearch.checked) + { + MenuDivider { menu }; + MenuItem { menu, "Open Containing Folder", f, NotifySelect = FileSystemBox::MenuOpen, disabled = false; + bool FileSystemBox::NotifySelect(MenuItem selection, Modifiers mods) + { + char path[MAX_LOCATION]; + StripLastDirectory(this.selection.node.path, path); + this.path = path; + return true; + } + }; + MenuItem { menu, "Open Containing Folder in another window", r, NotifySelect = FileSystemBox::MenuOpen, disabled = false; + bool FileSystemBox::NotifySelect(MenuItem selection, Modifiers mods) + { + char path[MAX_LOCATION]; + ExplorerWindow ew { /*location = this.selection.node.path*/ };//.Create(); + ew.Create(); + StripLastDirectory(this.selection.node.path, path); + ew.location = path; + return true; + } + }; + delete itemString; + } + if(node.isListItem/* && TODO: unless node is at root location*/) + { + MenuDivider { menu }; + MenuItem { menu, "Replace by Parent\tCtrl+R", r, NotifySelect = FileSystemBox::MenuReplaceListItemByContainingDir, disabled = false }; + } + else if(box.mode == list) + { + MenuDivider { menu }; + MenuItem { menu, "Replace List Item\tCtrl+R", r, NotifySelect = FileSystemBox::MenuReplaceListItemByChild, disabled = false }; + } + MenuDivider { menu }; + MenuItem { menu, "Cut\tCtrl+X", t, NotifySelect = null, disabled = false }; + MenuItem { menu, "Copy\tCtrl+C", c, NotifySelect = null, disabled = false }; + MenuItem { menu, "Paste\tCtrl+V", p, NotifySelect = null, disabled = false /*!clipboard*/ }; + MenuItem { menu, "Delete\tDel", d, NotifySelect = null, disabled = false }; + //MenuDivider { menu }; + return true; + } + + /*bool NotifyActivate(Window window, bool active, Window previous) + { + if(active) + toolBar.focusHolder = window; + return true; + }*/ + }; + + FileSystemSearch searchThread + { + owner = this, fsb = view, tree = tree/*, searchPanel = this*/; + + /*bool ExplorerWindow::NotifyUpdateSearchLocation(FileSystemSearch search, char * location) + { + char string[MAX_LOCATION + 2048]; + sprintf(string, "%s (Searching %s)", title, location); + PrintLn(string); //view.results.text = string; + text = string; + return true; + }*/ + + bool ExplorerWindow::NotifySearchTerminated(FileSystemSearch search) + { + searchStop.disabled = true; + return true; + } }; + void ToggleSearchMode(bool inSearch) + { + SearchStop(); + //search.visible = inSearch; + //panelSearch.checked = inSearch; // <------ this is toggling panelSearch even though it shouldn't + //searchSpace.visible = !inSearch; + searchBar.visible = inSearch; + history[historyIndex].inSearch = inSearch; + view.pathColumn = inSearch; + /*if(inSearch) + searchThread.InitResults();*/ + if(inSearch && /*(*/searchInFileName.contents[0]/* || searchInFileContents.contents[0])*/) + SearchStart(); + } + + void ReadyTree() + { + if(tree.visible) + { + if(!treeInitialized) + { + tree.path = "/"; // this should be available as a parameter + treeInitialized = true; + } + tree.SelectLocation(view.path); + } + } + + void Refresh() + { + if(searchBar.visible) + SearchStart(); + else + { + if(tree.visible) + tree.Refresh(); + view.Refresh(); + } + } + + //void NewFile() + bool FileSystemBox::NewFile(MenuItem selection, Modifiers mods) + { + if(master._class == class(ExplorerWindow)) + { + ExplorerWindow ew = (ExplorerWindow)master; + if(CreateNewFileDialog { /*master = */ew/*, parent = parent*/, currentDirectory = selection ? ew.view.selection.node.path : ew.view.path }.Modal() == ok ) + ew.Refresh(); + } + return true; + } + + //void NewFolder() + bool FileSystemBox::NewFolder(MenuItem selection, Modifiers mods) + { + if(master._class == class(ExplorerWindow)) + { + ExplorerWindow ew = (ExplorerWindow)master; + if(CreateDirectoryDialog { /*master = */ew/*, parent = parent*/, currentDirectory = selection ? ew.view.selection.node.path : ew.view.path }.Modal() == ok ) + ew.Refresh(); + } + return true; + } + + //void GoTo(char * location/*, bool viewIsAtLocation, bool treeIsAtLocation*/) + property const char * location + { + set + { + HistoryItem item = null; + if(!history.count || fstrcmp(history[historyIndex].path, value)) + { + int c; + for(c = 0; c < history.count; c++) + if(!fstrcmp(history[c].path, value)) + break; + if(c == history.count) + { + item = { path = CopyString(value) }; + if(history.count) + { + while(historyIndex < history.count-1) + { + delete history[history.count-1].path; + history.count--; + } + } + history.Add(item); + historyIndex = history.count-1; + } + else + historyIndex = c; + } + GoToHistoryIndex(/*viewIsAtLocation, treeIsAtLocation, */item != null); + } + get { return view.path; } + } + + property Array comparedLocations + { + set + { + // dd + view.comparedPaths = value; + } + get + { + return view.comparedPaths; + } + } + + void GoToHistoryIndex(/*bool viewIsAtLocation, bool treeIsAtLocation, */bool updateHistoryItem) + { + bool viewIsAtLocation; + bool treeIsAtLocation; + HistoryItem item = history[historyIndex]; + + goBack.disabled = historyIndex == 0; + goForward.disabled = historyIndex == history.count-1; + goUp.disabled = !fstrcmp(item.path, "/"); + + viewIsAtLocation = !fstrcmp(item.path, tree.path); + treeIsAtLocation = !fstrcmp(item.path, view.path); + + if(!viewIsAtLocation) + { + if(item.inSearch != panelSearch.checked) + { + ToggleSearchMode(item.inSearch); + if(item.inSearch) + SearchStart(); + } + if(!item.inSearch) + /*{ + //SearchStart(); + } + else*/ + { + if(fstrcmp(view.path, item.path)) + view.path = item.path; + item.holdRecordingSelection = true; + view.SelectMultipleByPath(item.selection); + } + } + if(tree.visible && !treeIsAtLocation) + tree.SelectLocation(item.path); + + if(updateHistoryItem) + UpdateHistoryItem(view.selection); + } + + void UpdateHistoryItem(FileSystemBoxSelection selection) + { + if(history.count > historyIndex) // TODO: Review why this would happen... + { + HistoryItem item = history[historyIndex]; + + if(!item.holdRecordingSelection) + { + if(selection.node || (selection.nodes && selection.nodes.count)) + { + item.selection.Free(); + if(selection.nodes.count) + { + for(node : selection.nodes) + item.selection.Add(CopyString(node.path)); + } + else if(selection.node) + item.selection.Add(CopyString(selection.node.path)); + } + } + else + item.holdRecordingSelection = false; + } + } + + void SearchStart() + { + SearchStop(); + searchThread.active = true; + + searchThread.optionSubdirs = searchInSubDirs.checked == true; + searchThread.optionTree = view.treeBranches; //(options.subdirs.checked && options.tree.checked); + searchThread.optionBrowser = tree.visible; //(options.subdirs.checked && options.browser.checked); +#ifndef __WIN32__ + searchThread.optionNameMatchCase = inFileNameMatchCase.checked; +#else + searchThread.optionNameMatchCase = false; +#endif + searchThread.optionNameMatchWord = inFileNameMatchWord.checked; + searchThread.optionContentMatchCase = inFileContentMatchCase.checked; + searchThread.optionContentMatchWord = inFileContentMatchWord.checked; + + strcpy(searchThread.location, view.path); + strcpy(searchThread.nameSearch, searchInFileName.contents); + strcpy(searchThread.contentSearch, searchInFileContent.contents); + + //actions.startStop.text = "Stop Search"; + //actions.clear.disabled = false; + //view.results.Clear(); + //view.results.hasHeader = !searchThread.optionTree; + //view.results.treeBranches = searchThread.optionTree; + //view.browser.Clear(); + //ToggleBrowserDisplay(searchThread.optionBrowser); + + //view.browser.text = "Browser"; + /*{ + char string[MAX_LOCATION + 2048]; + sprintf(string, "%s (Searching %s)", title, view.path); + //PrintLn(string); //view.results.text = string; + text = string; + }*/ + searchThread.InitResults(); + searchThread.Create(); + searchStop.disabled = false; + //Update(null); + } + + bool SearchStop() + { + if(searchThread.active) + { + searchThread.terminate = true; + //searchStop.disabled = true; + app.Unlock(); + searchThread.Wait(); + app.Lock(); + return true; + } + return false; + } + /*ExplorerSearch search { deep, this; @@ -292,13 +1302,6 @@ class ExplorerWindow : Window parent = deep, master = this; tabCycle = true; anchor = Anchor { top = 0, bottom = 0, right = 0 }; - }; - - SplitWindow split - { - deep, this; - leftPane = tree, rightPane = viewHolder; - split = 300; };*/ // Preview / Showcase @@ -320,7 +1323,7 @@ class ExplorerWindow : Window } return true; }*/ - + /*bool ViewNotifyItemOpen(ExplorerView view, ExplorerFileItem item) { ExplorerFileBranch branch = tree.branch; @@ -329,14 +1332,14 @@ class ExplorerWindow : Window if(item.type.isFolderType) { ExplorerFileBranch child; - + if(!branch.loaded || !branch.childrenLoaded) BranchLoad(branch, tree.tree); for(child = branch.children.first; child; child = child.next) if(!strcmp(child.name, item.name)) break; - + if(child) { if(branch.row.collapsed) @@ -376,38 +1379,9 @@ class ExplorerWindow : Window lastViewId = viewId; }*/ - /*void GoToLocation(char * location) - { - int c; - char * temp; - char step[MAX_LOCATION]; - - StringArray steps { growingFactor = 4 }; - ExplorerFileBranch last = null; - - temp = CopyString(location); - while(strlen(temp)) - { - GetLastDirectory(temp, step); - StripLastDirectory(temp, temp); - steps.Add(CopyString(step)); - } - - for(c = steps._count - 1; c >= 0; c--) - { - last = tree.Find(steps._[c], last); - if(!last) - break; - tree.Select(last); - } - - delete temp; - delete steps; - }*/ - /*void SearchLocation(char * location) { - GoToLocation(location); + location = location;//GoTo(location); search.location.editBox.contents = location; }*/ @@ -415,6 +1389,14 @@ class ExplorerWindow : Window { //userMode = true; addressBar.path = view.path; + ReadyTree(); + view.Refresh(); + return true; + } + + bool OnClose(bool parentClosing) + { + SearchStop(); return true; } @@ -434,7 +1416,7 @@ class ExplorerWindow : Window NotifyItemOpen = ViewNotifyItemOpen; }; lastViewId = viewList; - + tree.Load(); view.Load(tree.root); }*/ @@ -449,3 +1431,16 @@ class ExplorerWindow : Window } //class TreeFileSystemBox : FileSystemBox { } + +class HistoryItem +{ + char * path; + bool holdRecordingSelection; + bool inSearch; + Array selection { }; + + ~HistoryItem() + { + delete path; + } +}