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 remote branch 'upstream/master'

Browse Source 
Conflicts:
	djvureader.lua
	unireader.lua
This commit is contained in:
Tigran Aivazian
2012-09-01 16:36:52 +01:00
parent 10a23e81d6 45d9b10aa6
commit 3b1da21cfd
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crereader.lua
View File

@@ -324,7 +324,7 @@ function CREReader:getTocTitleOfCurrentPage()
return self:getTocTitleByPage(self.doc:getXPointer())
end
--[[ NuPogodi, 16.08.12 --> to scroll chapters without calling TOC-menu
--[[ function to scroll chapters without calling TOC-menu,
direction is either +1 (next chapter) or -1 (previous one).
Jump over several chapters is principally possible when direction > 1 ]]
@@ -345,8 +345,7 @@ function CREReader:gotoPrevNextTocEntry(direction)
break
end
end
-- NuPogodi, 31.08.12: minor correction for the case
-- when current page is not the page opening current chapter
-- minor correction when current page is not the page opening current chapter
if self.pageno > self.toc[item_no].page and direction < 0 then
direction = direction + 1
end
@@ -418,6 +417,10 @@ function CREReader:adjustCreReaderCommands()
self.commands:del(KEY_N, MOD_SHIFT, "N")
self.commands:del(KEY_X, MOD_SHIFT, "X") -- remove manual cropping
-- NuPogodi, 01.09.12: remove new hotkey in unireader.lua
-- that calls 'zoom-mode' menu
self.commands:del(KEY_M, nil, "M")
-- CCW-rotation
self.commands:add(KEY_K, nil, "K",
"rotate screen counterclockwise",

51
unireader.lua
View File

@@ -22,7 +22,7 @@ UniReader = {
-- framebuffer update policy state:
rcount = 5,
rcountmax = 0,
rcountmax = 5,
-- zoom state:
globalzoom = 1.0,
@@ -2099,6 +2099,38 @@ function UniReader:addAllCommands()
unireader:goto(math.max(math.floor(unireader.doc:getPages()*(keydef.keycode-KEY_1)/9),1))
end)
-- end numeric keys
-- function calls menu to visualize and/or to switch zoom mode
self.commands:add(KEY_M, nil, "M",
"select zoom mode",
function(unireader)
local mode_list = {
"Zoom by value", -- ZOOM_BY_VALUE = 0, remove?
"Fit zoom to page", -- A ZOOM_FIT_TO_PAGE = -1,
"Fit zoom to page width", -- S ZOOM_FIT_TO_PAGE_WIDTH = -2,
"Fit zoom to page height", -- D ZOOM_FIT_TO_PAGE_HEIGHT = -3,
"Fit zoom to content", -- ^A ZOOM_FIT_TO_CONTENT = -4,
"Fit zoom to content width", -- ^S ZOOM_FIT_TO_CONTENT_WIDTH = -5,
"Fit zoom to content height", -- ^D ZOOM_FIT_TO_CONTENT_HEIGHT = -6,
"Fit zoom to content width with panoraming", -- ZOOM_FIT_TO_CONTENT_WIDTH_PAN = -7, remove?
"Fit zoom to content height with panoraming", -- ZOOM_FIT_TO_CONTENT_HEIGHT_PAN = -8, remove?
"Fit zoom to content half-width with margin", -- F ZOOM_FIT_TO_CONTENT_HALF_WIDTH_MARGIN = -9,
"Fit zoom to content half-width" -- ^F ZOOM_FIT_TO_CONTENT_HALF_WIDTH = -10,
}
local zoom_menu = SelectMenu:new{
menu_title = "Select mode to zoom pages",
item_array = mode_list,
current_entry = - unireader.globalzoom_mode
}
local re = zoom_menu:choose(0, G_height)
if not re or re==1 or re==8 or re==9 then -- if not proper zoom-mode
unireader:redrawCurrentPage()
else
unireader:setglobalzoom_mode(1-re)
end
end)
-- to leave or to erase 8 hotkeys switching zoom-mode directly?
self.commands:add(KEY_A,nil,"A",
"zoom to fit page",
function(unireader)
@@ -2215,17 +2247,30 @@ function UniReader:addAllCommands()
self:redrawCurrentPage()
end
end)
self.commands:add(KEY_R, MOD_SHIFT, "R",
"manual full screen refresh",
function(unireader)
-- eink will not refresh if nothing is changeed on the screen
local count = NumInputBox:input(G_height-100, 100,
"Full refresh after:", self.rcountmax, true)
-- convert string to number
if pcall(function () count = count + 0 end) then
-- restrict self.rcountmax in reasonable range
self.rcountmax = math.max(count, 0)
self.rcountmax = math.min(count, 10)
end
-- now, perform full screen refresh
self.rcount = self.rcountmax
self:redrawCurrentPage()
--[[ eink will not refresh if nothing is changed on the screen
-- so we fake a change here.
fb.bb:invertRect(0, 0, 1, 1)
fb:refresh(1)
fb.bb:invertRect(0, 0, 1, 1)
fb:refresh(0)
unireader.rcount = 0
unireader.rcount = 0 ]]
end)
self.commands:add(KEY_Z,nil,"Z",
"set crop mode",
function(unireader)