From 5cf909e2f1d679c0c8b134ec9ca9c82d5b4c2dd9 Mon Sep 17 00:00:00 2001 From: HW Date: Sun, 24 Mar 2013 17:22:22 +0100 Subject: [PATCH 1/2] switched base path kindlepdfviewer to koreader --- kpdf.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kpdf.sh b/kpdf.sh index e4ecfc075..a7348b2d7 100755 --- a/kpdf.sh +++ b/kpdf.sh @@ -7,11 +7,11 @@ test -e $PROC_KEYPAD && echo unlock > $PROC_KEYPAD test -e $PROC_FIVEWAY && echo unlock > $PROC_FIVEWAY # we're always starting from our working directory -cd /mnt/us/kindlepdfviewer/ +cd /mnt/us/koreader/ # bind-mount system fonts -if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host +if ! grep /mnt/us/koreader/fonts/host /proc/mounts; then + mount -o bind /usr/java/lib/fonts /mnt/us/koreader/fonts/host fi # check if we are supposed to shut down the Amazon framework @@ -30,8 +30,8 @@ lipc-set-prop com.lab126.pillow disableEnablePillow disable ./reader.lua "$1" 2> crash.log # unmount system fonts -if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - umount /mnt/us/kindlepdfviewer/fonts/host +if grep /mnt/us/koreader/fonts/host /proc/mounts; then + umount /mnt/us/koreader/fonts/host fi # always try to continue cvm From 89b9e57299192566319377aabc5724eaa7ae7c4b Mon Sep 17 00:00:00 2001 From: HW Date: Sun, 24 Mar 2013 17:28:32 +0100 Subject: [PATCH 2/2] adapted wrapper script and launcher configurations --- extensions/koreader/README.txt | 22 ++++++++++++++++++++++ extensions/{kpdf => koreader}/config.xml | 4 ++-- extensions/{kpdf => koreader}/menu.json | 6 +++--- extensions/kpdf/README.txt | 23 ----------------------- kpdf.sh => koreader.sh | 0 launchpad/koreader.ini | 11 +++++++++++ launchpad/kpdf.ini | 11 ----------- 7 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 extensions/koreader/README.txt rename extensions/{kpdf => koreader}/config.xml (77%) rename extensions/{kpdf => koreader}/menu.json (63%) delete mode 100644 extensions/kpdf/README.txt rename kpdf.sh => koreader.sh (100%) create mode 100755 launchpad/koreader.ini delete mode 100755 launchpad/kpdf.ini diff --git a/extensions/koreader/README.txt b/extensions/koreader/README.txt new file mode 100644 index 000000000..1c3763f40 --- /dev/null +++ b/extensions/koreader/README.txt @@ -0,0 +1,22 @@ +TITLE: koreader + +CONTAINS: KUAL files for installation in /mnt/us/extensions/ + +REF: Main KUAL thread http://www.mobileread.com/forums/showthread.php?t=203326 + +UPSTREAM SOURCE: https://github.com/hwhw/koreader + +SUPPORTS: +DX No +K3 No +K4 No +Touch Yes +PW Yes + +REQUIRES: koreader + +ARCHIVAL LINK: + +ORIGINAL AUTHOR: koreader development team + +NOTES: this is the successor of KindlePDFviewer for devices with touch input support. Support for keyboard input is to be done, use the legacy KindlePDFviewer or Librerator for this. Report issues and bugs on github. diff --git a/extensions/kpdf/config.xml b/extensions/koreader/config.xml similarity index 77% rename from extensions/kpdf/config.xml rename to extensions/koreader/config.xml index 1d13b8853..cf18e6b4c 100644 --- a/extensions/kpdf/config.xml +++ b/extensions/koreader/config.xml @@ -1,9 +1,9 @@ - KPDF + Koreader 0.0 - Hawhill + Koreader dev team helper diff --git a/extensions/kpdf/menu.json b/extensions/koreader/menu.json similarity index 63% rename from extensions/kpdf/menu.json rename to extensions/koreader/menu.json index 8b7741aa3..02ee707ff 100644 --- a/extensions/kpdf/menu.json +++ b/extensions/koreader/menu.json @@ -1,11 +1,11 @@ { "items": [ { - "name": "KPDF", + "name": "Koreader", "priority": 0, "items": [ - {"name": "Start in documents", "priority": 1, "action": "/mnt/us/kindlepdfviewer/kpdf.sh", "params": "/mnt/us/documents"}, - {"name": "Open last document", "priority": 2, "action": "/mnt/us/kindlepdfviewer/kpdf.sh"} + {"name": "Start in documents", "priority": 1, "action": "/mnt/us/koreader/koreader.sh", "params": "/mnt/us/documents"}, + {"name": "Open last document", "priority": 2, "action": "/mnt/us/koreader/koreader.sh"} ] } ] diff --git a/extensions/kpdf/README.txt b/extensions/kpdf/README.txt deleted file mode 100644 index d56e92cc9..000000000 --- a/extensions/kpdf/README.txt +++ /dev/null @@ -1,23 +0,0 @@ -TITLE: kindlepdfviewer - -CONTAINS: KUAL files for installation in /mnt/us/extensions/ - -REF: Main KUAL thread http://www.mobileread.com/forums/showthread.php?t=203326 - -UPSTREAM SOURCE: https://github.com/hwhw/kindlepdfviewer - -SUPPORTS: -DX Yes ( All Revisions ) -K3 Yes ( All Revisions ) -K4 Yes ( All Revisions ) -Touch (check github and threads for support information) -PW (check github and threads for support information) - -REQUIRES: KindlePDFviewer http://www.mobileread.com/forums/showthread.php?t=157047 - -ARCHIVAL LINK: http://www.mobileread.com/forums/showpost.php?p=2406316&postcount=5 - -ORIGINAL AUTHOR: Hawhill, See GIT for subsequent contributors listing - -NOTES: Touchscreen support for the Touch and PW is in progress -check github and threads for support information diff --git a/kpdf.sh b/koreader.sh similarity index 100% rename from kpdf.sh rename to koreader.sh diff --git a/launchpad/koreader.ini b/launchpad/koreader.ini new file mode 100755 index 000000000..e543cee7e --- /dev/null +++ b/launchpad/koreader.ini @@ -0,0 +1,11 @@ +[Actions] +# start koreader with filebrowser in /mnt/us/documents +P D = !/mnt/us/koreader/koreader.sh /mnt/us/documents +# start koreader with last document +P P = !/mnt/us/koreader/koreader.sh +# start koreader without framework in /mnt/us/documents +P K = !/mnt/us/koreader/koreader.sh --framework_stop /mnt/us/documents +# start koreader without framework on last read document +P L = !/mnt/us/koreader/koreader.sh --framework_stop +# restart amazon framework - when it got irritated +P R = !/etc/init.d/framework restart diff --git a/launchpad/kpdf.ini b/launchpad/kpdf.ini deleted file mode 100755 index 53be1fc3f..000000000 --- a/launchpad/kpdf.ini +++ /dev/null @@ -1,11 +0,0 @@ -[Actions] -# start kindlepdfviewer with filebrowser in /mnt/us/documents -P D = !/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents -# start kindlepdfviewer with last document -P P = !/mnt/us/kindlepdfviewer/kpdf.sh -# start kindlepdfviewer without framework in /mnt/us/documents -P K = !/mnt/us/kindlepdfviewer/kpdf.sh --framework_stop /mnt/us/documents -# start kindlepdfviewer without framework on last read document -P L = !/mnt/us/kindlepdfviewer/kpdf.sh --framework_stop -# restart amazon framework - when it got irritated -P R = !/etc/init.d/framework restart