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

handle obselete jumpstack settings

Browse Source 
* remove jumpstack settings if found
* add DocSettings:delSetting method
* rename DocSettings:savesetting to
  DocSettings:savesetting.
This commit is contained in:
Qingping Hou
2012-04-18 17:29:27 +08:00
parent 84fe9f49a4
commit fa414af1eb
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
reader.lua
View File

@@ -54,7 +54,7 @@ function openFile(filename)
reader:loadSettings(filename)
page_num = reader:getLastPageOrPos()
reader:goto(tonumber(page_num), true)
reader_settings:savesetting("lastfile", filename)
reader_settings:saveSetting("lastfile", filename)
return reader:inputLoop()
else
InfoMessage:show("Error opening document.", 0)
@@ -160,7 +160,7 @@ end
-- save reader settings
reader_settings:savesetting("fontmap", Font.fontmap)
reader_settings:saveSetting("fontmap", Font.fontmap)
reader_settings:close()
-- @TODO dirty workaround, find a way to force native system poll

6
settings.lua
View File

@@ -13,10 +13,14 @@ function DocSettings:readSetting(key)
return self.data[key]
end
function DocSettings:savesetting(key, value)
function DocSettings:saveSetting(key, value)
self.data[key] = value
end
function DocSettings:delSetting(key)
self.data[key] = nil
end
function dump(data)
local out = {}
DocSettings:_serialize(data, out, 0)

28
unireader.lua
View File

@@ -917,7 +917,6 @@ function UniReader:loadSettings(filename)
self.globalgamma = gamma
end
--@TODO clear obselate jump_stack 18.04 2012 (houqp)
local jump_history = self.settings:readSetting("jump_history")
if jump_history then
self.jump_history = jump_history
@@ -928,6 +927,17 @@ function UniReader:loadSettings(filename)
local bookmarks = self.settings:readSetting("bookmarks")
self.bookmarks = bookmarks or {}
-- clear obselate jumpstack settings
-- move jump_stack to bookmarks incase users used
-- it as bookmark feature before.
local jump_stack = self.settings:readSetting("jumpstack")
if jump_stack then
if #self.bookmarks == 0 then
self.bookmarks = jump_stack
end
self.settings:delSetting("jumpstack")
end
local highlight = self.settings:readSetting("highlight")
self.highlight = highlight or {}
@@ -949,7 +959,7 @@ function UniReader:getLastPageOrPos()
end
function UniReader:saveLastPageOrPos()
self.settings:savesetting("last_page", self.pageno)
self.settings:saveSetting("last_page", self.pageno)
end
-- guarantee that we have enough memory in cache
@@ -1762,13 +1772,13 @@ function UniReader:inputLoop()
end
if self.settings ~= nil then
self:saveLastPageOrPos()
self.settings:savesetting("gamma", self.globalgamma)
self.settings:savesetting("jump_history", self.jump_history)
self.settings:savesetting("bookmarks", self.bookmarks)
self.settings:savesetting("bbox", self.bbox)
self.settings:savesetting("globalzoom", self.globalzoom)
self.settings:savesetting("globalzoommode", self.globalzoommode)
self.settings:savesetting("highlight", self.highlight)
self.settings:saveSetting("gamma", self.globalgamma)
self.settings:saveSetting("jump_history", self.jump_history)
self.settings:saveSetting("bookmarks", self.bookmarks)
self.settings:saveSetting("bbox", self.bbox)
self.settings:saveSetting("globalzoom", self.globalzoom)
self.settings:saveSetting("globalzoommode", self.globalzoommode)
self.settings:saveSetting("highlight", self.highlight)
self:saveSpecialSettings()
self.settings:close()
end