Revert "libede: FileSystemBox: added filesOnly option"

This reverts commit 8cfd06c4acf7adbed6c07e4ce6e2b2438937d451.

diff --git a/libede/src/FileSystemBox.ec b/libede/src/FileSystemBox.ec
index 69d71eb..b73a3d3 100644 (file)
--- a/libede/src/FileSystemBox.ec
+++ b/libede/src/FileSystemBox.ec
@@ -457,7 +457,7 @@ static FileSystemNode MakeFileSystemNode(const FileStats stats, const char * fil
 
 class FileSystemBoxBits
 {
-   bool foldersOnly:1, filesOnly:1, details:1, treeBranches:1, previewPictures:1;
+   bool foldersOnly:1, details:1, treeBranches:1, previewPictures: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;
@@ -500,8 +500,7 @@ public:
       //isset { return path && path[0]; }
    }
 
-   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 foldersOnly { set { bits.foldersOnly = value; } get { return bits.foldersOnly; } };
    property bool previewPictures { set { bits.previewPictures = value; } get { return bits.previewPictures; } };
    property char * extensions { set { delete extensions; if(value && value[0]) extensions = CopyString(value); } get { return extensions; } }
    property bool details { set { bits.details = value; } get { return bits.details; } };
@@ -796,9 +795,7 @@ private:
       list.Clear();
       while(listing.Find())
       {
-         if((!bits.foldersOnly && !bits.filesOnly) ||
-            (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
-            (bits.filesOnly && !listing.stats.attribs.isDirectory/*listing.stats.attribs.isFile*/)) // TOCHECK: isFile broken?
+         if(!bits.foldersOnly || listing.stats.attribs.isDirectory)
          {
             FileSystemNode node = MakeFileSystemNode(listing.stats, listing.name, listing.path, bits.previewPictures, displaySystem);
             DataRow row = list.AddRow();
@@ -892,9 +889,7 @@ private:
 
             while(listing.Find())
             {
-               if((!bits.foldersOnly && !bits.filesOnly) ||
-                  (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
-                  (bits.filesOnly && !listing.stats.attribs.isDirectory/*listing.stats.attribs.isFile*/)) // TOCHECK: isFile broken?
+               if(!bits.foldersOnly || listing.stats.attribs.isDirectory)
                {
                   FileSystemNode child = MakeFileSystemNode(listing.stats, listing.name, listing.path, bits.previewPictures, displaySystem);
                   AddTreeNode(child, true, false, node);
@@ -933,9 +928,7 @@ private:
          FileListing listing { path, extensions = extensions };
          while(listing.Find())
          {
-            if((!bits.foldersOnly && !bits.filesOnly) ||
-               (bits.foldersOnly && listing.stats.attribs.isDirectory) ||
-               (bits.filesOnly && !listing.stats.attribs.isDirectory/*listing.stats.attribs.isFile*/)) // TOCHECK: isFile broken?
+            if(!bits.foldersOnly || listing.stats.attribs.isDirectory)
             {
                FileSystemNode child = MakeFileSystemNode(listing.stats, listing.name, listing.path, bits.previewPictures, displaySystem);
                AddTreeNode(child, true, false, parent);

diff --git a/tests/libede/fileSystemBoxTestApp/FileSystemBoxTestApp.ec b/tests/libede/fileSystemBoxTestApp/FileSystemBoxTestApp.ec
index 3ef0a97..2f6d75a 100644 (file)
--- a/tests/libede/fileSystemBoxTestApp/FileSystemBoxTestApp.ec
+++ b/tests/libede/fileSystemBoxTestApp/FileSystemBoxTestApp.ec
@@ -14,7 +14,6 @@ class FileSystemBoxTestWindow : Window
    TabControl tabControl { this, background = activeBorder, anchor = { left = 4, top = 4, right = 4, bottom = 4 } };
 
    FileListTab fileListTab { tabControl };
-   JustFilesTab justFilesTab { tabControl };
    FolderListTab folderListTab { tabControl };
    FileTreeTab fileTreeTab { tabControl };
    FolderTreeTab folderTreeTab { tabControl };
@@ -43,18 +42,6 @@ class FileListTab : TestTab
    };
 }
 
-class JustFilesTab : TestTab
-{
-   text = "JustFiles";
-
-   FileSystemBox box
-   {
-      this;
-      filesOnly = true;
-      anchor = { left = 4, top = 4, right = 4, bottom = 4 };
-   };
-}
-
 class FolderListTab : TestTab
 {
    text = "FolderList";