Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Two bugfixes and a cleanup

Browse Source 
1. When loading boolean settings we have to explicitly check for the
return of nil from the self.settings:readSetting() function and only
modify the default if the return value is NOT nil.

2. When closing the document we have to reset the settings to defaults,
otherwise their values are re-used on the next open.

3. The messages "Links on page ON/OFF" changed to
"Link underlines ON/OFF" because the old version gave two false
impressions: a) as if the action is pertinent only to the current page
(but in fact it is global for the entire document) and b) that we are
disabling the links whereas we are only disabling the show of underlines
under the links. The new message addresses both issues.
This commit is contained in:
Tigran Aivazian 2012-10-12 19:39:22 +01:00
parent 78c9223897
commit a354d96ab8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unireader.lua
View File

@ -987,8 +987,14 @@ function UniReader:loadSettings(filename)
end
self.rcountmax = self.settings:readSetting("rcountmax") or self.rcountmax
self.show_overlap_enable = self.settings:readSetting("show_overlap_enable")
self.show_links_enable = self.settings:readSetting("show_links_enable")
local tmp = self.settings:readSetting("show_overlap_enable")
if tmp ~= nil then
self.show_overlap_enable = tmp
end
tmp = self.settings:readSetting("show_links_enable")
if tmp ~= nil then
self.show_links_enable = tmp
end
-- other parameters are reader-specific --> @TODO: move to proper place, like loadSpecialSettings()
-- since DJVUReader still has no loadSpecialSettings(), just a quick solution is
@ -2246,6 +2252,8 @@ function UniReader:inputLoop()
self.toc_xview = nil
self.toc_cview = nil
self.toc_curidx_to_x = nil
self.show_overlap_enable = true
self.show_links_enable = true
if self.doc ~= nil then
self.doc:close()
end
@ -2978,9 +2986,9 @@ function UniReader:addAllCommands()
function(unireader)
unireader.show_links_enable = not unireader.show_links_enable
if unireader.show_links_enable then
InfoMessage:inform("Links on page ON", nil, 1, MSG_AUX)
InfoMessage:inform("Link underlines ON", nil, 1, MSG_AUX)
else
InfoMessage:inform("Links on page OFF", nil, 1, MSG_AUX)
InfoMessage:inform("Link underlines OFF", nil, 1, MSG_AUX)
end
self.settings:saveSetting("show_links_enable", unireader.show_links_enable)
self:redrawCurrentPage()