From 13cc654ceace5ead037b6494813c79a73b0add3e Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Fri, 15 May 2009 06:02:50 +0000 Subject: [PATCH] More touchscreen additions, quickscreen, browser, context menu, skip fwd/back buttons in the mr500 wps (a "button bar" will pop up for 2.5s when the screen is touched.) icons by Johannes Voggenthaler pitch screen icon is there but not used because that screen isnt fixed for the touhscreen yet git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20939 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/wps_parser.c | 5 ++++- wps/cabbiev2.320x240x16.mrobe500.wps | 23 +++++++++++++++++++++++ wps/cabbiev2/browser-320x240x16.bmp | Bin 0 -> 2632 bytes wps/cabbiev2/context-320x240x16.bmp | Bin 0 -> 1896 bytes wps/cabbiev2/ff-320x240x16.bmp | Bin 0 -> 1712 bytes wps/cabbiev2/pitch-320x240x16.bmp | Bin 0 -> 1252 bytes wps/cabbiev2/quick-320x240x16.bmp | Bin 0 -> 1976 bytes wps/cabbiev2/rew-320x240x16.bmp | Bin 0 -> 1712 bytes 8 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 wps/cabbiev2/browser-320x240x16.bmp create mode 100644 wps/cabbiev2/context-320x240x16.bmp create mode 100644 wps/cabbiev2/ff-320x240x16.bmp create mode 100644 wps/cabbiev2/pitch-320x240x16.bmp create mode 100644 wps/cabbiev2/quick-320x240x16.bmp create mode 100644 wps/cabbiev2/rew-320x240x16.bmp diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index d8155d71df..70e13e78a7 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -1163,7 +1163,8 @@ static struct touchaction touchactions[] = { {"play", ACTION_WPS_PLAY }, {"stop", ACTION_WPS_STOP }, {"prev", ACTION_WPS_SKIPPREV }, {"next", ACTION_WPS_SKIPNEXT }, {"menu", ACTION_WPS_MENU }, {"browse", ACTION_WPS_BROWSE }, - {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE } + {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE }, + {"quickscreen", ACTION_WPS_QUICKSCREEN },{"contextmenu", ACTION_WPS_CONTEXT }, }; static int parse_touchregion(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data) @@ -1187,6 +1188,8 @@ static int parse_touchregion(const char *wps_bufptr, * browse - go back to the file/db browser * shuffle - toggle shuffle mode * repmode - cycle the repeat mode + * quickscreen - go into the quickscreen + * contextmenu - open the context menu */ if ((wps_data->touchregion_count +1 >= MAX_TOUCHREGIONS) || (*ptr != '|')) diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps index 56613ecfa1..ad66fbb02b 100644 --- a/wps/cabbiev2.320x240x16.mrobe500.wps +++ b/wps/cabbiev2.320x240x16.mrobe500.wps @@ -13,6 +13,10 @@ %xl|D|shuffle-320x240x16.bmp|218|211| %xl|E|repeat-320x240x16.bmp|261|207|4| %xl|F|playmode-320x240x16.bmp|286|207|5| + +# toggle the touchscreen button viewport +%?Tl2.5<%Vdt|%Vdu> + %Cl|16|32|s120|s120| %pb|pb-320x240x16.bmp|10|162|300|15| %?mh<%xdAa|%xdAb> @@ -47,3 +51,22 @@ %V|0|180|-|20|1|-|-| %al %pc%ac%pp of %pe%ar%pr +#viewport for the touch icons +%xl|G|browser-320x240x16.bmp|5|5| +%xl|I|pitch-320x240x16.bmp|50|5| +%xl|H|context-320x240x16.bmp|80|5| +%xl|J|quick-320x240x16.bmp|110|5| +%xl|K|rew-320x240x16.bmp|150|5| +%xl|L|ff-320x240x16.bmp|175|5| + +%Vl|t|0|74|-|30|1|-|-| +%xdG %xdH %xdI %xdJ %xdK %xdL +%T|0|5|37|24|browse| +#%T|50|5|24|24|pitch| +%T|80|5|24|24|contextmenu| +%T|110|5|24|24|quickscreen| +%T|150|5|24|24|prev| +%T|175|5|24|24|next| + +%Vl|u|0|74|-|30|1|-|-| +#purposly left blank diff --git a/wps/cabbiev2/browser-320x240x16.bmp b/wps/cabbiev2/browser-320x240x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c912784f16b4bab4678f0bea0d6c33b3b27c398c GIT binary patch literal 2632 zcmb`JeN0nl6vj{QM+>5JA={iwT$XHRI5tfdU6%Qek}Z)<7Tp(19BvVXO@VAE!)2Kh z1SXhh2NPsvThW#x?ZA%=M1zCC24xl~9|c;98|AZ+)?NfkY0J*N7wSb>bjdyaz0ZB# zb5GwVH@$x}B5K<*;OZ6BFkEYKt->XNCs6@H@qTCszqkepK@ubufmhZL&x8@FXNc4S zA~l~=Gy#ttz9}^Pz&&I4Z}W-61;l#?C^n2Of{P=`9r2)Ug1jn`$*ly{pF~c@H9n13 zd_W@Y9GtF(OdVwXDjJ#GQN@i!nmUf8@Uu{lt(KhC!}nE?eF<_diw2%1uasyz$g~o` zI5v^HkXzq@(l(G+!^tafN<2`aF+y^w50p2cs98)D zdN|u6x!4DqcH)@2kitBg4JG5#;i3hK+eAj$3c7AdMIV%Q5E=NsuyHgk3nCPCaKQqq zE>MfjZ#N~{UeK9{49#=2l#Qd-ZG@@;(BV^?p;SEZv@#1^v4Of9%FUSf3C1DhyZfK2 zA6s{I==thFk-0vy{Myj7m;2ZLK1gM0K#E06siVp$qw8aXBgWwPh*LB|k4?TWyepiU z@3$=a`fh_`r_r^hc64{sSah31_TBk5HtzA&t17K~O?P6A%%1;&YmadWV!0+N65q~5 z7@6?e(fzHCU7fC=hs@K+!Nnw-r@!FfO{&!$ z-s0NYU{C2{_VwHeI$rj)OeQ0f4b9FM^@t-} z??lkNpm&5d3D7&AsI!08?mA+g{M^}AQ+=dn=-7=*d@fHouA_~;uyG9}K`~d1N!?W^HZ%B>~=%V_leosuF`$LQS z12fBxo~iBKQ&Ajmnx-NJ;C72?@}c3 z+b;U`Xfol%mX_NoCMKziCE3IryoWAEG2pIo`m4u%59I2?OpU{*bNW}D&_Qr;5W+6h zpkVrq=uby{7bfO3w^>RS5c+e@xu3@UKacxSd4oPc;FhqXbold}bIVUx6$WE*Y4g|c hO;oyy&QQ_ESSXHw=gpFelY#!yK0_saI~M;D{tNa;V`2aR literal 0 HcmV?d00001 diff --git a/wps/cabbiev2/context-320x240x16.bmp b/wps/cabbiev2/context-320x240x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fc0ad735c48828ac93efebd5c83a0042c5310037 GIT binary patch literal 1896 zcmb7E2~bm46n!s0E2|3Pf&wlTtwk7$h{{MnkRWRUl{KLhBAbv9Q3zvOWt2f?M8z&z z)*@(K*kmhG%c3lSvJ*{EO9HZ%$d01zq%WaNL7nOJ%(?g9ci+9|-#`ETZ{r+70!o-8 zza80nWNVN?uoig$Ows--)df=~ki+3{n8L7y3kuM3VWo(aYfMc8=fK3V_|Sm`EuG;$ zM@VHrPcF_U8n?}Ou|v^yKn3Y2x)rSp5z_rfN0CRly$+BS2Xr?tPO#)kBtu&-oL3Y^ zBr5xHmO&VigssrRG~c7fDoj%wV}wF0wjVTxeZ$|Mi|ngP~g=EAgvmvK7#4>Fs%-xRKWB)m?eO>gwQ|sy+#0Z zw?IQvK%%^}1>KI~*Xvsv!^>qbrv>Ie23d6=uN$WS2J@eQ>;^P3(9~Ymq^1cYE-3Dt z)dbHM0KIL?c2{U)^x$Y7Oeu#qJHYLBaHSml)B>~GV4e_U)HQ>%!bFcvo45Dp8Qx zj9xCZc2^J`A1gXKP!tO8oBL=!m?wsLPhfrz%tX&FhQ(57v~Q^%G(QAO`rsXO&qd~o zVC66@AHdG!5cId<^|#}-)<(18xA#H57?g-Xwg41~K&}v$JcDOn@sBI`kc5EMPdxEBbEVDBPcd!SYN9RG7K>7E#0-n;Uym{2akmrB+5*lyO_XrRRA zjT_#Jf+`%lcJIq-uzzeJX{&slJYS6H8)U{>QNHD5fEYW{B>>`}m@Kvgdy)A>mpwsCd?hI=xRV%sBse9I?Y1p}G znBFzDF1^OYV&8#-c8FA4JB$66grL*M*cur%J8Fk_HjjCBjhi%&Z7S>2uN(Cc&l+Ua z*x1>#n0`J8zP>EaBRgEYw&ry^3ST*OzcQ^E(evjqJs2!MU#73`7ffI3VJFNzEIL#p zvz96t1BJbyND2xi`>Th@#Zpkx5AMC#=p7cy@(oggjll9Vr+crBN?a3r`D4!@mbVwm z1qKG9{ZOX2K8s8E$T*t4BJ<(yMwy{N=F~B1)Fj(kIbcx#hpTYfP4wCzr_tKgJ%-DP zjEsyx#^LZHjztCqL<9!#!b4FuLWz@Hj+6UmSimU~iDYKJ>c>ZB0vSy_cX8-XH_`0& z%0biCiG;zo@zVL@FXZ}{3f#SY&hSsh#l^+ME<;RA3_mXJ3_r%7>8BErMAXqGl1P@u zTG{o7+a^`-53Z>iQLh}dc{r+BIjB=TviiaBx~dVC>T!@*w3ivokK!c7pH4b=HZkGc z`Gf=%B%S&C6pw4?A57$>ko2~aNMu9`Mf-X^t!+}TL1xuHWhi*LzjkC(-I!zd46S1t z@o?v~^V7eq>V|fl&Dayh_lV;AgoOKq9P{ACS%mZT;?wm?pOJW%7Q~c#I@cSht&@I| z`HC6&QOW$SUxyELP3KL^Z@iS}DtSXDzcC^Ieq4Uy`8=~}$iB3bR@TL89{y7DCS*vy zyKP4G_$Bfp0)lmN8bZahpESzsIwp+;GIrazNu$iVeUjQbv6R+r6LuX__FXeH;VYVO z4h8m|Q)bOC-8!dKdC6olWkE4CQ0-<**x+BE_sn^TW?4OR$NS&1pTG7N&3cRH{)3`9 z|DHLf^bO%e3euw>QYa_cL??fYcaea;X>Ky|cn%8w2hq=fWOh&~hi0U(c>w$kYK)dz literal 0 HcmV?d00001 diff --git a/wps/cabbiev2/ff-320x240x16.bmp b/wps/cabbiev2/ff-320x240x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c733da15402056565a9a8b42760560a6d06e6aa9 GIT binary patch literal 1712 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 literal 0 HcmV?d00001 diff --git a/wps/cabbiev2/rew-320x240x16.bmp b/wps/cabbiev2/rew-320x240x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..00f6aa082559c3a5b2c21ff851c056865e7da36e GIT binary patch literal 1712 zcmZur{ZCV86h6K8z5PIjQ^sV(Y+)v2Q?iUKE*T*~AxZbp$r zjTj}mRi{}+bW~h1b(0l=7Nv%dq(h+6TH&_9DzY(YWh^uM2X@}`-hL%J_q^vl=Xsv< zytk~%sRxQTu)d5Z7tbm@I_d!Gkzct?9E2$(S(fogT9Ggik@<~SvJg)Yr!hFCRk2Td zL~$(zccA1GfwUw@!s4KCODrZ8Vli%*hNlhxt6(xq6QvF*47H?XOspWH?IvUdA&d&m zm9%`)G}^2QaG$5Rc%!vi6QB4y`Rk-TP4a6cWK29qF;gr`x9A$%b%$-7<{=zK&)A9_ zsipxeE@?b(sWQw9BdB%(;R{4?c+b*!Uq3H&k>Xvux z6#@mNjA3OtdD3S`;rswtdf}9dS=@R{7cxlGr^xHeq~i`~9)dG{aN6^fwZHI3uL1uD zB|>D%Wbd1G*4uD?2+sDyxxw5^-V(=1{zVT-6y=2iX}=ZP#-Z5@R4MASaA5>mMzd_bqMrjBJMVAm4CdPgmF3y;t^?5KgSG(tFs`%t zS382mHzvz_)D7KgX-~+s^DERyhg#uU7_J22a?oI(So@1w<_>RiPnEf*-g1Z6T=7Z` zEpUAX>?*W}R$ZUk(EHoFo=BA^QrQ=Ir!P`@`$5L`I%Q2EbUy^gjB;(JuqU#$fA)jH zht&hKBDW9D7CJ_h;tJ`K7o2k?eRF$;fB$s&kJ?|g{1}@%^I0|ZdV^kBU#>gndG6Mu zy<>kK@Xgna&VMn=E9Snj`QnbddW@Ah^3JbUyCSu|*ok`!je$pp{0oQu3rDcti>|0W z$Tb+5S!`=4dVb>N?i z(~DQ9W34lPkq^GZMO3LTC^8#7V{h-sbB5~FCvB0x zpD`cd4<#RqKWWgjlB#UG&#eBtdEf!<8nr5J9E=A2vw8BD-@NFVGj20;I6;w=&xl|? zoh{ciF!NE85M)FOkG3HoM0kor7nk7Cv>L=+1N|gA3 zn2Au%V5Iix0O>ewq7}ZylR|);A&f?%Ns!_zc44