4 files changed, 31 insertions, 8 deletions

diff --git a/apps/action.h b/apps/action.h
index e46e4a64b2..508d9a31a6 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -129,6 +129,8 @@ enum {
     ACTION_WPS_QUICKSCREEN,/* optional */
     ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
     ACTION_WPS_VIEW_PLAYLIST,
+    ACTION_WPS_LIST_BOOKMARKS,/* optional */
+    ACTION_WPS_CREATE_BOOKMARK,/* optional */
     ACTION_WPS_REC,
 #if 0
     ACTION_WPSAB_SINGLE, /* This needs to be #defined in 
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 4e4b9d14d2..2d9d7cd807 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1287,7 +1287,10 @@ static const struct touchaction touchactions[] = {
     {"browse", ACTION_WPS_BROWSE },
     {"play", ACTION_WPS_PLAY },         {"stop", ACTION_WPS_STOP },
     {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE },
-    {"pitch", ACTION_WPS_PITCHSCREEN},  {"playlist", ACTION_WPS_VIEW_PLAYLIST }, 
+    {"pitch", ACTION_WPS_PITCHSCREEN},  {"trackinfo", ACTION_WPS_ID3SCREEN },
+    {"playlist", ACTION_WPS_VIEW_PLAYLIST },
+    {"listbookmarks", ACTION_WPS_LIST_BOOKMARKS },
+    {"createbookmark", ACTION_WPS_CREATE_BOOKMARK },
 
 #if CONFIG_TUNER    
     /* FM screen actions */
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 1e48e80202..313ac2cd76 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -1042,6 +1042,21 @@ long gui_wps_show(void)
                 exit = true;
                 break;
 
+            case ACTION_WPS_LIST_BOOKMARKS:
+                gwps_leave_wps();
+                if (bookmark_load_menu() == BOOKMARK_USB_CONNECTED)
+                {
+                    return GO_TO_ROOT;
+                }
+                restore = true;
+                break;
+
+            case ACTION_WPS_CREATE_BOOKMARK:
+                gwps_leave_wps();
+                bookmark_create_menu();
+                restore = true;
+                break;
+
             case ACTION_WPS_ID3SCREEN:
             {
                 gwps_leave_wps();
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index f68bd70f37..7a37f899a5 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -657,19 +657,22 @@ display cycling round the defined sublines. See
     \item[wps\_next] -- Next track.
     \item[ffwd] -- Seek forwards in the track.
     \item[rwd] -- Seek backwards in the track.
-    \item[menu] -- Go to the main menu.
-    \item[browse] -- Go back to the file browser or database.
+    \item[progressbar] -- Seek to the appropriate position in the track based on the touch.
     \item[shuffle] -- Toggle shuffle mode.
     \item[repmode] -- Cycle through the repeat modes.
-    \item[quickscreen] -- Go to the quickscreen.
-    \item[contextmenu] -- Open the context menu.
-    \item[playlist] -- Go to the playlist viewer.
-    \item[progressbar] -- Seek to the appropriate position in the track based on the touch.
     \item[volume] -- Set the volume to the appropriate level based on the touch.
-    \item[pitch] -- Open the pitchscreen.
     \item[voldown] -- Decrease the volume by one step.
     \item[volup] -- Increase the volume by one step.
     \item[mute] -- Un/Mute playback.
+    \item[createbookmark] -- Create a bookmark in the currently-playing track.
+    \item[menu] -- Go to the main menu.
+    \item[browse] -- Go back to the file browser or database.
+    \item[quickscreen] -- Go to the quickscreen.
+    \item[contextmenu] -- Open the context menu.
+    \item[playlist] -- Go to the playlist viewer.
+    \item[listbookmarks] -- List the bookmarks for the currently-playing directory or playlist.
+    \item[trackinfo] -- Open the track info viewer.
+    \item[pitch] -- Open the pitchscreen.
     \item[setting\_inc] -- Increment the subsequently specified setting (e.g
       \config{\%T(0,0, setting\_inc, volume)} increases the volume by one step).
     \item[setting\_dec] -- Decrement the subsequently specified setting (e.g