From 0eaf2671fd42e2e79cbd089ed0b335e3da468244 Mon Sep 17 00:00:00 2001
From: NuPogodi <surzh@mail.ru>
Date: Wed, 3 Oct 2012 00:45:45 +0200
Subject: [PATCH] New InfoMessage Concept

Part I (still no unireader, crereader, filesearcher & fileinfo)

Conflicts:

	commands.lua
	dialog.lua
	filechooser.lua
	filehistory.lua
	font.lua
	inputbox.lua
	reader.lua
	resources/info-i.png
	screen.lua
	selectmenu.lua
---
 kite/KPDFviewer (last file)  |   2 +-
 kite/KPDFviewer File Manager |   2 +-
 kpdf.sh                      |  37 +++++++++++++++++++++++++++++++++++
 launchpad/kpdf.ini           |   8 ++++----
 reader.lua                   |  20 +++++++++++++++++++
 resources/info-aux.png       | Bin 0 -> 1109 bytes
 resources/info-bug.png       | Bin 0 -> 1037 bytes
 resources/info-confirm.png   | Bin 0 -> 858 bytes
 resources/info-error.png     | Bin 0 -> 950 bytes
 resources/info-warn.png      | Bin 0 -> 844 bytes
 10 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 kpdf.sh
 create mode 100644 resources/info-aux.png
 create mode 100644 resources/info-bug.png
 create mode 100644 resources/info-confirm.png
 create mode 100644 resources/info-error.png
 create mode 100644 resources/info-warn.png

diff --git a/kite/KPDFviewer (last file) b/kite/KPDFviewer (last file)
index 5d9acab14..de0c410d9 100755
--- a/kite/KPDFviewer (last file)	
+++ b/kite/KPDFviewer (last file)	
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/mnt/us/launchpad/kpdf.sh
+/mnt/us/kindlepdfviewer/kpdf.sh
diff --git a/kite/KPDFviewer File Manager b/kite/KPDFviewer File Manager
index 3374ef3ae..f5f935234 100755
--- a/kite/KPDFviewer File Manager	
+++ b/kite/KPDFviewer File Manager	
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/mnt/us/launchpad/kpdf.sh /mnt/us/documents
+/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents
diff --git a/kpdf.sh b/kpdf.sh
new file mode 100644
index 000000000..c1f81c700
--- /dev/null
+++ b/kpdf.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+export LC_ALL="en_US.UTF-8"
+
+echo unlock > /proc/keypad
+echo unlock > /proc/fiveway
+
+# we're always starting from our working directory
+cd /mnt/us/kindlepdfviewer/
+
+# 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
+fi
+
+# check if we are supposed to shut down the Amazon framework
+if test "$1" == "--framework_stop"; then
+	shift 1
+	/etc/init.d/framework stop
+fi
+
+# stop cvm
+killall -stop cvm
+
+# finally call reader
+./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log
+
+# unmount system fonts
+if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then
+	umount /mnt/us/kindlepdfviewer/fonts/host
+fi
+
+# always try to continue cvm
+killall -cont cvm || /etc/init.d/framework start
+
+# cleanup hanging process
+killall lipc-wait-event
+
diff --git a/launchpad/kpdf.ini b/launchpad/kpdf.ini
index ab2a1b0d9..53be1fc3f 100755
--- a/launchpad/kpdf.ini
+++ b/launchpad/kpdf.ini
@@ -1,11 +1,11 @@
 [Actions]
 # start kindlepdfviewer with filebrowser in /mnt/us/documents
-P D = !/mnt/us/launchpad/kpdf.sh /mnt/us/documents
+P D = !/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents
 # start kindlepdfviewer with last document
-P P = !/mnt/us/launchpad/kpdf.sh
+P P = !/mnt/us/kindlepdfviewer/kpdf.sh
 # start kindlepdfviewer without framework in /mnt/us/documents
-P K = !/mnt/us/launchpad/kpdf.sh --framework_stop /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/launchpad/kpdf.sh --framework_stop
+P L = !/mnt/us/kindlepdfviewer/kpdf.sh --framework_stop
 # restart amazon framework - when it got irritated
 P R = !/etc/init.d/framework restart
