renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #789 from WS64/master

Browse Source 
remember editor settings after changing/cancelling one entry
This commit is contained in:
Huang Xin
2014-08-12 16:15:35 +08:00
parent aef8c14c42 dd70023c2c
commit a7d1e720ef
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/apps/filemanager/filemanagersetdefaults.lua
View File

@@ -85,6 +85,17 @@ function SetDefaults:ConfirmEdit()
end
function SetDefaults:init()
local function setdisplayname(i)
local dummy = self.bools_name[i] .. " = "
if type(_G[self.bools_name[i]]) == "string" and not tonumber(self.bools_value[i]) then
dummy = dummy .. "\"" .. tostring(self.bools_value[i]) .. "\"" -- add quotation marks to strings
else
dummy = dummy .. tostring(self.bools_value[i])
end
return dummy
end
self.bools_name = {}
self.bools_value = {}
self.results = {}
@@ -107,14 +118,8 @@ function SetDefaults:init()
end
for i=1,#self.bools_name do
local dummy = self.bools_name[i] .. " = "
if type(_G[self.bools_name[i]]) == "string" and not tonumber(self.bools_value[i]) then
dummy = dummy .. "\"" .. tostring(self.bools_value[i]) .. "\"" -- add quotation marks to strings
else
dummy = dummy .. tostring(self.bools_value[i])
end
table.insert(self.results, {
text = dummy,
text = setdisplayname(i),
callback = function()
GLOBAL_INPUT_VALUE = tostring(self.bools_value[i])
self.set_dialog = InputDialog:new{
@@ -126,8 +131,10 @@ function SetDefaults:init()
enabled = true,
callback = function()
_G[self.bools_name[i]] = settype(self.set_dialog:getInputText(),type(_G[self.bools_name[i]]))
self.bools_value[i] = _G[self.bools_name[i]]
self.results[i].text = setdisplayname(i)
self:close()
self.defaults_menu:swithItemTable("Defaults", self.results)
self.defaults_menu:swithItemTable("Defaults", self.results, i)
UIManager:show(menu_container)
end,
},
@@ -136,7 +143,6 @@ function SetDefaults:init()
enabled = true,
callback = function()
self:close()
self.defaults_menu:swithItemTable("Defaults", self.results)
UIManager:show(menu_container)
end,
},

9
frontend/ui/widget/menu.lua
View File

@@ -583,12 +583,17 @@ function Menu:updateItems(select_number)
end
function Menu:swithItemTable(new_title, new_item_table)
function Menu:swithItemTable(new_title, new_item_table, itemnumber)
if self.menu_title then
self.menu_title.text = new_title
end
self.page = 1
if itemnumber then
self.page = math.ceil(itemnumber / self.perpage)
else
self.page = 1
end
self.item_table = new_item_table
self:updateItems(1)
end