public import "ecere"
+import "FileSystemCache"
#ifdef __WIN32__
static char * rootName = "Entire Computer";
define guiApp = (GuiApplication)((__thisModule).application);
define selectionColor = guiApp.currentSkin.selectionColor; //Color { 10, 36, 106 };
-static char * fileIconNames[] =
+void MessageBoxTodo(char * message)
+{
+ PrintLn("MessageBoxTodo(char * message) -- ", message);
+ MessageBox { type = ok, text = "MessageBoxTodo(char * message)", contents = message }.Modal();
+}
+
+static char * fileIconNames[] =
{
"<:ecere>mimeTypes/file.png", /* none */
""
};
+define countOfCompIconNames = 6;
+static char * compIconNames[] =
+{
+/*
+ "<:ede>a.png",
+ "<:ede>b.png",
+ "<:ede>c.png",
+ "<:ede>d.png",
+ "<:ede>not.png",
+*/
+ "<:ede>devices/media-optical.png",
+ "<:ede>devices/media-flash.png",
+ "<:ede>places/network-server.png",
+ "<:ede>places/folder-saved-search.png",
+ "<:ede>places/user-home.png",
+ "<:ede>emblem-not.png",
+ ""
+};
+
public enum _FileType
{
none,
}
};
+public enum FileSystemBoxMode { directory, list };
+
class FileSystemBoxBits
{
bool foldersOnly:1, filesOnly:1, details:1, pathColumn:1, treeBranches:1, previewPictures:1, navigateFolders:1, autoLoad:1;
bool preview:1;
+ bool columnsCompareStyle:1;
//bool header:1, freeSelect:1, fullRowSelect:1, multiSelect:1, autoScroll:1, alwaysHL : 1, moveRows:1, resizable:1;
//bool moveFields:1, clearHeader:1, alwaysEdit:1, collapse:1, treeBranch:1, rootCollapse:1, heightSet:1;
//bool sortable:1, noDragging:1, fillLastField:1, expandOnAdd:1;
-};
+ bool textFileLinesStyle:1;
+
+ FileSystemBoxMode mode:2;
+}
public class FileSystemBox : Window // should we not derive from ListBox instead?
// I say we should, but we can't right now...
FileSystemNode root;
FileSystemBoxSelection selection { };
+ subclass(InterfaceFileSystemIterator) iteratorClass;
+ FileSystemCache cache;
+
virtual bool Window::NotifyNodeSelect(FileSystemBox box, FileSystemBoxSelection selection);
//virtual bool Window::NotifyNodeNavigate(FileSystemBox box, FileSystemNode node);
virtual bool Window::NotifyNodeOpen(FileSystemBox box, FileSystemBoxSelection selection);
+ virtual bool Window::NotifyNodeMenu(FileSystemBox box, Menu menu, FileSystemBoxSelection selection);
+ virtual bool Window::NotifyIteratorInit(FileSystemBox box, FileSystemIterator fileSystemIterator);
property char * path
{
if(created)
Load();
}
-
get { return path; }
//isset { return path && path[0]; }
}
+ property Array<String> comparedPaths
+ {
+ set
+ {
+ delete comparedPaths;
+ if(value && value.count)
+ comparedPaths = value;
+ if(locationBox)
+ locationBox.path = value[0];
+ if(created)
+ Load();
+ }
+ get { return comparedPaths; }
+ //isset { return comparedPaths && comparedPaths.count; }
+ }
+
+ property FileSystemBoxMode mode { set { bits.mode = value; } get { return bits.mode; } };
property bool foldersOnly { set { bits.foldersOnly = value; bits.filesOnly = !value; } get { return bits.foldersOnly; } };
property bool filesOnly { set { bits.filesOnly = value; bits.foldersOnly = !value; } get { return bits.filesOnly; } };
property bool previewPictures { set { bits.previewPictures = value; } get { return bits.previewPictures; } };
}
get { return bits.preview; }
};
+ property bool columnsCompareStyle { set { bits.columnsCompareStyle = value; } get { return bits.columnsCompareStyle; } };
+ property bool textFileLinesStyle { set { bits.textFileLinesStyle = value; } get { return bits.textFileLinesStyle; } };
property FileSystemNode node
{
Load();
}
+ bool MenuOpen(MenuItem selection, Modifiers mods)
+ {
+ OpenNode();
+ }
+
+ bool MenuReplaceListItemByContainingDir(MenuItem selection, Modifiers mods)
+ {
+ bool result = true;
+ //FileSystemBoxSelection selection = this.selection.Copy(); // TOFIX compiler bug -- FileSystemBox.c -- ../libede/src/FileSystemBox.ec:420:49: error: ‘selection’ redeclared as different kind of symbol
+ FileSystemBoxSelection sel = this.selection.Copy();
+ FileSystemNode node = sel.node;
+ char newPath[MAX_LOCATION];
+ StripLastDirectory(node.path, newPath);
+ //node.path = newPath;
+ //node.
+ //if(node && node.type.isFolder && bits.navigateFolders)
+ // property::path = node.path;
+ delete sel;
+ return result;
+ }
+
+ bool MenuReplaceListItemByChild(MenuItem selection, Modifiers mods)
+ {
+ bool result = true;
+ //FileSystemBoxSelection selection = this.selection.Copy(); // TOFIX compiler bug -- FileSystemBox.c -- ../libede/src/FileSystemBox.ec:420:49: error: ‘selection’ redeclared as different kind of symbol
+ FileSystemBoxSelection sel = this.selection.Copy();
+ FileSystemNode node = sel.node;
+ char newPath[MAX_LOCATION];
+ StripLastDirectory(node.path, newPath);
+ //node.path = newPath;
+ //node.
+ //if(node && node.type.isFolder && bits.navigateFolders)
+ // property::path = node.path;
+ delete sel;
+ return result;
+ }
+
private:
FileSystemBoxBits bits;
char * path;
char * extensions;
+ Array<String> comparedPaths;
BitmapResource fileIcons[_FileType];
+ BitmapResource compIcons[countOfCompIconNames]; // todo: fix this limitation
Bitmap bitmap;
//BitmapArray bitmaps { growingFactor = 16 };
FileSystemBox()
{
- char wd[MAX_LOCATION];
- GetWorkingDir(wd, sizeof(wd));
- property::path = wd;
-
+ path = CopyString("");
InitFileIcons();
+ InitCompIcons(); // todo: these icons should not be initialize, they should be set
+ // or at least initalized when the comparison listing is requested
+ // and we know how many paths are being compared.
list.AddField(nameField);
bits.autoLoad = true;
+ //iteratorClass = class(FileSystemIterator);
}
~FileSystemBox()
}
}
- DataField nameField { header = "Name", dataType = "FileSystemNode", width = 240, userData = this, freeData = false };
- DataField pathField { header = "Location", dataType = /*"String"*/ "char *", width = 300, freeData = false };
+ void InitCompIcons()
+ {
+ _FileType c;
+ for(c = 0; c < countOfCompIconNames; c++)
+ {
+ compIcons[c] = BitmapResource { compIconNames[c], alphaBlend = true };
+ AddResource(compIcons[c]);
+ }
+ }
+
+ DataField nameField { header = "Name", dataType = "FileSystemNode", width = 240, userData = this, freeData = false/*, editable = true*/; };
+ DataField pathField { header = "Location", dataType = /*"String"*/ "char *", width = 300, freeData = true };
DataField typeField { header = "Type", dataType = /*"String"*/ "char *", width = 40, freeData = false };
DataField sizeField { header = "Size", dataType = "FileSize", width = 96, alignment = right, freeData = false };
DataField modifiedField { header = "Modified", dataType = "SecSince1970", width = 96, alignment = right, freeData = false };
bool OnPostCreate()
{
if(bits.autoLoad)
+ {
+ if(!path)
+ {
+ char wd[MAX_LOCATION];
+ GetWorkingDir(wd, sizeof(wd));
+ property::path = wd;
+ }
Load();
+ }
return true;
}
FileSystemNode node = (FileSystemNode)row.tag;
if(node)
{
- char * text;
-
PopupMenu popup;
Menu menu { };
- text = PrintString("Open ", node.path);
+ if(NotifyNodeMenu)
+ NotifyNodeMenu(master, this, menu, selection);
+ else
+ {
+ char * text;
+
+ text = PrintString("Open ", node.name);
+ MenuItem { menu, text, o, NotifySelect = MenuOpen, disabled = false }; //delete text;
- MenuItem { menu, text, o, NotifySelect = MenuOpen, disabled = false };
- 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 };
+ if(node.bits.isListItem/* && TODO: unless node is at root location*/)
+ {
+ MenuDivider { menu };
+ MenuItem { menu, "Replace by Parent\tCtrl+R", r, NotifySelect = MenuReplaceListItemByContainingDir, disabled = false };
+ }
+ else if(bits.mode == list)
+ {
+ MenuDivider { menu };
+ MenuItem { menu, "Replace List Item\tCtrl+R", r, NotifySelect = 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 };
+ }
popup = PopupMenu
{
bool result;
if((SmartKey)key == enter)
result = OpenNode();
+ #if 0
+ else if((SmartKey)key == f2)
+ result = RenameNode();
+ #endif
+ else if((SmartKey)key == f2)
+ {
+ FileSystemNode node = selection.node;
+ node.row.Edit(nameField);
+ }
else
result = true;
return true;
}
}
- bool MenuOpen(MenuItem selection, Modifiers mods)
+ bool OpenNode()
{
- OpenNode();
+ bool result = false;
+ FileSystemBoxSelection sel = this.selection.Copy();
+ //FileSystemNode node = selection.node;
+ for(node : sel.nodes)
+ {
+ sel.node = node;
+ if(node && node.type.isFolder && bits.navigateFolders)
+ property::path = node.path;
+ if(NotifyNodeOpen(this.master, this, sel) && !result)
+ result = true;
+ }
+ delete sel;
+ return result;
}
- bool OpenNode()
+ #if 0
+ bool RenameNode()
{
bool result;
- FileSystemBoxSelection selection = this.selection.Copy();
+ //FileSystemBoxSelection selection = this.selection.Copy();
FileSystemNode node = selection.node;
- if(node && node.type.isFolder && bits.navigateFolders)
- property::path = node.path;
- result = NotifyNodeOpen(this.master, this, selection);
+ //if(node && node.type.isFolder && bits.navigateFolders)
+ // property::path = node.path;
+ // ------------------------------------------- working here ---------------------------
+ //node.row.Edit();
+ /*result = NotifyNodeRename(this.master, this, node);
+ if(result)
+ {
+ if(RenameFile(oldn, newn))
+ {
+ node.name = newn;
+ }
+ }*/
return result;
}
+ #endif
// Edit Menu
Menu editMenu { menu, "Edit", e };
list.AddField(sizeField);
}
}*/
- if(bits.treeBranches)
- LoadTree();
- else
- LoadList();
- }
-
- void LoadList()
- {
- FileListing listing { path, extensions = extensions };
-
list.Clear();
- while(listing.Find())
+ if(comparedPaths && !bits.treeBranches)
+ LoadComparedList();
+ else
{
- if((!bits.foldersOnly && !bits.filesOnly) ||
- (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
- (bits.filesOnly && listing.stats.attribs.isFile))
+ FileAttribs pathAttribs = FileExists(path);
+ if(pathAttribs)
{
- FileSystemNode node = MakeFileSystemNode(listing.stats, listing.name, listing.path, false, bits.previewPictures, displaySystem);
- AddNode(node);
+ if(pathAttribs.isDirectory)
+ {
+ if(bits.treeBranches)
+ LoadTreeDirectory();
+ else
+ {
+ if(iteratorClass)
+ LoadListIterator();
+ else
+ LoadListDirectory();
+ }
+ }
+ else if(pathAttribs.isFile) // we assume this is a file list
+ {
+ File f = FileOpen(path, read);
+ if(f)
+ {
+ if(bits.treeBranches)
+ LoadTreeFileList(f);
+ else
+ LoadListFileList(f);
+ delete f;
+ }
+ else
+ MessageBoxTodo($"unable to open file list");
+ }
+ else
+ MessageBoxTodo($"path is not a directory nor is it a file");
}
+ else
+ MessageBoxTodo($"path does not exist");
}
list.Sort(nameField, 1);
}
- void LoadTree()
+ void LoadTreeDirectory()
{
bool isRoot = !strcmp(path, "/");
char name[MAX_LOCATION];
else
strcpy(path, startPath);*/
- list.Clear();
+ bits.mode = directory;
delete root;
- #ifdef __WIN32__
+#ifdef __WIN32__
if(isRoot)
{
root = FileSystemNode { bits.loaded = true, bits.childrenLoaded = true };
- AddTreeNode(root, true, false, null);
+ AddTreeNode(root, true, false, false, null);
while(listing.Find())
{
int len = strlen(listing.name);
info[0] = 0;
}
- parent = MakeFileSystemNode(listing.stats, name, listing.path, false, bits.previewPictures, displaySystem);
+ parent =
+ MakeFileSystemNode(
+ listing.stats,
+ name,
+ listing.path,
+ false, bits.previewPictures, false,
+ displaySystem);
if(info[0])
parent.info = info; //CopyString(info);
parent.bits.loaded = true;
- AddTreeNode(parent, !listing.stats.attribs.isDirectory, listing.stats.attribs.isDirectory, root);
+ AddTreeNode(
+ parent,
+ !listing.stats.attribs.isDirectory,
+ false,
+ listing.stats.attribs.isDirectory,
+ root);
if(!listing.stats.attribs.isDirectory)
parent.bits.childrenLoaded = true;
}
node = FileSystemNode { name = msNetwork, type = network };
- AddTreeNode(node, false, true, null);
+ AddTreeNode(node, false, false, true, null);
node.row.collapsed = true;
}
else
- #endif
+#endif
{
- root = MakeFileSystemNode(FileStats { attribs = FileExists(path)}, name, path, false, bits.previewPictures, displaySystem);
- AddTreeNode(root, false, true, null);
+ FileStats stats;
+ FileGetStats(path, stats);
+ root = MakeFileSystemNode(stats, name, path, false, bits.previewPictures, false, displaySystem);
+ AddTreeNode(root, false, false, true, null);
LoadTreeNode(root);
}
list.SelectRow(root.row);
}
+ void LoadListDirectory()
+ {
+ FileListing listing { path, extensions = extensions };
+
+ bits.mode = directory;
+ while(listing.Find())
+ ProcessListItem(listing.name, listing.path, listing.stats, false);
+ }
+
+ void LoadListFileList(File f)
+ {
+ char line[65536];
+ bits.mode = list;
+ while(f.GetLine(line, 65536))
+ {
+ FileStats stats {};
+ char name[MAX_FILENAME];
+ FileGetStats(line, stats);
+ GetLastDirectory(line, name);
+ ProcessListItem(name, line, stats, true);
+ }
+ }
+
+ void LoadTreeFileList(File f)
+ {
+ char line[65536];
+ bits.mode = list;
+ while(f.GetLine(line, 65536))
+ {
+ FileStats stats {};
+ char name[MAX_FILENAME];
+ FileSystemNode node;
+ FileGetStats(line, stats);
+ GetLastDirectory(line, name);
+ node = ProcessTreeItem(name, line, stats, node);
+ }
+ }
+
+ void LoadListIterator()
+ {
+ FileSystemIterator iterator = eInstance_New(iteratorClass);
+ if(iterator)
+ {
+ iterator.owner = this;
+ iterator.OnObject = ListIterator_OnObject;
+ //iterator.OnLeavingDirectory = ListIterator_OnLeavingDirectory;
+ NotifyIteratorInit(master, this, iterator);
+ iterator.Iterate(path, true);
+ delete iterator;
+ }
+ }
+
+ bool ListIterator_OnObject(char * name, char * path, FileStats stats, bool isRootObject)
+ {
+ ProcessListItem(name, path, stats, false);
+ return false;
+ }
+
+ //void ListIterator_OnLeavingDirectory(char * path) { }
+
+ void ProcessListItem(char * name, char * path, FileStats stats, bool isListItem)
+ {
+ if((!bits.foldersOnly && !bits.filesOnly) || (bits.foldersOnly && stats.attribs.isDirectory) || (bits.filesOnly && stats.attribs.isFile))
+ {
+ FileSystemNode node = MakeFileSystemNode(stats, name, path, false, bits.previewPictures, isListItem, displaySystem);
+ AddNode(node);
+ }
+ }
+
+ FileSystemNode ProcessTreeItem(char * name, char * path, FileStats stats, FileSystemNode parent)
+ {
+ FileSystemNode node = MakeFileSystemNode(stats, name, path, false, bits.previewPictures, true, displaySystem);
+ AddTreeNode(parent, false, false, true, null);
+ //LoadTreeNode(node);
+ return node;
+ }
+
void LoadTreeNode(FileSystemNode node)
{
if(!node.bits.loaded)
while(listing.Find())
{
+ char * test;
+ FileSystemNode child = null;
if(!listing.stats.attribs.isRemovable && ((!bits.foldersOnly && !bits.filesOnly) ||
(bits.foldersOnly && listing.stats.attribs.isDirectory) ||
(bits.filesOnly && listing.stats.attribs.isFile)))
- {
- FileSystemNode child = MakeFileSystemNode(listing.stats, listing.name, listing.path, false, bits.previewPictures, displaySystem);
- AddTreeNode(child, true, false, node);
+ child = MakeAndAddToTreeFileSystemNodeFromFileListing(listing, node);
+ if(child)
NodeChildLoad(child, node);
- }
+ test = child.name;
+ if(!test)
+ PrintLn("error");
}
}
node.bits.childrenLoaded = true;
{
char path[MAX_LOCATION];
parent.GetPath(path);
+ if(bits.textFileLinesStyle && FileExists(path).isFile)
+ {
+ PrintLn("Test");
+ }
+ else
{
bool added = false;
FileListing listing { path, extensions = extensions };
while(listing.Find())
{
+ char * test;
+ FileSystemNode child = null;
if((!bits.foldersOnly && !bits.filesOnly) ||
(bits.foldersOnly && listing.stats.attribs.isDirectory) ||
(bits.filesOnly && listing.stats.attribs.isFile))
- {
- FileSystemNode child = MakeFileSystemNode(listing.stats, listing.name, listing.path, false, bits.previewPictures, displaySystem);
- AddTreeNode(child, listing.stats.attribs.isFile, !listing.stats.attribs.isFile, parent);
+ child = MakeAndAddToTreeFileSystemNodeFromFileListing(listing, parent);
+ if(child)
added = true;
- }
+ test = child.name;
+ if(!test)
+ PrintLn("error");
}
if(!added)
added = true;
parent.bits.childrenLoaded = true;
}
+ void LoadComparedList()
+ {
+ int c, cmp/*, smallest*/, icon;//, equalCount;
+ int count = comparedPaths ? comparedPaths.count : 0;
+ //bool allDone = false;
+ bool not;
+ FileStats stats;
+ char path[MAX_LOCATION];
+ //Array<ComparisonState> states { };
+ //Array<FileListing> listings { };
+ //Array<int> equals { };
+ //Array<MapNode<String, int>> mapNodes { };
+
+ //Array<Map<String, int>> lists { };
+ //Map<int, bool> equals{ };
+
+
+ MapNode<String, /*Map<int, */Array<int>> na;
+ //MapNode<int, int> nb;
+ Map<String, /*Map<int, */Array<int>> names { };
+ //Map<String, Array<bool>> names { };
+ //Map<String, bool[16]> names { }; // does not seem to be working
+ //Map<String, BoolArrayInt> names { };
+ {
+ for(c = 0; c < comparedPaths.count; c++)
+ {
+ FileListing listing { comparedPaths[c], extensions = extensions };
+ while(listing.Find())
+ {
+ /*Map<int, int>*/Array<int> m = names[listing.name];
+ if(!m)
+ m = { };
+ names[listing.name] = m;
+ /*/m[c] = */m.Add(c);
+ }
+ }
+ /* // compiles and should work but better solution?
+ for(c = 0; c < comparedPaths.count; c++)
+ {
+ FileListing listing { comparedPaths[c], extensions = extensions };
+ while(listing.Find())
+ {
+ Array<bool> a = names[listing.name];
+ if(!a)
+ a = { };
+ names[listing.name] = a;
+ a[c] = true;
+ }
+ }
+ */
+ /* // does not seem to be working
+ for(c = 0; c < comparedPaths.count; c++)
+ {
+ FileListing listing { comparedPaths[c], extensions = extensions };
+ while(listing.Find())
+ {
+ names[listing.name][c] = true;
+ }
+ }
+ */
+ /*
+ if(comparedPaths.count > 0)
+ {
+ FileListing listing { comparedPaths[0], extensions = extensions };
+ while(listing.Find())
+ {
+ // should be able to just do names[listing.name]._0 = true;
+ BoolArrayInt bai = names[listing.name];
+ bai._0 = true;
+ names[listing.name] = bai;
+ }
+ }
+ if(comparedPaths.count > 1)
+ {
+ FileListing listing { comparedPaths[1], extensions = extensions };
+ while(listing.Find())
+ {
+ // should be able to just do names[listing.name]._1 = true;
+ BoolArrayInt bai = names[listing.name];
+ bai._1 = true;
+ names[listing.name] = bai;
+ }
+ }
+ */
+ // and so on....
+ }
+
+ /*
+ for(dirPath : comparedPaths)
+ {
+ char * p = dirPath;
+ if(FileExists(dirPath).isDirectory)
+ {
+ FileListing listing { dirPath, extensions = extensions };
+ //MapNode<String, int> mn;
+ Map<String, int> list { };
+ //states.Add(listing.Find() == true ? matching : endOfListing);
+ while(listing.Find())
+ list[listing.name] = 0;
+ //for(mn = ; mn; mn = mn.next)
+ //mn = list.root.minimum;
+ mapNodes.Add(/-*mn*-/list.root.minimum);
+ lists.Add(list);
+ //PrintLn(dirPath, " -- .Find() -- ", states[states.count-1] == matching ? listing.name : "endOfListing*");
+ //listings.Add(listing);
+
+ {
+ MapNode<String, int> mn;
+ PrintLn("------------- DIR LISTING FOR ", dirPath);
+ for(mn = list.root.minimum; mn; mn = mn.next)
+ {
+ PrintLn(mn.key);
+ }
+ }
+ }
+ }
+ */
+
+ for(na = names.root.minimum; na; na = na.next)
+ {
+ /*Map<int, */Array<int> equals = na.value;
+ //MapNode<int, int> nb;
+ /*
+ while(!allDone)
+ {
+ smallest = 0;
+ equals.Add(0);
+ for(c = 1; c < count; c++)
+ {
+ //if(states[c] == endOfListing) continue;
+ if(!mapNodes[c]) continue;
+ // todo: use better comparison method
+ // it should compare file type (dir/file) before
+ // comparing file name.
+ // should also provide alternative methods
+ // of comparison including ones that consider
+ // date changes as differences of some kind.
+ // pethaps a OnCompare(a, b) to allow implementation
+ // of custom methods of comparison.
+ // note: this (or these) method(s) depend on files
+ // being listed in sorted order by FileListing.
+ // different comparison methods should have
+ // appropriatly different sorting in FileListing.
+ //
+ //cmp = strcmp(listings[smallest].name, listings[c].name);
+ cmp = fstrcmp(mapNodes[smallest].key, mapNodes[c].key);
+ PrintLn("COMPARING - ", mapNodes[smallest].key, " and ", mapNodes[c].key);
+ if(cmp == 0)
+ equals.Add(c);
+ //equals[c] = true;
+ else if(cmp > 0)
+ {
+ smallest = c;
+ equals.size = 0;
+ equals.Add(c);
+ }
+ }
+
+ */
+ if(equals.count == count) // all are equal, no diff icon
+ {
+ icon = 0;
+ not = false;
+ }
+ else if(equals.count == count-1) // all are equal but one, not-sign icon for singled out missing
+ {
+ int i;
+ /*
+ for(nb = equals.root.minimum, i = 0; nb; nb = nb.next, i++)
+ {
+ if(i != nb.key)
+ */
+ for(i = 0; i < equals.count; i++)
+ {
+ if(i != equals[i])
+ {
+ icon = i+1;
+ break;
+ }
+ }
+ //if(!nb)
+ if(i == equals.count)
+ icon = count;
+ not = true;
+ }
+ else if(equals.count == 1) // only one is present, all others missing, present-sign for singled out present
+ {
+ //icon = equals.root.minimum.key+1;
+ icon = equals[0]+1;
+ not = false;
+ }
+ else // mixed
+ {
+ icon = 0; // todo
+ not = true;
+ }
+#if 0
+ // or
+ if(equals.count == count) // all are equal, no diff icon
+ ;
+ else if(count/2 - equals.count < 0) // more than half are equal, use not-sign icons for all missing
+ ;
+ else // less than half are equal, use present-sign icons for all present
+ ;
+#endif
+
+ /*if((!bits.foldersOnly && !bits.filesOnly) ||
+ (bits.foldersOnly && listings[smallest].stats.attribs.isDirectory) ||
+ (bits.filesOnly && listings[smallest].stats.attribs.isFile))*/
+ strcpy(path, comparedPaths[/*smallest*/equals[0]]);
+ PathCat(path, /*mapNodes[smallest].key*/na.key);
+ FileGetStats(path, stats);
+ if((!bits.foldersOnly && !bits.filesOnly) ||
+ (bits.foldersOnly && stats.attribs.isDirectory) ||
+ (bits.filesOnly && stats.attribs.isFile))
+ {
+ FileSystemNode node =
+ MakeComparedFileSystemNode(
+ stats,
+ /*mapNodes[smallest].key*/na.key,
+ path,
+ false, bits.previewPictures,
+ icon, not, equals,
+ displaySystem);
+ AddNode(node);
+ }
+ /*
+ for(equal : equals)
+ {
+ mapNodes[equal] = mapNodes[equal].next;
+ //states[equal] = listings[equal].Find() == true ? matching : endOfListing;
+ //PrintLn(comparedPaths[equal], " -- .Find() -- ", states[equal] == matching ? listings[equal].name : "endOfListing*");
+ }
+ equals.size = 0;
+ //for(c = 0; c < count && states[c] == endOfListing; c++);
+ for(c = 0; c < count && !mapNodes[c]; c++);
+ if(c == count)
+ allDone = true;
+ */
+ }
+ list.Sort(nameField, 1);
+ }
+
void AddNode(FileSystemNode node)
{
DataRow row = list.AddRow();
incref node;
row.SetData(nameField, node);
if(bits.pathColumn)
- row.SetData(pathField, node.path);
+ {
+ char path[MAX_LOCATION];
+ StripLastDirectory(node.path, path);
+ row.SetData(pathField, CopyString(path));
+ }
if(bits.details)
{
if(node.type.isFile)
}
}
- void AddTreeNode(FileSystemNode node, bool loaded, bool addLoader, FileSystemNode addTo)
+ FileSystemNode MakeAndAddToTreeFileSystemNodeFromFileListing(FileListing listing, FileSystemNode parent)
+ {
+ FileSystemNode result = null;
+ /*if((!bits.foldersOnly && !bits.filesOnly) ||
+ (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
+ (bits.filesOnly && listing.stats.attribs.isFile))*/
+ /*if(!listing.stats.attribs.isRemovable && ((!bits.foldersOnly && !bits.filesOnly) ||
+ (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
+ (bits.filesOnly && listing.stats.attribs.isFile)))*/
+ {
+ bool textFileLinesStyle = false;
+ char * test = listing.name;
+ if(!test)
+ PrintLn("error");
+ result = MakeFileSystemNode(listing.stats, listing.name, listing.path, false, bits.previewPictures, false, displaySystem);
+ test = result.name;
+ if(!test)
+ PrintLn("error");
+ if(bits.textFileLinesStyle)
+ {
+ char ext[MAX_LOCATION];
+ GetExtension(listing.name, ext);
+ if(!strcmpi(ext, "txt") || !strcmpi(ext, "text"))
+ textFileLinesStyle = true;
+ }
+ //AddTreeNode(result, true, false, textFileLinesStyle, parent);
+ AddTreeNode(result, !textFileLinesStyle && listing.stats.attribs.isFile, false, !listing.stats.attribs.isFile || textFileLinesStyle, parent);
+ test = result.name;
+ if(!test)
+ PrintLn("error");
+ }
+ return result;
+ }
+
+ void AddTreeNode(
+ FileSystemNode node,
+ bool loaded,
+ bool childrenLoaded,
+ bool addLoader,
+ FileSystemNode addTo)
{
DataRow row = (addTo && addTo.row) ? addTo.row.AddRow() : list.AddRow();
if(addTo)
node.row = row;
row.SetData(null, node);
if(bits.pathColumn)
- row.SetData(pathField, node.path);
+ {
+ char path[MAX_LOCATION];
+ StripLastDirectory(node.path, path);
+ row.SetData(pathField, CopyString(path));
+ }
if(bits.details)
{
if(node.type.isFile)
}
node.bits.loaded = loaded;
+ node.bits.childrenLoaded = childrenLoaded;
if(addLoader)
//AddTreeNode(FileSystemNode { }, false, false, node); // why would this create a compile error?
- AddTreeNode(FileSystemNode { type = none }, false, false, node);
+ AddTreeNode(FileSystemNode { type = none, name = "Loader" }, false, false, false, node);
- if(node.indent > 0)
+ if(node.indent > 0 || bits.mode == list)
row.collapsed = true;
else if(node.type == folder)
node.type = folderOpen;
}
}
+enum ComparisonState { endOfListing, matching };
+
/*
#if 0
class ExplorerView : FileSystemBox
#else
root.name = "/";
#endif
- AddTreeNode(root, true, false, null, tree);
+ AddTreeNode(root, true, false, false, null, tree);
// How can this make sense for linux?
#ifdef __WIN32__
if(info[0])
parent.info = CopyString(info);
parent.loaded = true;
- AddTreeNode(parent, !listing.stats.attribs.isDirectory, listing.stats.attribs.isDirectory, root, tree);
+ AddTreeNode(parent, !listing.stats.attribs.isDirectory, false, listing.stats.attribs.isDirectory, root, tree);
if(!listing.stats.attribs.isDirectory)
parent.childrenLoaded = true;
}
#endif
node = FileSystemNode { name = msNetwork, type = network };
- AddTreeNode(node, false, true, null, tree);
+ AddTreeNode(node, false, false, true, null, tree);
node.row.collapsed = true;
tree.Sort(nameField, 1);
tree.SelectRow(root.row);
class FileSystemNodeBits
{
- bool loaded:1, childrenLoaded:1, displayPath:1;
+ bool loaded:1, childrenLoaded:1, isListItem:1;
};
public class FileSystemNode
int indent;
+ property bool isListItem { set { bits.isListItem = value; } get { return bits.isListItem; } };
+
property char * path
{
set { delete path; if(value && value[0]) path = CopyString(value); }
Bitmap bitmap;
+ int cmpIcon;
+ bool cmpNot;
+ Array<int> exists; // would use (see) BoolArrayInt to pack this into an int if could be accessed as an array
+
void GetPath(String outputPath)
{
if(path)
FileSystemNode copy { };
copy.name = child.name; //CopyString(child.name);
copy.type = child.type;
- fsb.AddTreeNode(copy, child.bits.loaded, false, addTo);
+ fsb.AddTreeNode(copy, child.bits.loaded, false, false, addTo);
if(forceExpanded)
copy.row.collapsed = false;
if(recursive)
int len;
int w, h;
//int textOffset;
- char string[MAX_FILENAME];
+ char * alt;
+ char text[MAX_LOCATION];
+ bool comp;
Bitmap icon;
+ Bitmap diffIcon;
+ Bitmap notIcon;
if(!this)
return;
+ comp = fsb.comparedPaths && fsb.comparedPaths.count > 1;
icon = fsb.fileIcons[type].bitmap;
+ alt = bits.isListItem ? path : name;
+ if(comp && !fsb.bits.columnsCompareStyle && cmpIcon)
+ {
+ /*
+ diffIcon = Bitmap { };
+ diffIcon.AllocateDD(
+ surface.display.displaySystem,
+ fsb.compIcons[cmpIcon].bitmap.width,
+ fsb.compIcons[cmpIcon].bitmap.height);
+ if(fsb.compIcons[cmpIcon].bitmap)
+ diffIcon.Copy(fsb.compIcons[cmpIcon].bitmap);
+ */
+ diffIcon = fsb.compIcons[cmpIcon-1].bitmap;
+ notIcon = fsb.compIcons[countOfCompIconNames-1].bitmap;
+ }
//xStart = indent * indent + x + (icon ? (icon.width + 5) : 0);
- xStart = x + (icon ? (icon.width + 5) : 0);
+ xStart = x + (icon ? (icon.width + 5) : 0) + (comp ? 18*(fsb.bits.columnsCompareStyle ? fsb.comparedPaths.count : 1) : 0);
- if(!name)
+ if(!alt)
return;
if(info)
- sprintf(string, "%s [%s]", label ? label : name, info);
+ sprintf(text, "%s [%s]", label ? label : alt, info);
else
- strcpy(string, label ? label : name);
- len = strlen(string);
+ strcpy(text, label ? label : alt); //"%d-%d/%s", stats.inode, stats.nlink
+ //sprintf(text, "%d-%d/%s", stats.inode, stats.nlink, label ? label : alt);
+ len = strlen(text);
if(!icon)
{
surface.SetForeground(displayFlags.selected ? fsb.selectionText : fsb.foreground);
surface.TextOpacity(false);
- surface.TextExtent(string, len, &w, &h);
+ surface.TextExtent(text, len, &w, &h);
h = Max(h, 16);
// Draw the current row stipple
//surface.Area(xStart + w - 1, y, xStart + w + 1, y + h - 1);
surface.Area(xStart - 3, y, xStart + w + 1, y + h - 1);
- //surface.WriteTextDots(alignment, x + textOffset, y + 2, width - textOffset, name, strlen(name));
- surface.WriteTextDots(alignment, xStart, y + 2, width, string, len);
+ //surface.WriteTextDots(alignment, x + textOffset, y + 2, width - textOffset, alt, strlen(alt));
+ surface.WriteTextDots(alignment, xStart, y + 2, width, text, len);
if(!guiApp.textMode)
{
surface.LineStipple(0);
}
+ if(comp)
+ {
+ if(!fsb.bits.columnsCompareStyle && diffIcon)
+ {
+ w = diffIcon.width;
+ h = diffIcon.height;
+ /*if(cmpNot && notIcon)
+ {
+ Surface s = diffIcon.GetSurface(0,0, {w,h});
+ s.SetForeground(white);
+ s.Blit(notIcon, x,y, 0,0, w,h);
+ delete s;
+ }*/
+ surface.SetForeground(white);
+ surface.Blit(diffIcon, x,y, 0,0, w,h);
+ if(cmpNot && notIcon)
+ surface.Blit(notIcon, x,y, 0,0, w,h);
+ x+=18;
+ //delete diffIcon;
+ }
+ else if(fsb.bits.columnsCompareStyle && exists && exists.count)
+ {
+ int c, d;
+ for(c = d = 0; c < fsb.comparedPaths.count; c++)
+ {
+ if(d == exists.count || exists[d] != c)
+ x+=18;
+ else
+ {
+ diffIcon = fsb.compIcons[c].bitmap;
+ if(diffIcon)
+ {
+ w = diffIcon.width;
+ h = diffIcon.height;
+ surface.SetForeground(white);
+ surface.Blit(diffIcon, x,y, 0,0, w,h);
+ }
+ x+=18;
+ d++;
+ }
+ }
+ /*
+ for(c = d = 0; c < exists.count; c++)
+ {
+ if(exists[c] != d)
+ {
+ d = exists[c]+1;
+ x+=18*(exists[c]-d);
+ }
+ else
+ {
+ diffIcon = fsb.compIcons[exists[c]].bitmap;
+ if(diffIcon)
+ {
+ w = diffIcon.width;
+ h = diffIcon.height;
+ surface.SetForeground(white);
+ surface.Blit(diffIcon, x,y, 0,0, w,h);
+ }
+ d++;
+ x+=18;
+ }
+ }
+ if(exists.count < fsb.comparedPaths.count && exists[exists.count-1] != d)
+ {
+ x+=18*(exists[exists.count-1]-d);
+ }
+ */
+ }
+ else if(fsb.bits.columnsCompareStyle)
+ {
+ x+=18*fsb.comparedPaths.count;
+ }
+ }
if(icon)
{
w = icon.width;
//surface.alphaWrite = blend;
surface.SetForeground(white);
//surface.Blit(icon, x + indent * indentSize, y,0,0, icon.width, icon.height);
- surface.Blit(icon, x,y,0,0, icon.width, icon.height);
+ surface.Blit(icon, x,y, 0,0, w,h);
}
}
}
+ Window OnEdit(DataBox dataBox, DataBox obsolete, int x, int y, int w, int h, void * userData)
+ {
+ EditBox editBox
+ {
+ dataBox, anchor = { 0, 0, 0, 0 };
+ borderStyle = none;
+ //borderStyle = contour;
+ opacity = 1.0f;
+ //background = white;
+ //autoSize = true;
+ contents = name;
+ };
+ //dataBox.borderStyle = none;
+ dataBox.borderStyle = contour;
+ dataBox.background = white;
+ //dataBox.opacity = 0.0f;
+ editBox.Create();
+ return editBox;
+ }
+
+ bool OnSaveEdit(EditBox editBox, void * object)
+ {
+ bool changed = false;
+ if(editBox.modifiedDocument)
+ {
+#if 0
+ // how the heck did this work for PathBox? :S
+ //String::OnFree();
+ //changed = _class._vTbl[__ecereVMethodID_class_OnGetDataFromString](_class, &this, editBox.contents);
+ PrintLn(name);
+ //if(strcmp(editBox.contents, this.name))
+ ;
+ /*{
+ //changed = NotifyNodeRename(this.master, this, node);
+ changed = true;
+ if(changed && RenameFile(name, editBox.contents))
+ {
+ name = editBox.contents;
+ }
+ else
+ {
+ changed = false;
+ }
+ }*/
+#endif
+ }
+ return changed;
+ }
+
int OnCompare(FileSystemNode b)
{
int result;
FileSystemNode a = this;
if(a.type == b.type || (a.type < folder && b.type < folder) || (a.type >= drive))
+ {
+ if(!a.name || !b.name)
+ PrintLn("error: FileSystemNode::OnCompare -- null-named node");
result = strcmpi(a.name, b.name);
+ }
else
{
if(a.type == folder && b.type < folder) result = -1;
return result;
}
- /*int OnCompare(FileSystemNode b)
+#if 0
+ //int OnCompare(FileSystemNode b)
+ //{
+ //int result;
+ //FileSystemNode a = this;
+ //if(a.parent < b.parent) result = -1;
+ //else if(a.parent > b.parent) result = 1;
+ //else
+ //result = fstrcmp(a.name, b.name);
+ //return result;
+ //}
+#endif
+
+ bool OnGetDataFromString(char * string)
{
- int result;
- FileSystemNode a = this;
- if(a.parent < b.parent) result = -1;
- else if(a.parent > b.parent) result = 1;
- else
- result = fstrcmp(a.name, b.name);
- return result;
- }*/
+#if 0
+ if(string && *string)
+ {
+ int len = strlen(string) + 1;
+ name = new char[len];
+ CopyBytes(name, string, len);
+ return true;
+ }
+#endif
+ return false;
+ }
char * OnGetString(char * tempString, FileSystemToolWindow fileSysToolWnd, bool * needClass)
{
const char * path,
const bool pathAddName,
const bool previewPicture,
+ const bool isListItem,
const DisplaySystem displaySystem)
{
int len = strlen(name);
node.bitmap.Load(path, null, displaySystem);
}
+ if(isListItem)
+ node.bits.isListItem = true;
+
return node;
}
+
+FileSystemNode MakeComparedFileSystemNode(
+ const FileStats stats,
+ const char * name,
+ const char * path,
+ const bool pathAddName,
+ const bool previewPicture,
+ const int cmpIcon,
+ const bool cmpNot,
+ const Array<int> exists,
+ const DisplaySystem displaySystem)
+{
+ FileSystemNode node = MakeFileSystemNode(stats, name, path, pathAddName, previewPicture, false, displaySystem);
+ if(node)
+ {
+ node.cmpIcon = cmpIcon;
+ node.cmpNot = cmpNot;
+ node.exists = exists;
+ }
+ return node;
+}
+
+#if 0 // could we do this?
+class BoolArrayInt : int
+{
+ // packing 32 bools in one int exposing them as an array
+ bool [32]:1; // the :1 specifies the size of each element
+ // byte [4]:8; // packing 4 bytes in an int exposing them as an arrat
+}
+// allowing you to access each 32 bits with the following notation:
+static void Dummy()
+{
+ int c;
+ BoolArrayInt a;
+ a[0] = true;
+ a[31] = false;
+ for(c = 0; c < 32; c++)
+ a[c] = SomFunction(...);
+}
+#endif
+class BoolArrayInt : int
+{
+ bool _0:1;
+ bool _1:1;
+ bool _2:1;
+ bool _3:1;
+ bool _4:1;
+ bool _5:1;
+ bool _6:1;
+ bool _7:1;
+ bool _8:1;
+ bool _9:1;
+ bool _10:1;
+ bool _11:1;
+ bool _12:1;
+ bool _13:1;
+ bool _14:1;
+ bool _15:1;
+}
Ecere Software / ede / blobdiff