diff options
Diffstat (limited to 'apps/plugins/lua_scripts.lua')
-rw-r--r-- | apps/plugins/lua_scripts.lua | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/apps/plugins/lua_scripts.lua b/apps/plugins/lua_scripts.lua index 02fe50b327..43593d96b0 100644 --- a/apps/plugins/lua_scripts.lua +++ b/apps/plugins/lua_scripts.lua | |||
@@ -24,13 +24,15 @@ | |||
24 | local scrpath = rb.current_path() .. "/lua_scripts/" | 24 | local scrpath = rb.current_path() .. "/lua_scripts/" |
25 | 25 | ||
26 | package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path | 26 | package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path |
27 | require("printtable") | 27 | require("printmenus") |
28 | 28 | ||
29 | rb.actions = nil | 29 | rb.actions = nil |
30 | package.loaded["actions"] = nil | 30 | package.loaded["actions"] = nil |
31 | 31 | ||
32 | local excludedsrc = ";filebrowse.lua;fileviewers.lua;printmenu.lua;dbgettags.lua;" | 32 | local excludedsrc = ";filebrowse.lua;fileviewers.lua;printmenu.lua;dbgettags.lua;" |
33 | -------------------------------------------------------------------------------- | 33 | -------------------------------------------------------------------------------- |
34 | local Icon_Plugin = 0x9 | ||
35 | |||
34 | 36 | ||
35 | local function get_files(path, norecurse, finddir, findfile, f_t, d_t) | 37 | local function get_files(path, norecurse, finddir, findfile, f_t, d_t) |
36 | 38 | ||
@@ -120,6 +122,15 @@ local function get_files(path, norecurse, finddir, findfile, f_t, d_t) | |||
120 | end -- get_files | 122 | end -- get_files |
121 | -------------------------------------------------------------------------------- | 123 | -------------------------------------------------------------------------------- |
122 | 124 | ||
125 | function icon_fn(item, icon) | ||
126 | if item ~= 0 then | ||
127 | icon = Icon_Plugin | ||
128 | else | ||
129 | icon = -1 | ||
130 | end | ||
131 | return icon | ||
132 | end | ||
133 | |||
123 | -- uses print_table and get_files to display simple file browser | 134 | -- uses print_table and get_files to display simple file browser |
124 | function script_choose(dir, title) | 135 | function script_choose(dir, title) |
125 | local dstr | 136 | local dstr |
@@ -128,8 +139,8 @@ function script_choose(dir, title) | |||
128 | local norecurse = true | 139 | local norecurse = true |
129 | local f_finddir = false -- function to match directories; nil all, false none | 140 | local f_finddir = false -- function to match directories; nil all, false none |
130 | local f_findfile = nil -- function to match files; nil all, false none | 141 | local f_findfile = nil -- function to match files; nil all, false none |
131 | 142 | local t_linedesc = {show_icons = true, icon_fn = icon_fn} | |
132 | local p_settings = {wrap = true, hasheader = true} | 143 | local p_settings = {wrap = true, hasheader = true, justify = "left", linedesc = t_linedesc} |
133 | local files = {} | 144 | local files = {} |
134 | local dirs = {} | 145 | local dirs = {} |
135 | local item = 1 | 146 | local item = 1 |
@@ -142,10 +153,11 @@ function script_choose(dir, title) | |||
142 | for i = 1, #files do | 153 | for i = 1, #files do |
143 | table.insert(dirs, "\t" .. string.gsub(files[i], ".*/","")) | 154 | table.insert(dirs, "\t" .. string.gsub(files[i], ".*/","")) |
144 | end | 155 | end |
145 | 156 | --print_menu(menu_t, func_t, selected, settings, copy_screen) | |
146 | item = print_table(dirs, #dirs, p_settings) | 157 | _, item = print_menu(dirs, nil, 0, p_settings) |
147 | 158 | ||
148 | -- If item was selected follow directory or return filename | 159 | -- If item was selected follow directory or return filename |
160 | item = item or -1 | ||
149 | if item > 0 then | 161 | if item > 0 then |
150 | dir = files[item - 1] | 162 | dir = files[item - 1] |
151 | if not rb.dir_exists("/" .. dir) then | 163 | if not rb.dir_exists("/" .. dir) then |