Skip to content

Commit 9ea75a4

Browse files
DC-SWATDC-SWAT
committed
[app-fm] Enhanced modal dialog and file operations.
- Enhanced modal dialog with progress bar and updated UI. - Support for creating directory. - Support for deleting directory with it contents. - Support for copying directories with it contents. - Show messages in modal dialog instead of console. This also should solve #116
1 parent 54b3d43 commit 9ea75a4

File tree

4 files changed

+509
-222
lines changed

4 files changed

+509
-222
lines changed

‎applications/filemanager/app.xml‎

Lines changed: 93 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<app name="File Manager" version="0.7.0" icon="images/icon.png">
2+
<app name="File Manager" version="0.8.0" icon="images/icon.png">
33
<resources>
44
<module src="../../modules/tolua.klf" />
55
<module src="../../modules/luaDS.klf" />
@@ -14,6 +14,8 @@
1414
<image src="images/toolbar/delete_highlight.png" name="icon-delete-high" />
1515
<image src="images/toolbar/rename_norm.png" name="icon-rename" />
1616
<image src="images/toolbar/rename_highlight.png" name="icon-rename-high" />
17+
<image src="images/toolbar/mkdir_norm.png" name="icon-mkdir" />
18+
<image src="images/toolbar/mkdir_highlight.png" name="icon-mkdir-high" />
1719
<image src="images/toolbar/zip_norm.png" name="icon-zip" />
1820
<image src="images/toolbar/zip_highlight.png" name="icon-zip-high" />
1921
<image src="images/toolbar/cd_norm.png" name="icon-cd" />
@@ -28,25 +30,44 @@
2830
<image src="../../gui/icons/highlight/cancel/32x32.png" name="but-cancel-high" />
2931
<surface width="640" height="480" name="background">
3032
<fill color="#99CBDB" />
31-
<fill x="10" y="25" width="620" height="455" color="#BBBBBB" />
33+
<fill x="13" y="28" width="614" height="443" color="#AAAAAA" />
34+
<fill x="14" y="29" width="612" height="441" color="#D9D9D9" />
35+
<fill x="14" y="29" width="612" height="1" color="#FBFBFB" />
36+
<fill x="15" y="249" width="610" height="1" color="#AAAAAA" />
37+
<fill x="15" y="250" width="610" height="1" color="#FBFBFB" />
3238
</surface>
3339
<surface width="305" height="110" name="white-bg">
3440
<fill color="#FFFFFF" />
3541
</surface>
3642
<surface width="305" height="110" name="blue-bg">
3743
<fill color="#EEFBFF" />
3844
</surface>
39-
<surface width="320" height="150" name="modal-bg">
40-
<fill color="#BBBBBB" />
41-
<fill x="1%" y="2%" width="98%" height="96%" color="#EEEEEE" />
45+
<surface width="480" height="150" name="modal-bg">
46+
<fill color="#555555" />
47+
<fill x="0" y="0" width="480" height="149" color="#AAAAAA" />
48+
<fill x="1" y="1" width="478" height="147" color="#EEEEEE" />
49+
<fill x="2" y="2" width="476" height="145" color="#D9D9D9" />
50+
<fill x="2" y="2" width="476" height="1" color="#FBFBFB" />
51+
</surface>
52+
<surface width="470" height="14" name="progress-bg">
53+
<fill color="#555555" />
54+
<fill x="1" y="1" width="468" height="12" color="#D9D9D9" />
55+
</surface>
56+
<surface width="470" height="14" name="progress-bar">
57+
<fill color="#5E88B8" />
58+
<fill x="1" y="1" width="468" height="12" color="#82B3E8" />
4259
</surface>
43-
<surface width="310" height="30" name="input-normal">
44-
<fill width="310" height="30" color="#555555" />
45-
<fill x="1" y="1" width="308" height="28" color="#F5F5F5" />
60+
<surface width="470" height="30" name="input-normal">
61+
<fill width="470" height="30" color="#555555" />
62+
<fill x="1" y="1" width="468" height="28" color="#F5F5F5" />
4663
</surface>
47-
<surface width="310" height="30" name="input-focus">
64+
<surface width="470" height="30" name="input-focus">
4865
<fill color="#AAAAAA" />
49-
<fill x="1" y="1" width="308" height="28" color="#D9F5FF" />
66+
<fill x="1" y="1" width="468" height="28" color="#D9F5FF" />
67+
</surface>
68+
<surface width="470" height="30" name="input-highlight">
69+
<fill color="#AAAAAA" />
70+
<fill x="1" y="1" width="468" height="28" color="#FFFFE0" />
5071
</surface>
5172
<surface width="590" height="28" name="item-normal">
5273
<fill height="1" color="#FFFFFF" />
@@ -86,55 +107,63 @@
86107
</resources>
87108
<body width="640" height="480" background="background" onload="FileManager:Initialize()" onunload="FileManager:Shutdown()">
88109
<label width="340" height="25" x="20" y="2" font="arial" color="#000000" name="title" text="File Manager" align="left" />
89-
<panel x="365" y="2" width="280" height="22" name="toolbar-panel">
90-
<input type="button"
91-
onclick="FileManager:openFile()"
92-
onmouseover="FileManager:tooltip('Open selected file')"
93-
onmouseout="FileManager:tooltip(nil)"
94-
normal="icon-exec"
95-
highlight="icon-exec-high"
96-
pressed="icon-exec"
97-
x="10" y="0" width="22" height="22" />
98-
<input type="button"
99-
onclick="FileManager:toolbarArchive()"
100-
onmouseover="FileManager:tooltip('Exctract/compress selected file')"
101-
onmouseout="FileManager:tooltip(nil)"
102-
normal="icon-zip"
103-
highlight="icon-zip-high"
104-
pressed="icon-zip"
105-
x="38" y="0" width="22" height="22" />
110+
<panel x="365" y="4" width="280" height="22" name="toolbar-panel">
106111
<input type="button"
107112
onclick="FileManager:toolbarCopy()"
108-
onmouseover="FileManager:tooltip('Copy selected file')"
113+
onmouseover="FileManager:tooltip('Copy selected item')"
109114
onmouseout="FileManager:tooltip(nil)"
110115
normal="icon-copy"
111116
highlight="icon-copy-high"
112117
pressed="icon-copy"
113-
x="66" y="0" width="22" height="22" />
118+
x="5" y="0" width="22" height="22" />
119+
<input type="button"
120+
onclick="FileManager:toolbarDelete()"
121+
onmouseover="FileManager:tooltip('Delete selected item')"
122+
onmouseout="FileManager:tooltip(nil)"
123+
normal="icon-delete"
124+
highlight="icon-delete-high"
125+
pressed="icon-delete"
126+
x="31" y="0" width="22" height="22" />
127+
<input type="button"
128+
onclick="FileManager:toolbarMkdir()"
129+
onmouseover="FileManager:tooltip('Create a new directory')"
130+
onmouseout="FileManager:tooltip(nil)"
131+
normal="icon-mkdir"
132+
highlight="icon-mkdir-high"
133+
pressed="icon-mkdir"
134+
x="57" y="0" width="22" height="22" />
114135
<input type="button"
115136
onclick="FileManager:toolbarRename()"
116-
onmouseover="FileManager:tooltip('Rename selected file')"
137+
onmouseover="FileManager:tooltip('Rename selected item')"
117138
onmouseout="FileManager:tooltip(nil)"
118139
normal="icon-rename"
119140
highlight="icon-rename-high"
120141
pressed="icon-rename"
121-
x="94" y="0" width="22" height="22" />
142+
x="83" y="0" width="22" height="22" />
122143
<input type="button"
123-
onclick="FileManager:toolbarDelete()"
124-
onmouseover="FileManager:tooltip('Delete selected file')"
144+
onclick="FileManager:openFile()"
145+
onmouseover="FileManager:tooltip('Open selected file')"
125146
onmouseout="FileManager:tooltip(nil)"
126-
normal="icon-delete"
127-
highlight="icon-delete-high"
128-
pressed="icon-delete"
129-
x="122" y="0" width="22" height="22" />
147+
normal="icon-exec"
148+
highlight="icon-exec-high"
149+
pressed="icon-exec"
150+
x="121" y="0" width="22" height="22" />
151+
<input type="button"
152+
onclick="FileManager:toolbarArchive()"
153+
onmouseover="FileManager:tooltip('Exctract/compress selected file')"
154+
onmouseout="FileManager:tooltip(nil)"
155+
normal="icon-zip"
156+
highlight="icon-zip-high"
157+
pressed="icon-zip"
158+
x="147" y="0" width="22" height="22" />
130159
<input type="button"
131160
onclick="FileManager:toolbarMountISO()"
132161
onmouseover="FileManager:tooltip('Mount selected ISO file as VFS')"
133162
onmouseout="FileManager:tooltip(nil)"
134163
normal="icon-cd"
135164
highlight="icon-cd-high"
136165
pressed="icon-cd"
137-
x="150" y="0" width="22" height="22" />
166+
x="173" y="0" width="22" height="22" />
138167
<input type="button"
139168
onclick="FileManager:toolbarModeSwitch()"
140169
onmouseover="FileManager:tooltip('Switch to dual or single window mode')"
@@ -153,7 +182,7 @@
153182
x="239" y="0" width="22" height="22" />
154183
</panel>
155184
<filemanager path="/" background="white-bg" name="filemgr-top"
156-
width="610" height="220" x="15" y="30"
185+
width="610" height="217" x="15" y="30"
157186
item_normal="item-normal"
158187
item_highlight="item-focus"
159188
item_pressed="item-normal"
@@ -174,7 +203,7 @@
174203
oncontextclick="FileManagerItemContextClickTop"
175204
onmouseover="FileManagerItemMouseover" />
176205
<filemanager path="/" background="white-bg" name="filemgr-bottom"
177-
width="610" height="220" x="15" y="255"
206+
width="610" height="217" x="15" y="252"
178207
item_normal="item-normal"
179208
item_highlight="item-focus"
180209
item_pressed="item-normal"
@@ -194,24 +223,31 @@
194223
onclick="FileManagerItemClickBottom"
195224
oncontextclick="FileManagerItemContextClickBottom"
196225
onmouseover="FileManagerItemMouseover" />
197-
<panel x="160" y="165" width="320" height="150" name="modal-win">
226+
<panel x="80" y="165" width="480" height="150" name="modal-win">
198227
<panel background="modal-bg" name="modal-content">
199-
<label width="310" height="50" x="5" y="5" font="arial" color="#000000" name="modal-label" text="Please wait..." />
200-
<input type="text" font="arial" fontcolor="#000000" size="20" x="5" y="55" width="310" height="30"
201-
name="modal-input" normal="input-normal" highlight="input-normal" focus="input-focus" />
202-
<input type="button"
203-
onclick="FileManager:ModalClick(true)"
204-
normal="but-ok"
205-
highlight="but-ok-high"
206-
pressed="but-ok"
207-
x="110" y="111" width="32" height="32" name="modal-ok" />
208-
<input type="button"
209-
onclick="FileManager:ModalClick(false)"
210-
normal="but-cancel"
211-
highlight="but-cancel-high"
212-
pressed="but-cancel"
213-
x="190" y="110" width="32" height="32" name="modal-cancel" />
228+
<panel x="5" y="5" width="470" height="50">
229+
<label width="470" height="50" x="0" y="0" font="arial" color="#000000" name="modal-label" text="Please wait..." />
230+
</panel>
231+
<panel x="5" y="55" width="470" height="40" name="modal-body-panel">
232+
<input type="text" font="arial" fontcolor="#000000" size="20" x="0" y="0" width="470" height="30"
233+
name="modal-input" normal="input-normal" highlight="input-highlight" focus="input-focus" />
234+
<progressbar name="modal-progress" x="0" y="8" width="470" height="14" bimage="progress-bg" pimage="progress-bar" />
235+
</panel>
236+
<panel name="modal-buttons" x="0" y="110" width="480" height="33">
237+
<input type="button"
238+
onclick="FileManager:ModalClick(true)"
239+
normal="but-ok"
240+
highlight="but-ok-high"
241+
pressed="but-ok"
242+
x="192" y="1" width="32" height="32" name="modal-ok" />
243+
<input type="button"
244+
onclick="FileManager:ModalClick(false)"
245+
normal="but-cancel"
246+
highlight="but-cancel-high"
247+
pressed="but-cancel"
248+
x="256" y="0" width="32" height="32" name="modal-cancel" />
249+
</panel>
214250
</panel>
215251
</panel>
216252
</body>
217-
</app>
253+
</app>

‎applications/filemanager/images/toolbar/mkdir_highlight.png‎

1.22 KB
Loading

‎applications/filemanager/images/toolbar/mkdir_norm.png‎

1.25 KB
Loading

0 commit comments

Comments
 (0)