6 files changed, 7 insertions, 87 deletions

diff --git a/apps/plugins/lua_scripts/file_browser.lua b/apps/plugins/lua_scripts/file_browser.lua
index 19f475acf3..ab246a2a7e 100644
--- a/apps/plugins/lua_scripts/file_browser.lua
+++ b/apps/plugins/lua_scripts/file_browser.lua
@@ -33,7 +33,7 @@ local scrpath = rb.current_path()--rb.PLUGIN_DIR .. "/demos/lua_scripts/"
 
 package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path
 
-require("printmenu") --menu
+require("printmenus") --menu
 require("filebrowse") -- file browser
 
 rb.actions = nil
diff --git a/apps/plugins/lua_scripts/fileview.lua b/apps/plugins/lua_scripts/fileview.lua
index 920281bbef..08eea0337c 100755
--- a/apps/plugins/lua_scripts/fileview.lua
+++ b/apps/plugins/lua_scripts/fileview.lua
@@ -33,7 +33,7 @@ local scrpath = rb.current_path()--rb.PLUGIN_DIR .. "/demos/lua_scripts/"
 
 package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path
 
-require("printmenu") --menu
+require("printmenus") --menu
 require("filebrowse") -- file browser
 require("fileviewers") -- fileviewer, hexviewer
 
diff --git a/apps/plugins/lua_scripts/fileviewers.lua b/apps/plugins/lua_scripts/fileviewers.lua
index 5a9c417d36..c686f3eeda 100755
--- a/apps/plugins/lua_scripts/fileviewers.lua
+++ b/apps/plugins/lua_scripts/fileviewers.lua
@@ -205,6 +205,7 @@ function print_file(filename, maxlinelen, settings)
     end
     settings.hasheader = true
     settings.co_routine = nil
+    settings.ovfl = "manual"
 
     local sel =
         print_table(ftable, #ftable, settings)
@@ -309,6 +310,7 @@ function print_file_increment(filename, settings)
     settings.hasheader = true
     settings.co_routine = co
     settings.msel = false
+    settings.ovfl = "manual"
 
     table.insert(file_t, 1, hstr) --position 1 is header/title
     local sel =
@@ -437,6 +439,7 @@ function print_file_hex(filename, bytesperline, settings)
     settings.co_routine = co
     settings.start = start
     settings.curpos = vcur
+    settings.ovfl = "manual"
 
     while sel > 0 do
         settings.start = start
diff --git a/apps/plugins/lua_scripts/printmenu.lua b/apps/plugins/lua_scripts/printmenu.lua
deleted file mode 100755
index 3cb17d8026..0000000000
--- a/apps/plugins/lua_scripts/printmenu.lua
+++ /dev/null
@@ -1,83 +0,0 @@
---[[
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2017 William Wilgus
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-]]
-if not rb.lcd_framebuffer then rb.splash(rb.HZ, "No Support!") return nil end
-
-require("printtable")
-local _clr = require("color")
-
-local _LCD = rb.lcd_framebuffer()
---------------------------------------------------------------------------------
--- displays text in menu_t calls function in same indice of func_t when selected
-function print_menu(menu_t, func_t, selected, settings, copy_screen)
-
-    local i, start, vcur, screen_img   
-
-    if selected then vcur = selected + 1 end
-    if vcur and vcur <= 1 then vcur = 2 end
-
-    if not settings then
-        settings = {}
-        settings.justify = "center"
-        settings.wrap    = true
-        settings.hfgc    = _clr.set( 0, 000, 000, 000)
-        settings.hbgc    = _clr.set(-1, 255, 255, 255)
-        settings.ifgc    = _clr.set(-1, 000, 255, 060)
-        settings.ibgc    = _clr.set( 0, 000, 000, 000)
-        settings.iselc   = _clr.set( 1, 000, 200, 100)
-        settings.default = true
-    end
-
-    settings.hasheader = true
-    settings.co_routine = nil
-    settings.msel = false
-    settings.start = start
-    settings.curpos = vcur
-
-    while not i or i > 0 do
-        if copy_screen == true then
-                --make a copy of screen for restoration
-                screen_img = screen_img or rb.new_image()
-                screen_img:copy(_LCD)
-        else
-                screen_img = nil
-        end
-
-        _LCD:clear(settings.ibgc)
-
-        settings.start = start
-        settings.curpos = vcur
-
-        i, start, vcur = print_table(menu_t, #menu_t, settings)
-        --vcur = vcur + 1
-        collectgarbage("collect")
-        if copy_screen == true then _LCD:copy(screen_img) end
-
-        if func_t and func_t[i] then 
-            if func_t[i](i, menu_t) == true then break end
-        else
-            break
-        end
-    end
-    if settings.default == true then settings = nil end
-    return screen_img
-end
diff --git a/apps/plugins/lua_scripts/rlimg.lua b/apps/plugins/lua_scripts/rlimg.lua
index 801d0c5fac..c9dde65ed4 100755
--- a/apps/plugins/lua_scripts/rlimg.lua
+++ b/apps/plugins/lua_scripts/rlimg.lua
@@ -36,7 +36,7 @@ local _draw_text      = require("draw_text")
 
 --package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path
 
-require("printmenu") --menu
+require("printmenus") --menu
 
 --[[ RBIMAGE library functions
 NOTE!! on x, y coordinates + width & height
diff --git a/apps/plugins/lua_scripts/tagnav.lua b/apps/plugins/lua_scripts/tagnav.lua
index f62f27973b..9646f359e3 100644
--- a/apps/plugins/lua_scripts/tagnav.lua
+++ b/apps/plugins/lua_scripts/tagnav.lua
@@ -25,7 +25,7 @@
 --local scrpath = rb.current_path()"
 
 --package.path = scrpath .. "/?.lua;" .. package.path --add lua_scripts directory to path
-require("printmenu")
+require("printmenus")
 require("printtable")
 require("dbgettags")