diff --git a/reader.lua b/reader.lua
index 8e9e627b2..18f131c13 100755
--- a/reader.lua
+++ b/reader.lua
@@ -139,6 +139,26 @@ end
 
 
 
+-- @TODO dirty workaround, find a way to force native system poll
+-- screen orientation and upside down mode 09.03 2012
+Screen:setRotationMode(Screen.native_rotation_mode)
+		if file then
+			running = openFile(file)
+		else
+			running = false
+		end
+		showReader(ARGV[optind], optarg["p"])
+	end
+	UIManager:run()
+elseif last_file and lfs.attributes(last_file, "mode") == "file" then
+	showReader(last_file, optarg["p"])
+	UIManager:run()
+else
+	return showusage()
+end
+
+
+
 -- @TODO dirty workaround, find a way to force native system poll
 -- screen orientation and upside down mode 09.03 2012
 Screen:setRotationMode(Screen.native_rotation_mode)
diff --git a/resources/info-aux.png b/resources/info-aux.png
new file mode 100644
index 0000000000000000000000000000000000000000..afee09ee58ddc37401decbffb73dcd246e9f1623
GIT binary patch
literal 1109
zcmV-b1giUqP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-s3kwU8
zk&#ePP{_#0LPA1nYHBVnF0in$`}_MiI5=={aFUXeNJvOJIy!oKdf3?5t$u?A000Bv
zNkl<ZcwVj5!EWM490u@7s<<ad8X|Bn>%dedCsPG0h089N9(xE=dFdsTMaoE(>L><L
zbAgIhRk&0>?>qDX`Vcw5tnjvnVQVDd1glLB__A`xb{q(swwL`hLLPrV{v%5WgZ}^I
z;{*FYfqgtd47sI$16OA?!p=y|sCbWpcWFaWsx2L>B=Z>PIrUt|P3F6@j%u$z1a=nX
z<`q|N$z7?6(_ef5I)+(sr#RQZ`f`4hAnh&C6VSYh5mJ%}q3T<leX#{nv|MSRIA#S8
zK6?OqVy>dM;y%}K%j(Vp@MHaGf-s7MQ5QMw4PcYu6eG&3QG8C<d9?w4HuMDV`BF~Q
zpr%R!?`?ofYDPU8-5{#+3p#8J+G{`)Iesr#qZ1klMS1e)J?QOP6UtPTFLa|uK?jMQ
zd+=L5XVLHsI?D48Uelw7YIrfYJWnVp3qt7)qm1#5f?A{<gHtqRYLrnvIEzxsMtJb;
z9k5B}jNOG#h%?W=@glGy<2A_N1I#{&CfGeuXODp4V#kiaucE6uj5*A3I57A{xD<8Y
z^8(=Ch}dC{!-CZFxv=NkbG++E;60EHe%A<c@$8ww%V0a6i6OB4r-Gmw263FfzW(Yv
zd-gpcd=aJ+u@p`yeR*Uh2yqPZ!}awa_V3qW$c1G(njcKio`PBpkRUH#zFlRb0R#ww
zpcR7&S_fbNfIu8V>Slw45dhdd6}8gc1QmoK<nzV*z}14Cm=?8m2wI>HqU@dsGZ1HQ
zu-6PG^b03I0a0G1!8*Hx{X#JWW=$AGxAI^k6zo`cfb2)#e4X9|<JyY|tgN(<1wrbY
zJ)c^!yZ~HTGh-%#t%%}+%%y$+evuM25pIJ|Q=o1(LtslXo1cR1R2F0DFa&)QDk<Z`
zBPJQxj=(WYkm)wqe_n^M7=bG&JI?bhFw5qk6#uFrd~!akJ?P2QaNWZY@N{99T>K3-
z$&!p^xgCQZlv4Ff_A+k8R1O*L((T8<hLY(Fhp89{t)VlNmxuSDe=Ic{MrD*GK*$1t
zpl{T=SzQ*_;0hLQ&*Y;VR%wT+Rd=|kB&YMu|ETUkX|<r4%yQC6$Yn&`uCBLZ5T4<d
zymwhT&P*CfowAIn>*eC+gjMpu@2@apw4*XwF|n>o{^o=Ntp3#R`=*X2N?Gb+jLVX@
z32sffTI~BJO|vX>iWO9a%?H3Pz-6_mSulwa5AUr~{{gtQOj$2Od5WW6YWgu)3#jwi
zJh}_5W@-C{;@=i53&Q2nh0wCJlD7@G&<fn}6g1y|^tI^or{K?V>&JZz*6}>wwmt9T
bzTE!-NI`3pcXg6N00000NkvXXu0mjfMWqY%

literal 0
HcmV?d00001

diff --git a/resources/info-bug.png b/resources/info-bug.png
new file mode 100644
index 0000000000000000000000000000000000000000..990e0466f67335c2c93d82ee3e3c2399712d8c40
GIT binary patch
literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000jP)t-s92^{?
zqM}n%Q(|IbN=izcoSck|j9pz_*4EZ}d3iN8HMzODx3{--b#?sw{QvqE761SPn@L1L
zRCr#!)j@0HMid9|IT!+l9z;Q~&_a>hZIjSL<z2JRLh)fhr#%I=4k`<d>z8O<_fXUh
zEa*@c8x^xUtZ|#9un4CmRM1OX2N#2(_nbD1%pT@a=%V6OpP_GL*+{9WFQs!xh~AI?
zd(RUi60JG^8JMgC)pek=4*a>QN0<ihC(nk4y9DhNm~GF0JyDcGbrEosUb7!R+VKZl
z{vc`h=+iXV6F**_<bB`EzcUX|-8A@lf{&gIR3F9nZme%cY48aD{E3i(;(7kycKqZp
z17_;cAD-tCLh`;+xF1DMubKg&v0w7Me4cp3A1Jq-wpwyCATru_Pq2&`zOSfC`D-J}
zg7znuj;VTi(PL}pEjPptVH$+5AKZyLTbO`7PEBWsGmc}>or5cY%P2e{0{G==U&j&9
zAo#UE65vY-Fk&}eWblpsxmfh+yv2E;vDX;?CQ0yY(s@HHT4p?OLr1-z%+NM=H_I0&
zT0e|MkJG8mc~MnLZUVyL$ho?>kR<uwbO-C4A$XyidIC^%#~&e(WtdjTy{TnaeuQS&
zt)@PQw)EPC1OVL1X&SRgK6s(SBn846Ht@ax&M31OC4_@9j#6L-l5{{`;RrM)z|CM1
zrNLEDlOK=`9w$%)HayLM4gfqL_v|SqAgFBc;3y4d?{Ww@n{pcyD5bb(2~r^3Z3Ue3
z>6CFx(<sG7IP6cBAl%!2+(KY8h68AE0)p)Xgy+4&sMZqo7+47~lmF`W{${UXKnwH5
z!K!G1;70v!495CcH{1@7>tX{MCtQLF>fvGrTvOC7E2-m*0o;K4W^?&DJjN>17)=70
z9e~-;8@)RV@RubHO%9F_)OyXXJ}e$4;3d;EZBZxK0%X&0yH0n!1ax^S;!aHY*l^Rg
zDK20UK+bRkxs?6tJx4$ikUzr_<kBbuKBm+oIV|UB<qWS5UhQYWFCrQNo`(aQn^L{+
zX29>*A_0tH2i!6XW;8iDP25yXE?2W4d@})Yz<aei&X@twhx4+PW1IuX^>5v4;H$W7
zS(*THtK7T}X1Ay&zB4(T0N}DTx(=ecMlHrH&29nkLSqtL2c26QW9)g(4g&tHY`Fgb
zv-;b(AtrFni;dBWSJJsET5Q;SS|~N#6=1fferI6<E0i%{1&D^GsyzHmDVD)-SAy^Z
zIPMjD$I!%p6vzlL0d%ad1Sp2Ot{cw3y;vQ`3D>@P|8MX&BUXT4eU}QU00000NkvXX
Hu0mjfXJg#k

literal 0
HcmV?d00001

diff --git a/resources/info-confirm.png b/resources/info-confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a6585ed6090c93505aa6d412dbced7c0dae68b
GIT binary patch
literal 858
zcmV-g1Eu_lP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sEG#UT
zn3&Me&|6zu`}_NRe0;I7u|`HlYHDiS+}xm`pt-rZQ&UqnH#g<w<-^0nz*wi50008z
zNkl<ZcwW7gKWNoZ6o)VM53iGhgR4jv5lSTpv1X8ZY8zUw4lSfk4vvo1hnk^~7r4cx
zXgXBg#I0N3P@!8&V{N(#Dij2{i_2{X7l(@HoaA|vP+xKJyz%$F@BYqNBH)<$XW;oz
ze_&jQnZCeoGWMw-F#Qo=VzUph3qJT^9cT!a=ipXNAsT|&IDx$y&=ACNLm`@i7!~cK
zfr)uo4q_F|)fN$TfeM0PHu2kaz%~fT5Z4r<DhOhlAg(GzO+bXIw-D6^=%-v&6~YR}
z75zU5lv0cK7NXK1Acf+w=M=VqV*M<}teCF>+#pbQ-vRjRO1V}c{xqQfcY)@OQqdwF
z)&eBpas@D{qDbK)7T^Yo0Y3qlig0=g(GwKFOBG{_NV!f=A*urPRz>uT>o}2vip>&e
zgRhFgTn&Nmx`?=mzgGa$k4piq=U$->4$W0OCj<9-f{2Jk+@b*9Cvcj9CoG8Q7ey}J
zfnrvyGB60d0_UoOFL3HPsRK(4Jcae*c?6uK5Tt49c{^~(z&V)W=c)T>AxP2Sd0lwO
z!1Wna;B9F8X8<=a_nh3xcVPS^1M(D1VO$tiR@PF?k;uESkT3vCsE8CEk0+&md5(g~
zFHitJDxxySl=|f)xRWqIiVmzhOpIQ<u;F0Lf<fp3k`!#%26%y~6)?ap*7*Hv0IxaU
zB7p_`R=NIm0c0#F0jo%RhRg~WC>Kec-23qA(kdGG1{Nq6!3*WZgj;ljIxvQc+$-}8
z8w@o7INyN{j<Y<&8w@}Lkf^wcA?4wHSoo3XI-vC-E5baa1_QET(7xVpp(4z(kOae8
z*9}t2@6;m0LBSbqB<KntK^sYmEXzso(;Q(i=AZ))!ZrzvF;dn$NNvpiXH<~jm(3Bd
z1S=kqK<efbAaTsM7ToUQ3RYkNB(yfT2;M-`Q~`_Zp8y!427mdWNORB{`D*%nv!pqD
kd06)W=$&If&Ho?x4K7OVMk=a76#xJL07*qoM6N<$f=n@lU;qFB

literal 0
HcmV?d00001

diff --git a/resources/info-error.png b/resources/info-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..97ecdfc378bc9d3e28ff70666540a246f2c38517
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000jP)t-sNJvPd
zqoZ?kbI#7rT3TBA`ub&MWmQ#Gva+(4mX@}*w#&=Qb#-;!-Q9+UhOx*$)c^nkL`g(J
zRCr#+m9dLmMHGie3~#c?N-Ts|S{T#GhReVOxe&t25Zr*9$-!rImNZM+F-$zj65(-q
zIL(7JOKj{Sb~Ykbc5Y|oWnhC$TK^5toO^aJc}Ym8r`XH#`|kHUGq-pOUNiqWP>T1Z
zyb>tcwJ9~Zn3n^CU#9sx%jL57<z+x|^Ld{k`*xX3_aZPX=Dq*<3gZ3meVQAy2{@P5
zPZ2R7AwOPCE^h!Pt^Y!dyEGQ@-PHT%0k`O%AyO*D?`dV81G@A#=Q4PIk(>Y`SUr|p
z91mMjDB0j(?4O86wooGYhXvD+qMHEIKHbPkG1LwLa{rqE)8K>T7~qBu;|styr$qqp
zr?(jR<jI(w)ISk_;SL2;!>@NZ--9n%ak$O`bmkrl09bJXz`#-KM!>s|FjfJ;9Tos9
z@au&D&ON&jSwM<E_ecQn2OTsFT^<d?XLW^-0Z6e&0s-&`V;CsqJKiy~;sm6^;sXIp
z_n3FMS)(sRK!e+z0OKJ<A%Y6LRWbveL8=hNB#8J`DI<_I0iqBA8@_cz1-vPmDp(-`
z0cKtdg$<$*0pFA#4Fp6hU!l(UMeI2MYky`q0iGu#!GJ6oqX;HNjQF<i7-)bDQ3Rr>
z|Kl6yz&&kuBMT;lwfdr8F)-vu!P1tO`3QMbM6`O_odG)`Mtgm{gPW|NV<8?o!@$CP
zifBb3ck$CMUQ@>c4CX*#j5k;y*GZKa@+se>cPp<ol^z4!lIy%}EvgwbIkTaG_X2g0
z;(hrdmPWq`eeu=cTi8)(V>~7SD{jXaLpXFjS3qgZf!5L58&~T6#CSySN2T(jDYc@M
zW(6uB5tLgpL;|kqEohrFLk~MaTdd8TqQwv{L*JCbrx@D2uM~33LjpCUhHf<EfjS-q
zjcCzQOb=9Hn;JSkW?iC%eHC;~E#(mdt?2t^$ZQ~@HE>C*3uuuD&JRh@<a3}&;O{D>
ztKCu_w!rg>3=q+^D=MMU0qbLytAKI=JZ+KTbEU}5`3f8fya1ILs08+F3*}n|e5wTk
z2+`By>IZjcAFcs_^1S(b(N;q6L{|VC0Ql2XgiULS1(;r>H-~oFOS}olD&7C^)BKwG
Y7t(RorN`jwBme*a07*qoM6N<$f+sGkX8-^I

literal 0
HcmV?d00001

diff --git a/resources/info-warn.png b/resources/info-warn.png
new file mode 100644
index 0000000000000000000000000000000000000000..f653634db11a13f5379d3c7512eba20e8142ff74
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sD=RCg
zsHk{&c(1RoYinzdkB`^a*QKSUMn*=9i;Ka*!B0<5`}_N7XlTU5#D|B68Bl=|0008l
zNkl<ZcwW7eF=*6K7{?#zAOw*L6{KB^9HMc1atDf0aB&hE2}RMV5D;RJrdXjO1(yyd
z=ujMVDTf`3l$b#*&(g`0)1!+Bf}M=!rbeMlr|SR9yW}Og0~hh1kX*j+_kQm^E@9oj
z<lh4AWv71(2ii*`_Go&HthmE~B}>n8Y<vjtVN_R{7y>Nmh18BHpdzR$Sa}6XF|Gh5
zIF&?+iIdpt3Q&S&N9I<hP{1Y$jyqY19w`D4pjM||OqbiFxUT@Lz^bK!Db6`=o~|4E
zlLD|}TUPBZI^P-FPmXPa6gjYY)UvEkjwgXcDnflC2i}d^*3D(Arv}f7<82*|ml^QG
zwm)B`e%}z|r=f?n=Na%~anY{R24Vv0v4?yEaasZPWV*%v6fu&7VfeOSxQ=$;kf003
zFbrk5W<O00@lVDMC7wq}(J-f9o1`UrUc}hGgc2u3!(m~ZaEOSf<^jkQ4bx%xD#6|o
zFIr#^GeGES3d2}K3CPsN`Af1Ng`rS@2mw&M%LlHc?WAW2<3<LI!GM~H&hEmVM0+9>
zIWR56$tWevUyK0LG<%^4x6~9cm?ntm4tpRC4KgS|teG;L^C(SEh%yk#0FYz@z*fl+
zMd^5{FnP%^27q&FpTVD%GUkPfLF{p^0OWiTIEROg3h))R{Ehl30wH!vz&(Ll{!YFZ
zq$mMYSy$i1<4iHr2j)odS^=Fv1W@E@2n{1#1$3VgvE%aw!hOCgKtP~?4n}AjXi^#w
zXu-N$1h5JX3KD>t1Fbc?MF0w9?YB%21ma*f1C*kaW)<i#!2*>x-3kB&`Wi8shFfzG
z=%5Y)7sen^fKq5$ZfFhzI*ersY+(>^H)p;q$UNF}tALA7ll#6uJL}K-NZoPWs-fL#
zwa#)nTdS+9L#FVYV%!0s?UXYJxMhP|1yDm(#sORf+LUfi<Dmjz99c`a0*2?m0e=9;
WLDv)6TqmCZ0000<MNUMnLSTZA)^UFT

literal 0
HcmV?d00001