X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?p=ede;a=blobdiff_plain;f=libede%2Fsrc%2FFileSystemBox.ec;h=8557aac2c2c7c218c32f8ef1549edb23b5f04535;hp=e184693e9848f0e13e5790a52f5ea0a2035ab1ce;hb=a6de2d6f9b217a71c50e998222d31a9f091ff131;hpb=47c68b7269adbb7d1b22fefb8b4cecbd3afb1c0c diff --git a/libede/src/FileSystemBox.ec b/libede/src/FileSystemBox.ec index e184693..8557aac 100644 --- a/libede/src/FileSystemBox.ec +++ b/libede/src/FileSystemBox.ec @@ -582,14 +582,7 @@ private: (bits.filesOnly && listing.stats.attribs.isFile)) { FileSystemNode node = MakeFileSystemNode(listing.stats, listing.name, listing.path, bits.previewPictures, displaySystem); - DataRow row = list.AddRow(); - row.tag = (int)node; - row.SetData(nameField, node); - if(bits.details) - { - row.SetData(typeField, node.extension); - row.SetData(sizeField, (void *)node.stats.size); - } + AddNode(node); } } list.Sort(nameField, 1); @@ -735,6 +728,18 @@ private: parent.childrenLoaded = true; } + void AddNode(FileSystemNode node) + { + DataRow row = list.AddRow(); + row.tag = (int)node; + row.SetData(nameField, node); + if(bits.details) + { + row.SetData(typeField, node.extension); + row.SetData(sizeField, (void *)node.stats.size); + } + } + void AddTreeNode(FileSystemNode node, bool loaded, bool addLoader, FileSystemNode addTo) { DataRow row = (addTo && addTo.row) ? addTo.row.AddRow() : list.AddRow(); @@ -747,6 +752,11 @@ private: row.tag = (int)node; node.row = row; row.SetData(null, node); + if(bits.details) + { + row.SetData(typeField, node.extension); + row.SetData(sizeField, (void *)node.stats.size); + } node.loaded = loaded; if(addLoader) @@ -1871,12 +1881,15 @@ public: } } else + { /*#ifdef __WIN32__ strcpy(outputPath, "/"); #else*/ - strcpy(outputPath, name); + //strcpy(outputPath, name); + strcpy(outputPath, path); + PathCat(outputPath, name); //#endif - + } } bool IsChildOf(FileSystemNode node) @@ -2108,7 +2121,8 @@ public: } return node; }*/ -static FileSystemNode MakeFileSystemNode(const FileStats stats, + +FileSystemNode MakeFileSystemNode(const FileStats stats, const char * fileName, const char * filePath, const bool previewPicture, const DisplaySystem displaySystem) {