From 5fba816d083d392425e53cda2a5896afe26aac0a Mon Sep 17 00:00:00 2001 From: WS64 Date: Sun, 24 Aug 2014 10:08:18 +0200 Subject: [PATCH 1/3] remove global variable --- frontend/ui/widget/virtualkeyboard.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frontend/ui/widget/virtualkeyboard.lua b/frontend/ui/widget/virtualkeyboard.lua index 3618a29e1..d038d8e97 100644 --- a/frontend/ui/widget/virtualkeyboard.lua +++ b/frontend/ui/widget/virtualkeyboard.lua @@ -203,11 +203,6 @@ function VirtualKeyboard:init() } } self:initLayout(self.layout) - if GLOBAL_INPUT_VALUE then - for i = 1, string.len(GLOBAL_INPUT_VALUE) do - self:addChar(string.sub(GLOBAL_INPUT_VALUE,i,i)) - end - end end function VirtualKeyboard:initLayout(layout) From 6e8692365955fa288fdccfec3ca3c95785e546a2 Mon Sep 17 00:00:00 2001 From: WS64 Date: Sun, 24 Aug 2014 10:08:45 +0200 Subject: [PATCH 2/3] remove global variable --- frontend/apps/filemanager/filemanagersearch.lua | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/apps/filemanager/filemanagersearch.lua b/frontend/apps/filemanager/filemanagersearch.lua index 5bac4154e..63263adcb 100644 --- a/frontend/apps/filemanager/filemanagersearch.lua +++ b/frontend/apps/filemanager/filemanagersearch.lua @@ -200,10 +200,10 @@ end function Search:ShowSearch() if self.metafile_1 ~= nil then - GLOBAL_INPUT_VALUE = self.search_value - local dummy = GLOBAL_INPUT_VALUE + local dummy = self.search_value self.search_dialog = InputDialog:new{ title = _("Search Books"), + input = self.search_value, buttons = { { { @@ -263,8 +263,6 @@ function Search:ShowSearch() width = Screen:getWidth() * 0.8, height = Screen:getHeight() * 0.2, } - - GLOBAL_INPUT_VALUE = nil self.search_dialog:onShowKeyboard() UIManager:show(self.search_dialog) else @@ -543,8 +541,7 @@ function Search:onMenuHold(item) item.notchecked = false end local thumbwidth = math.min(240, Screen:getWidth()/3) - local thumbheight = thumbwidth/2*3 - UIManager:show(InfoMessage:new{text = item.info,image = UIToolbox:getPicture(item.path), image_width = thumbwidth,image_height = thumbheight}) + UIManager:show(InfoMessage:new{text = item.info,image = UIToolbox:getPicture(item.path), image_width = thumbwidth,image_height = thumbwidth/2*3}) end end From 6c603bf9ada1460976ccda13c68aceceab057ac4 Mon Sep 17 00:00:00 2001 From: WS64 Date: Sun, 24 Aug 2014 10:09:15 +0200 Subject: [PATCH 3/3] remove global variable --- frontend/apps/filemanager/filemanagersetdefaults.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua index dbb67fe24..0379be43a 100644 --- a/frontend/apps/filemanager/filemanagersetdefaults.lua +++ b/frontend/apps/filemanager/filemanagersetdefaults.lua @@ -109,7 +109,7 @@ function SetDefaults:init() if not self.already_read then local i = 0 for n,v in orderedPairs(_G) do - if (not string.find(tostring(v), "<")) and (not string.find(tostring(v), ": ")) and string.sub(n,1,1) ~= "_" and string.upper(n) == n and n ~= "GLOBAL_INPUT_VALUE" and n ~= "LIBRARY_PATH" then + if (not string.find(tostring(v), "<")) and (not string.find(tostring(v), ": ")) and string.sub(n,1,1) ~= "_" and string.upper(n) == n and n ~= "LIBRARY_PATH" then i = i + 1 self.defaults_name[i] = n self.defaults_value[i] = v @@ -146,9 +146,9 @@ function SetDefaults:init() table.insert(self.results, { text = self:build_setting(i), callback = function() - GLOBAL_INPUT_VALUE = tostring(self.defaults_value[i]) self.set_dialog = InputDialog:new{ title = self.defaults_name[i] .. ":", + input = tostring(self.defaults_value[i]), buttons = { { { @@ -193,7 +193,6 @@ function SetDefaults:init() width = Screen:getWidth() * 0.95, height = Screen:getHeight() * 0.2, } - GLOBAL_INPUT_VALUE = nil self.set_dialog:onShowKeyboard() UIManager:show(self.set_dialog) end @@ -202,9 +201,9 @@ function SetDefaults:init() table.insert(self.results, { text = self:build_setting(i), callback = function() - GLOBAL_INPUT_VALUE = tostring(self.defaults_value[i]) self.set_dialog = InputDialog:new{ title = self.defaults_name[i] .. ":", + input = tostring(self.defaults_value[i]), buttons = { { { @@ -239,7 +238,6 @@ function SetDefaults:init() width = Screen:getWidth() * 0.95, height = Screen:getHeight() * 0.2, } - GLOBAL_INPUT_VALUE = nil self.set_dialog:onShowKeyboard() UIManager:show(self.set_dialog) end