8 files changed, 27 insertions, 1 deletions

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 0000000000..c912784f16
--- /dev/null
+++ b/wps/cabbiev2/browser-320x240x16.bmp
diff --git a/wps/cabbiev2/context-320x240x16.bmp b/wps/cabbiev2/context-320x240x16.bmp
new file mode 100644
index 0000000000..fc0ad735c4
--- /dev/null
+++ b/wps/cabbiev2/context-320x240x16.bmp
diff --git a/wps/cabbiev2/ff-320x240x16.bmp b/wps/cabbiev2/ff-320x240x16.bmp
new file mode 100644
index 0000000000..c733da1540
--- /dev/null
+++ b/wps/cabbiev2/ff-320x240x16.bmp
diff --git a/wps/cabbiev2/pitch-320x240x16.bmp b/wps/cabbiev2/pitch-320x240x16.bmp
new file mode 100644
index 0000000000..4b843783a2
--- /dev/null
+++ b/wps/cabbiev2/pitch-320x240x16.bmp
diff --git a/wps/cabbiev2/quick-320x240x16.bmp b/wps/cabbiev2/quick-320x240x16.bmp
new file mode 100644
index 0000000000..be723f31a6
--- /dev/null
+++ b/wps/cabbiev2/quick-320x240x16.bmp
diff --git a/wps/cabbiev2/rew-320x240x16.bmp b/wps/cabbiev2/rew-320x240x16.bmp
new file mode 100644
index 0000000000..00f6aa0825
--- /dev/null
+++ b/wps/cabbiev2/rew-320x240x16.bmp