Change the way the %Tl() (touch region) tag is done to remove dodgey 1-char settings.

check the manual...
%Tl(..., &action) -> %Tl(..., action, repeat_press)
%Tl(..., *action) -> %Tl(..., action, long_press)
%Tl(..., !action) -> %Tl(..., action, reverse_bar)
and a new allow_while_lock to make the region fire when softlocked

these options must all be after the action name, but otherwise the order doesnt matter. And for the setting_inc/dec/set action the setting name must follow the action name, *then* the options

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

5 files changed, 14 insertions, 14 deletions

diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index 65b14804fa..72c77ec14f 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -50,7 +50,7 @@
 %?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)
+%T(206,0,24,24,stop, repeat)
 %T(182,0,18,92,repmode)
 %T(139,0,37,23,shuffle)
 %T(98,0,33,23,volume)
@@ -69,8 +69,8 @@
 %T(39,5,24,24,pitch)
 %T(58,0,24,24,contextmenu)
 %T(86,0,24,24,quickscreen)
-%T(115,0,24,23,&rwd)
-%T(144,0,24,23,&ffwd)
+%T(115,0,24,23,rwd, repeat)
+%T(144,0,24,23,ffwd, repeat)
 %T(115,0,24,23,prev)
 %T(144,0,24,23,next)
 
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index 0d9e2cc0a2..0496418082 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -68,8 +68,8 @@
 %T(50,5,24,24,pitch)
 %T(80,5,24,24,contextmenu)
 %T(110,5,24,24,quickscreen)
-%T(150,5,24,24,&rwd)
-%T(175,5,24,24,&ffwd)
+%T(150,5,24,24,rwd, repeat)
+%T(175,5,24,24,ffwd, repeat)
 %T(150,5,24,24,prev)
 %T(175,5,24,24,next)
 %Vl(u,0,74,-,30,1)
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index 8bc4475a8e..3000d1a02d 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -80,7 +80,7 @@
 # playmode
 %?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)
+%T(273,66,45,50,stop, repeat)
 
 #
 # popup osd menu
@@ -96,7 +96,7 @@
 #
 %V(0,420,90,58,-)
 %xd(H)%xd(I)
-%T(0,0,40,58,&rwd)
+%T(0,0,40,58,rwd, repeat)
 %T(0,0,40,58,prev)
-%T(50,0,40,58,&ffwd)
+%T(50,0,40,58,ffwd, repeat)
 %T(50,0,40,58,next)
diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps
index 43e3ae3350..ee051adb52 100644
--- a/wps/cabbiev2.480x800x16.wps
+++ b/wps/cabbiev2.480x800x16.wps
@@ -81,7 +81,7 @@
 # playmode
 %?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)
+%T(400,119,70,75,stop, repeat)
 
 #
 # popup osd menu
@@ -97,7 +97,7 @@
 #
 %V(0,720,150,75,-)
 %xd(H)%xd(I)
-%T(0,0,70,75,&rwd)
+%T(0,0,70,75,rwd, repeat)
 %T(0,0,70,75,prev)
-%T(70,0,70,75,&ffwd)
+%T(70,0,70,75,ffwd, repeat)
 %T(70,0,70,75,next)
diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps
index 0a9df79417..4f302caaf2 100644
--- a/wps/cabbiev2.800x480x16.wps
+++ b/wps/cabbiev2.800x480x16.wps
@@ -77,7 +77,7 @@
 %xl(F,playmode-800x480x16.bmp,0,0,5)
 %?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)
+%T(0,0,70,70,stop, repeat)
 
 #
 # popup osd menu
@@ -96,7 +96,7 @@
 %xl(H,rew-800x480x16.bmp,0,5)
 %xl(I,ff-800x480x16.bmp,80,5)
 %xd(H)%xd(I)
-%T(0,0,70,75,&rwd)
+%T(0,0,70,75,rwd, repeat)
 %T(0,0,70,75,prev)
-%T(80,0,70,75,&ffwd)
+%T(80,0,70,75,ffwd, repeat)
 %T(80,0,70,75,next)