Revert "libede:FileSystemBox: complete migration of previewPictures support code...

[ede] / libede / src / FileSystemBox.ec

diff --git a/libede/src/FileSystemBox.ec b/libede/src/FileSystemBox.ec
index 69d71eb..550dd3f 100644 (file)
--- a/libede/src/FileSystemBox.ec
+++ b/libede/src/FileSystemBox.ec
@@ -391,7 +391,9 @@ public:
    }
    return node;
 }*/
-static FileSystemNode MakeFileSystemNode(const FileStats stats, const char * fileName, const char * filePath, const bool previewPicture, const DisplaySystem displaySystem)
+static FileSystemNode MakeFileSystemNode(const FileStats stats,
+      const char * fileName, const char * filePath,
+      const bool previewPicture, const DisplaySystem displaySystem)
 {
    int len = strlen(fileName);
    char info[MAX_LOCATION];
@@ -457,7 +459,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, filesOnly:1, details:1, treeBranches:1, previewPictures:1, navigateFolders: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;
@@ -484,6 +486,7 @@ public:
    FileSystemNode selection;
 
    virtual bool Window::NotifyNodeSelect(FileSystemBox box, FileSystemNode node);
+   virtual bool Window::NotifyNodeOpen(FileSystemBox box, FileSystemNode node);
    
    property char * path
    {
@@ -492,6 +495,8 @@ public:
          delete path;
          if(value && value[0])
             path = CopyString(value);
+         if(locationBox)
+            locationBox.path = value;
          if(created)
             Load();
       }
@@ -516,6 +521,7 @@ public:
       }
       get { return bits.treeBranches; }
    };
+   property bool navigateFolders { set { bits.navigateFolders = value; bits.foldersOnly = !value; } get { return bits.navigateFolders; } };
    
    property FileSystemNode node
    {
@@ -531,6 +537,8 @@ public:
       }
    }
 
+   PathBox locationBox;
+
    void Select(FileSystemNode node)
    {
       if(node.row)
@@ -552,6 +560,11 @@ public:
       return null;
    }
 
+   void Refresh()
+   {
+      Load();
+   }
+
 private:
    FileSystemBoxBits bits;
 
@@ -717,8 +730,35 @@ private:
          return true;
       }
 
+      bool NotifyDoubleClick(ListBox listBox, int x, int y, Modifiers mods)
+      {
+         return OpenNode();
+      }
+
+      bool NotifyKeyDown(ListBox listBox, DataRow row, Key key, unichar ch)
+      {
+         bool result;
+         if((SmartKey)key == enter)
+            result = OpenNode();
+         else
+            result = true;
+         return true;
+      }
    };
 
+   bool OpenNode()
+   {
+      bool result;
+      if(selection && selection.type.isFolder && bits.navigateFolders)
+      {
+         property::path = selection.path;
+         result = true;
+      }
+      else
+         result = NotifyNodeOpen(this.master, this, selection);
+      return result;
+   }
+
    // Edit Menu
    Menu editMenu { menu, "Edit", e };
    MenuItem itemEditCut