From 819afa3ff3fc1a1b823186a2038593fd4ecd4c3b Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 10:53:13 +0200 Subject: [PATCH 1/3] don't patch already patched crengine --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca25b57c7..c54b68d6d 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ fetchthirdparty: ln -sf kpvcrlib/crengine/cr3gui/data data test -d fonts || ln -sf $(TTF_FONTS_DIR) fonts # CREngine patch: disable fontconfig - grep USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h && grep -v USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h > /tmp/new && mv /tmp/new $(CRENGINEDIR)/crengine/include/crsetup.h + grep USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h && grep -v USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h > /tmp/new && mv /tmp/new $(CRENGINEDIR)/crengine/include/crsetup.h || echo "USE_FONTCONFIG already disabled" test -f mupdf-thirdparty.zip || wget http://www.mupdf.com/download/mupdf-thirdparty.zip unzip mupdf-thirdparty.zip -d mupdf # dirty patch in MuPDF's thirdparty liby for CREngine From b06927dcfed217798266d0931c7045d8bb0c9eeb Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 14:24:03 +0200 Subject: [PATCH 2/3] fix modifier for zoom in --- unireader.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unireader.lua b/unireader.lua index 4cf59ba84..c35e97af0 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1722,7 +1722,7 @@ function UniReader:addAllCommands() function(unireader,keydef) unireader:setGlobalZoom(unireader.globalzoom + (keydef.keycode==KEY_PGBCK and -1 or 1)*unireader.globalzoom_orig*0.1) end) - self.commands:addGroup(MOD_SHIFT.."< >",{Keydef:new(KEY_PGBCK,MOD_SHIFT),Keydef:new(KEY_PGFWD,MOD_ALTSHIFT)}, + self.commands:addGroup(MOD_SHIFT.."< >",{Keydef:new(KEY_PGBCK,MOD_SHIFT),Keydef:new(KEY_PGFWD,MOD_SHIFT)}, "zoom out/in 20%", function(unireader,keydef) unireader:setGlobalZoom(unireader.globalzoom + (keydef.keycode==KEY_PGBCK and -1 or 1)*unireader.globalzoom_orig*0.2) From 53fcb2490bec193554707dff3e9046f011ab9b1b Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 14:28:46 +0200 Subject: [PATCH 3/3] exit with just home (no modifier) --- unireader.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unireader.lua b/unireader.lua index c35e97af0..e44fd68dd 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1739,7 +1739,7 @@ function UniReader:addAllCommands() function(unireader) return "break" end) - self.commands:add(KEY_HOME,MOD_ALT,"Home", + self.commands:add(KEY_HOME,nil,"Home", "exit application", function(unireader) keep_running = false