From f4f5e388232e08e645d2122103638292073a482b Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Tue, 28 Feb 2012 22:49:37 +0800 Subject: [PATCH 1/4] mod: switch ALT+BACK and BACK bindings --- pdfreader.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pdfreader.lua b/pdfreader.lua index bc8b0b37d..ef9a7ab58 100644 --- a/pdfreader.lua +++ b/pdfreader.lua @@ -377,12 +377,7 @@ function PDFReader:inputloop() end elseif ev.code == KEY_BACK then if self.altmode then - -- in altmode, back to last jump - if #self.jump_stack ~= 0 then - self:goto(self.jump_stack[1].page) - end - else - -- not shiftmode, exit pdfreader + -- altmode, exit pdfreader self:clearcache() if self.doc ~= nil then self.doc:close() @@ -393,6 +388,11 @@ function PDFReader:inputloop() self.settings:close() end return + else + -- not altmode, back to last jump + if #self.jump_stack ~= 0 then + self:goto(self.jump_stack[1].page) + end end elseif ev.code == KEY_VPLUS then self:modify_gamma( 1.25 ) From fd1ccee911ad9f972b05e3b03020679b4b26db62 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Tue, 28 Feb 2012 22:51:37 +0800 Subject: [PATCH 2/4] mod: add font menu in filesearcher --- filesearcher.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/filesearcher.lua b/filesearcher.lua index 1c6199631..c4404476f 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -248,6 +248,14 @@ function FileSearcher:choose(ypos, height, keywords) keywords = old_keywords end pagedirty = true + elseif ev.code == KEY_F then -- invoke fontchooser menu + FontChooser:init() + fonts_menu = SelectMenu:new{ + menu_title = "Fonts Menu", + item_array = FontChooser.fonts, + } + FontChooser.cfont = FontChooser.fonts[fonts_menu:choose(0, height)] + pagedirty = true elseif ev.code == KEY_ENTER or ev.code == KEY_FW_PRESS then file_entry = self.result[perpage*(self.page-1)+self.current] file_path = file_entry.dir .. "/" .. file_entry.name From ec33e51d87a73fecdeb71ba2cfabd68512c83f38 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Tue, 28 Feb 2012 23:05:26 +0800 Subject: [PATCH 3/4] fix: bug in font menu --- filechooser.lua | 11 +++++++---- filesearcher.lua | 9 ++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/filechooser.lua b/filechooser.lua index d7007f9ee..ac540e012 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -153,12 +153,15 @@ function FileChooser:choose(ypos, height) elseif ev.code == KEY_FW_DOWN then nextItem() elseif ev.code == KEY_F then -- invoke fontchooser menu - FontChooser:init() fonts_menu = SelectMenu:new{ menu_title = "Fonts Menu", item_array = FontChooser.fonts, } - FontChooser.cfont = FontChooser.fonts[fonts_menu:choose(0, height)] + local re = fonts_menu:choose(0, height) + if re then + FontChooser.cfont = FontChooser.fonts[re] + FontChooser:init() + end pagedirty = true elseif ev.code == KEY_S then -- invoke search input keywords = InputBox:input(height-100, 100, "Search:") @@ -169,8 +172,8 @@ function FileChooser:choose(ypos, height) || to test search feature in EMU mode ---------------------------------------------------------------- --]] - --FileSearcher:init("/home/dave/documents/kindle/backup/documents") - FileSearcher:init() + FileSearcher:init("/home/dave/documents/kindle/backup/documents") + --FileSearcher:init() file = FileSearcher:choose(ypos, height, keywords) if file then return file diff --git a/filesearcher.lua b/filesearcher.lua index c4404476f..6466b2098 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -116,7 +116,6 @@ function FileSearcher:choose(ypos, height, keywords) local perpage = math.floor(height / self.spacing) - 2 local pagedirty = true local markerdirty = false - self:updateFont() local prevItem = function () if self.current == 1 then @@ -154,6 +153,7 @@ function FileSearcher:choose(ypos, height, keywords) end while true do + self:updateFont() if pagedirty then markerdirty = true fb.bb:paintRect(0, ypos, fb.bb:getWidth(), height, 0) @@ -249,12 +249,15 @@ function FileSearcher:choose(ypos, height, keywords) end pagedirty = true elseif ev.code == KEY_F then -- invoke fontchooser menu - FontChooser:init() fonts_menu = SelectMenu:new{ menu_title = "Fonts Menu", item_array = FontChooser.fonts, } - FontChooser.cfont = FontChooser.fonts[fonts_menu:choose(0, height)] + local re = fonts_menu:choose(0, height) + if re then + FontChooser.cfont = FontChooser.fonts[re] + FontChooser:init() + end pagedirty = true elseif ev.code == KEY_ENTER or ev.code == KEY_FW_PRESS then file_entry = self.result[perpage*(self.page-1)+self.current] From d81b9aa74e47f694a5ea7077fb47e381fc1ca93e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Tue, 28 Feb 2012 23:07:57 +0800 Subject: [PATCH 4/4] mod: reset search root --- filechooser.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filechooser.lua b/filechooser.lua index ac540e012..04f4db7dc 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -172,8 +172,8 @@ function FileChooser:choose(ypos, height) || to test search feature in EMU mode ---------------------------------------------------------------- --]] - FileSearcher:init("/home/dave/documents/kindle/backup/documents") - --FileSearcher:init() + --FileSearcher:init("/home/dave/documents/kindle/backup/documents") + FileSearcher:init() file = FileSearcher:choose(ypos, height, keywords) if file then return file