From 3474e56d3091e6d7fa375c0a843f256ecb3eff76 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 8 Mar 2012 10:35:33 +0800 Subject: [PATCH 1/5] fix: check key mode properly for manual crop --- unireader.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unireader.lua b/unireader.lua index e1296ad20..c14f3e134 100644 --- a/unireader.lua +++ b/unireader.lua @@ -697,7 +697,7 @@ function UniReader:inputloop() keep_running = false end break - elseif ev.code == KEY_Z and not Keys.shiftmode then + elseif ev.code == KEY_Z and not (Keys.shiftmode or Keys.altmode) then local bbox = {} bbox["x0"] = - self.offset_x / self.globalzoom bbox["y0"] = - self.offset_y / self.globalzoom @@ -715,7 +715,7 @@ function UniReader:inputloop() print("# bbox remove "..self.pageno .. dump(self.bbox)); elseif ev.code == KEY_Z and Keys.altmode then self.bbox.enabled = not self.bbox.enabled; - print("# bbox override "..self.bbox.enabled); + print("# bbox override: ", self.bbox.enabled); end -- switch to ZOOM_BY_VALUE to enable panning on fiveway move From e0f1564c7a0661a699ddf27837fee4e41e6740f1 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 8 Mar 2012 14:24:30 +0800 Subject: [PATCH 2/5] fix: exit filesearcher with home key --- filesearcher.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesearcher.lua b/filesearcher.lua index e0f41d8de..814865d51 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -265,7 +265,7 @@ function FileSearcher:choose(ypos, height, keywords) openFile(file_full_path) pagedirty = true - elseif ev.code == KEY_BACK then + elseif ev.code == KEY_BACK or ev.code == KEY_HOME then return nil end end From 2ac42729336219de63ec88b0400c173b9bec306e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 8 Mar 2012 19:23:17 +0800 Subject: [PATCH 3/5] fix: export LC_ALL when running kpdfview in launchpad --- launchpad/kpdf.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/launchpad/kpdf.sh b/launchpad/kpdf.sh index d493b9739..42068732a 100755 --- a/launchpad/kpdf.sh +++ b/launchpad/kpdf.sh @@ -1,4 +1,6 @@ #!/bin/sh +export LC_ALL=en_US.UTF-8 + echo unlock > /proc/keypad echo unlock > /proc/fiveway cd /mnt/us/kindlepdfviewer/ From 72e480888901743ee1a4a9f4d01b354bfca90765 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 8 Mar 2012 19:29:30 +0800 Subject: [PATCH 4/5] fix: add double quotes this should fix issue #47 --- launchpad/kpdf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchpad/kpdf.sh b/launchpad/kpdf.sh index 42068732a..6d1eba1a4 100755 --- a/launchpad/kpdf.sh +++ b/launchpad/kpdf.sh @@ -1,5 +1,5 @@ #!/bin/sh -export LC_ALL=en_US.UTF-8 +export LC_ALL="en_US.UTF-8" echo unlock > /proc/keypad echo unlock > /proc/fiveway From 03f658f59e08d41de3a6786a81353fb496f71de9 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 8 Mar 2012 19:45:16 +0800 Subject: [PATCH 5/5] fix: push mupdf commit to e7bb1c4937593c95065dbbbdd7eb15a73996c470 --- mupdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mupdf b/mupdf index ea671d125..e7bb1c493 160000 --- a/mupdf +++ b/mupdf @@ -1 +1 @@ -Subproject commit ea671d1254dad3b9ef5a8fbdd9729c3ada2a49b2 +Subproject commit e7bb1c4937593c95065dbbbdd7eb15a73996c470