From a51c058696d5ec735994790770fa8ca1d4dbcb7d Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 17 Dec 2014 16:24:01 +0300
Subject: [PATCH] File Dialog - continue development; StringGridWidget -
 support custom drawn cells adapter

---
 res/mdpi/folder.png           | Bin 0 -> 652 bytes
 res/mdpi/text-plain.png       | Bin 0 -> 540 bytes
 src/dlangui/core/files.d      |  59 +++++++++++++++++++++
 src/dlangui/dialogs/filedlg.d |  96 ++++++++++++++++++++++++++++++----
 src/dlangui/widgets/grid.d    |  23 ++++++++
 5 files changed, 168 insertions(+), 10 deletions(-)
 create mode 100644 res/mdpi/folder.png
 create mode 100644 res/mdpi/text-plain.png

diff --git a/res/mdpi/folder.png b/res/mdpi/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c1962412823b050818788b4142d61e43a65428
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipY*
z5i2$wS3qO{00In2L_t(I%Z-xHOI1-2$3HXoc%Ql~sGvo;EF+;Gt}+*<AwdwhY1h78
zt%AV+CZdQoNl{b~B1Q&67PTmdj6^MZzI^7r_sq1o_r0!A)NBrCnEC!<;4d{beUJYs
znVOz?9z}<75C9iKn!LVsef-G3mZzp?kjX1IeB$gR9&=QMBndot^32mT6(m6c15^PA
zkq$}Y&CP442g8r%I$P}x7T>R<C<A-@7#$uGLvX;{a93iCm<whG+QY)j7l#4D#<vxk
ztxbxpO%jE7A6vvcvbMI&X7fANu_mR0=rFK<H;Z$R%M1>VT=GN5NBQt+jYI_yer~lm
zH+GB*=f^PfdSrmn2nm*?yj^<rD4aMo%GJvkX|=ae6#(3Y?d^=kr4_Q=kZP4u1R)3#
zdU<;1_IU85pV@^k6j|0C08kM;fgUYG^a@0PXih^E(Lit)RDg;-0b&QpAOk|xlbV^r
z92|ms`HAKTPyk99mPomjRe;(7b}(}acY?cP(J7+u@af&iewWuQ7SV8Xf{37+kf?Pn
zbl9wVr3O~^9ZeDxA*_6Da({jaw_*pA)>QZ(&N!rfEPq}l9N4#up`(MuBJVQQrPg~^
z15O)#%&pE7Hrm<4EVqdwcSOLv46=vn?kh=o1r!8uClYDreplFY@(e{j0toJkAh=7{
mzB`Ci0;CitVmMB3|LiaPSNus#?|G&G0000<MNUMnLSTY}6cQBx

literal 0
HcmV?d00001

diff --git a/res/mdpi/text-plain.png b/res/mdpi/text-plain.png
new file mode 100644
index 0000000000000000000000000000000000000000..91b7da5cba8e16c01048f80843e95d4fa8e56dea
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005wNkl<Zc-oay
zO=}ua6qU58o75_%TUR!qLMWx1EYfye=>N&G8<8|5R)2wiKvEa}hEY4}7{M67VkNUs
zjHA)aj2|<n_g%6OG6U^_!@IoUo^$TIj7K0C4DQi!L_GdS9(ldqH=ZpV<3B+?U$+Im
zfbiq=6c4i*y6rZUY87Q!hFmJ4R;i#MNnE#EElf2{2z+}cU>XLr`+Gc0r<jwF;9@?<
zj2iUEM^Q5g&I0FWXK0gql^lzO0<LN`l!`@^%Vm_v{ifN(Z#pM#2{!AsaAK~OOXhmD
z!kX?yy);cM>2yu-GnwQWt2DnX%bY+VRwz-8&cR@Sdc6)^*Bu2ID{|ayHeB1b4a>5`
z9j7o1gPUCwq*5uUs>*JPqVRk4Z*S4-_4o}MjRtRHI2^hsu*jX91-TxLM#$xI_;q=S
zY&MI0K5x^V5cv2^Ae~M_y}QGoejnX#muHX1<Jf{N*7*ML@FW(C?Kmc|ElbSJGcOhk
zWHK2DOePci=K31ZX!Lt16nep3jtNwix6q<(G->aNM1pmDoem<ANaF4O{>!aCmn}TK
z_;@^qBuTbT^}B<Ei$Eao%Hx7h0C;W!uhBG3Xqtu&IfujHq|fK`dfedm`(Ho(rk@@7
efxhp$_5KB@p+<UUD-iww0000<MNUMnLSTZ^hWio#

literal 0
HcmV?d00001

diff --git a/src/dlangui/core/files.d b/src/dlangui/core/files.d
index 22e8c4f4..7f64ac07 100644
--- a/src/dlangui/core/files.d
+++ b/src/dlangui/core/files.d
@@ -143,11 +143,70 @@ struct RootEntry {
     return res;
 }
 
+/// returns true if directory is root directory (e.g. / or C:\)
+bool isRoot(string path) {
+    string root = rootName(path);
+    if (path.equal(root))
+        return true;
+    return false;
+}
+
+/// Filters file name by pattern list
+bool filterFilename(string filename, string[] filters) {
+    return true;
+}
+
+/** List directory content 
+    
+    Optionally filters file names by filter.
+
+    Result will be placed into entries array.
+
+    Returns true if directory exists and listed successfully, false otherwise.
+*/
+bool listDirectory(string dir, bool includeDirs, bool includeFiles, string[] filters, ref DirEntry[] entries) {
+    entries.length = 0;
+    if (!isDir(dir)) {
+        return false;
+    }
+    if (!isRoot(dir) && includeDirs) {
+        entries ~= DirEntry(appendPath(dir, ".."));
+    }
+
+    try {
+        DirEntry[] dirs;
+        DirEntry[] files;
+        foreach (DirEntry e; dirEntries(dir, SpanMode.shallow)) {
+            if (e.isDir) {
+                dirs ~= e;
+            } else if (e.isFile) {
+                files ~= e;
+            }
+        }
+        if (includeDirs)
+            foreach(DirEntry e; dirs)
+                entries ~= e;
+        if (includeFiles)
+            foreach(DirEntry e; files)
+                if (filterFilename(e.name, filters))
+                    entries ~= e;
+        return true;
+    } catch (FileException e) {
+        return false;
+    }
+
+}
+
 /** Returns true if char ch is / or \ slash */
 bool isPathDelimiter(char ch) {
     return ch == '/' || ch == '\\';
 }
 
+/// Returns current directory
+@property string currentDir() {
+    return getcwd();
+}
+
 /** Returns current executable path only, including last path delimiter - removes executable name from result of std.file.thisExePath() */
 @property string exePath() {
     string path = thisExePath();
diff --git a/src/dlangui/dialogs/filedlg.d b/src/dlangui/dialogs/filedlg.d
index 2c46e0ac..747cd407 100644
--- a/src/dlangui/dialogs/filedlg.d
+++ b/src/dlangui/dialogs/filedlg.d
@@ -35,6 +35,12 @@ import dlangui.widgets.grid;
 import dlangui.widgets.editors;
 import dlangui.platforms.common.platform;
 import dlangui.dialogs.dialog;
+
+private import std.file;
+private import std.path;
+private import std.utf;
+private import std.conv : to;
+
 
 /// flags for file dialog options
 enum FileDialogFlag : uint {
@@ -49,7 +55,7 @@ enum FileDialogFlag : uint {
 }
 
 /// File open / save dialog
-class FileDialog : Dialog {
+class FileDialog : Dialog, CustomGridCellAdapter {
 	protected EditLine path;
 	protected EditLine filename;
 	protected StringGridWidget list;
@@ -58,15 +64,80 @@ class FileDialog : Dialog {
 	protected VerticalLayout rightPanel;
 
     protected RootEntry[] _roots;
+    protected string _path;
+    protected string _filename;
+    protected DirEntry[] _entries;
+    protected bool _isRoot;
 
 	this(UIString caption, Window parent, uint fileDialogFlags = DialogFlag.Modal | FileDialogFlag.FileMustExist) {
         super(caption, parent, fileDialogFlags);
     }
 
-    protected void rootEntrySelected(RootEntry entry) {
-        // TODO
+    protected bool openDirectory(string dir) {
+        list.rows = 0;
+        string[] filters;
+        if (!listDirectory(dir, true, true, filters, _entries))
+            return false;
+        _path = dir;
+        _isRoot = isRoot(dir);
+        path.text = toUTF32(_path);
+        list.rows = _entries.length;
+        for (int i = 0; i < _entries.length; i++) {
+            string fname = baseName(_entries[i].name);
+            string sz;
+            string date;
+            bool d = _entries[i].isDir;
+            list.setCellText(1, i, toUTF32(fname));
+            if (d) {
+                list.setCellText(0, i, "folder");
+            } else {
+                list.setCellText(0, i, "text-plain"d);
+                sz = to!string(_entries[i].size);
+                date = "2014-01-01 00:00:00";
+            }
+            list.setCellText(2, i, toUTF32(sz));
+            list.setCellText(3, i, toUTF32(date));
+        }
+        list.autoFitColumnWidths();
+        return true;
     }
 
+    /// return true for custom drawn cell
+    override bool isCustomCell(int col, int row) {
+        if (col == 0 && row >= 0)
+            return true;
+        return false;
+    }
+
+    protected DrawableRef rowIcon(int row) {
+        string iconId = toUTF8(list.cellText(0, row));
+        DrawableRef res;
+        if (iconId.length)
+            res = drawableCache.get(iconId);
+        return res;
+    }
+
+    /// return cell size
+    override Point measureCell(int col, int row) {
+        DrawableRef icon = rowIcon(row);
+        if (icon.isNull)
+            return Point(0, 0);
+        return Point(icon.width + 2, icon.height + 2);
+    }
+
+	/// draw data cell content
+	override void drawCell(DrawBuf buf, Rect rc, int col, int row) {
+        DrawableRef img = rowIcon(row);
+        if (!img.isNull) {
+            Point sz;
+            sz.x = img.width;
+            sz.y = img.height;
+            applyAlign(rc, sz, Align.HCenter, Align.VCenter);
+            uint st = state;
+            img.drawTo(buf, rc, st);
+        }
+    }
+
     protected Widget createRootsList() {
         ListWidget list = new ListWidget("ROOTS_LIST");
         WidgetListAdapter adapter = new WidgetListAdapter();
@@ -76,7 +147,7 @@ class FileDialog : Dialog {
             btn.styleId = "TRANSPARENT_BUTTON_BACKGROUND";
             btn.focusable = false;
             btn.onClickListener = delegate(Widget source) {
-                rootEntrySelected(root);
+                openDirectory(root.path);
                 return true;
             };
             adapter.widgets.add(btn);
@@ -110,10 +181,11 @@ class FileDialog : Dialog {
 		rightPanel.addChild(path);
 		list = new StringGridWidget("files");
 		list.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
-		list.resize(3, 3);
-		list.setColTitle(0, "Name"d);
-		list.setColTitle(1, "Size"d);
-		list.setColTitle(2, "Modified"d);
+		list.resize(4, 3);
+		list.setColTitle(0, " "d);
+		list.setColTitle(1, "Name"d);
+		list.setColTitle(2, "Size"d);
+		list.setColTitle(3, "Modified"d);
 		list.showRowHeaders = false;
 		list.rowSelect = true;
 		rightPanel.addChild(list);
@@ -128,7 +200,11 @@ class FileDialog : Dialog {
 		addChild(content);
 		addChild(createButtonsPanel([ACTION_OPEN, ACTION_CANCEL], 0, 0));
 
-		string[] path = splitPath("/home/lve/src");
-		Log.d("path: ", path);
+		//string[] path = splitPath("/home/lve/src");
+		//Log.d("path: ", path);
+
+        list.customCellAdapter = this;
+
+        openDirectory(currentDir);
 	}
 }
diff --git a/src/dlangui/widgets/grid.d b/src/dlangui/widgets/grid.d
index 56956f5d..150b250a 100644
--- a/src/dlangui/widgets/grid.d
+++ b/src/dlangui/widgets/grid.d
@@ -202,8 +202,25 @@ enum GridActions : int {
 	SelectDocumentEnd,
 }
 
+interface CustomGridCellAdapter {
+    /// return true for custom drawn cell
+    bool isCustomCell(int col, int row);
+    /// return cell size
+    Point measureCell(int col, int row);
+	/// draw data cell content
+	void drawCell(DrawBuf buf, Rect rc, int col, int row);
+}
+
 /// Abstract grid widget
 class GridWidgetBase : ScrollWidgetBase {
+    protected CustomGridCellAdapter _customCellAdapter;
+
+    /// Get adapter to override drawing of some particular cells
+    @property CustomGridCellAdapter customCellAdapter() { return _customCellAdapter; }
+    /// Set adapter to override drawing of some particular cells
+    @property GridWidgetBase customCellAdapter(CustomGridCellAdapter adapter) { _customCellAdapter = adapter; return this; }
+
+
     /// column count (including header columns and fixed columns)
 	protected int _cols;
     /// row count (including header rows and fixed rows)
@@ -1140,6 +1157,9 @@ class StringGridWidget : StringGridWidgetBase {
 	}
 
     protected override Point measureCell(int x, int y) {
+        if (_customCellAdapter && _customCellAdapter.isCustomCell(x, y)) {
+            return _customCellAdapter.measureCell(x, y);
+        }
 		//Log.d("measureCell ", x, ", ", y);
 		FontRef fnt = font;
         dstring txt;
@@ -1158,6 +1178,9 @@ class StringGridWidget : StringGridWidgetBase {
 
 	/// draw cell content
 	protected override void drawCell(DrawBuf buf, Rect rc, int col, int row) {
+        if (_customCellAdapter && _customCellAdapter.isCustomCell(col, row)) {
+            return _customCellAdapter.drawCell(buf, rc, col, row);
+        }
         rc.shrink(2, 1);
 		FontRef fnt = font;
         dstring txt = cellText(col, row);