Touchscreen WPS changes:

 * Change play/pause button so that it shows the click action and not the current state. During ffwd/rew the ffwd/rew status is still shown.
 * Make ffwd/rew buttons always be shown on 480x800 and 320x480 targets. 240x400 needs further clean up first.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29398 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 6 insertions, 6 deletions

diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index a64fa6fcf7..65b14804fa 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -47,7 +47,7 @@
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?Tp<%?mp<%xd(F, 1)|%xd(F, 3)|%xd(F, 2)|%xd(F, 4)|%xd(F, 5)||||>|%xd(F, %mp)>
 
 %T(206,0,24,24,play)
 %T(206,0,24,24,&stop)
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index b1db502570..8bc4475a8e 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -78,7 +78,7 @@
 %T(231,66,36,50,repmode)
 #
 # playmode
-%xd(F, %mp)
+%?Tp<%?mp<%xd(F, 1)|%xd(F, 3)|%xd(F, 2)|%xd(F, 4)|%xd(F, 5)||||>|%xd(F, %mp)>
 %T(273,66,45,50,play)
 %T(273,66,45,50,&stop)
 
@@ -94,7 +94,7 @@
 #
 # ff/rewind button
 #
-%Vl(t,0,420,90,58,-)
+%V(0,420,90,58,-)
 %xd(H)%xd(I)
 %T(0,0,40,58,&rwd)
 %T(0,0,40,58,prev)
diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps
index 82c403e7fa..43e3ae3350 100644
--- a/wps/cabbiev2.480x800x16.wps
+++ b/wps/cabbiev2.480x800x16.wps
@@ -79,7 +79,7 @@
 %T(340,121,50,70,repmode)
 #
 # playmode
-%xd(F, %mp)
+%?Tp<%?mp<%xd(F, 1)|%xd(F, 3)|%xd(F, 2)|%xd(F, 4)|%xd(F, 5)||||>|%xd(F, %mp)>
 %T(400,119,70,75,play)
 %T(400,119,70,75,&stop)
 
@@ -95,7 +95,7 @@
 #
 # ff/rewind button
 #
-%Vl(t,0,720,150,75,-)
+%V(0,720,150,75,-)
 %xd(H)%xd(I)
 %T(0,0,70,75,&rwd)
 %T(0,0,70,75,prev)
diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps
index 7e0dd2ecec..0a9df79417 100644
--- a/wps/cabbiev2.800x480x16.wps
+++ b/wps/cabbiev2.800x480x16.wps
@@ -75,7 +75,7 @@
 # playmode
 %V(700,402,70,70,-)
 %xl(F,playmode-800x480x16.bmp,0,0,5)
-%xd(F, %mp)
+%?Tp<%?mp<%xd(F, 1)|%xd(F, 3)|%xd(F, 2)|%xd(F, 4)|%xd(F, 5)||||>|%xd(F, %mp)>
 %T(0,0,70,70,play)
 %T(0,0,70,70,&stop)