Index: apps/action.h
===================================================================
--- apps/action.h	(revision 17583)
+++ apps/action.h	(working copy)
@@ -116,6 +116,7 @@
     ACTION_WPS_QUICKSCREEN,/* optional */
     ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
     ACTION_WPS_REC,
+    ACTION_WPS_SHOWCLOCK, /*show clock from wps via long play*/
 #if 0
     ACTION_WPSAB_SINGLE, /* This needs to be #defined in 
                             the config-<target>.h to one of the ACTION_WPS_ actions
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 17583)
+++ apps/lang/english.lang	(working copy)
@@ -11714,3 +11714,31 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_SHUT_DOWN
+  desc: in root_menu.c
+  user:
+  <source>
+    *: "Shut Down"
+  </source>
+  <dest>
+    *: "Shut Down"
+  </dest>
+  <voice>
+    *: "Shut Down"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_CLOCK
+  desc: in root_menu.c
+  user:
+  <source>
+    *: "Show Clock"
+  </source>
+  <dest>
+    *: "Show Clock"
+  </dest>
+  <voice>
+    *: "Show Clock"
+  </voice>
+</phrase>
+
Index: apps/plugins/clock/clock_settings.c
===================================================================
--- apps/plugins/clock/clock_settings.c	(revision 17583)
+++ apps/plugins/clock/clock_settings.c	(working copy)
@@ -155,8 +155,8 @@
     FOR_NB_SCREENS(i){
         display=rb->screens[i];
         display->clear_display();
-        draw_logo(display);
-        draw_message(display, MESSAGE_LOADING, 1);
+   /*     draw_logo(display);*/
+   /*     draw_message(display, MESSAGE_LOADING, 1); */
         display->update();
     }
 
@@ -172,7 +172,7 @@
         display->update();
     }
     rb->ata_sleep();
-    rb->sleep(HZ);
+/*    rb->sleep(HZ); */
 }
 
 void save_settings(void){
@@ -184,9 +184,9 @@
     FOR_NB_SCREENS(i){
         display=rb->screens[i];
         display->clear_display();
-        draw_logo(display);
+  /*      draw_logo(display); */
 
-        draw_message(display, MESSAGE_SAVING, 1);
+  /*      draw_message(display, MESSAGE_SAVING, 1);*/
 
         display->update();
     }
@@ -202,7 +202,7 @@
             draw_message(display, MESSAGE_ERRSAVE, 1);
         display->update();
     }
-    rb->sleep(HZ);
+ /*   rb->sleep(HZ);*/
 }
 
 void save_settings_wo_gui(void){
Index: apps/plugins/clock/clock.c
===================================================================
--- apps/plugins/clock/clock.c	(revision 17583)
+++ apps/plugins/clock/clock.c	(working copy)
@@ -45,6 +45,7 @@
 #define ACTION_COUNTER_RESET PLA_FIRE_REPEAT
 #define ACTION_MENU PLA_MENU
 #define ACTION_EXIT PLA_QUIT
+#define ACTION_EXIT2 PLA_START
 #define ACTION_MODE_NEXT PLA_RIGHT
 #define ACTION_MODE_NEXT_REPEAT PLA_RIGHT_REPEAT
 #define ACTION_MODE_PREV PLA_LEFT
@@ -178,7 +179,7 @@
                 clock_draw_restore_colors();
                 exit_clock=main_menu();
                 break;
-
+            case ACTION_EXIT2:    /*press play alternate way to exit*/
             case ACTION_EXIT:
                 exit_clock=true;
                 break;
Index: apps/gui/gwps.c
===================================================================
--- apps/gui/gwps.c	(revision 17583)
+++ apps/gui/gwps.c	(working copy)
@@ -58,6 +58,7 @@
 #include "root_menu.h"
 #include "backdrop.h"
 #include "quickscreen.h"
+#include "plugin.h"
 
 /* currently only on wps_state is needed */
 struct wps_state wps_state;
@@ -318,6 +319,18 @@
                 return GO_TO_PREVIOUS_BROWSER;
                 break;
 
+            /*show clock from wps screen by holding down play button*/
+            case ACTION_WPS_SHOWCLOCK:
+                if (plugin_load(PLUGIN_APPS_DIR "/clock.rock",NULL) != PLUGIN_OK)
+                {
+                    get_action(CONTEXT_STD, TIMEOUT_BLOCK);
+                }
+                else
+                {
+                    return GO_TO_WPS;
+                }
+                break;
+
                 /* play/pause */
             case ACTION_WPS_PLAY:
                 if (global_settings.party_mode)
Index: apps/root_menu.c
===================================================================
--- apps/root_menu.c	(revision 17583)
+++ apps/root_menu.c	(working copy)
@@ -37,6 +37,8 @@
 #include "hotswap.h"
 #include "backdrop.h"
 
+#include "plugin.h"
+
 /* gui api */
 #include "list.h"
 #include "statusbar.h"
@@ -375,7 +377,18 @@
 MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
                         GO_TO_RECENTBMARKS,  item_callback, 
                         Icon_Bookmark);
-#ifdef HAVE_LCD_CHARCELLS
+
+static int do_clock(void)
+{
+    if (plugin_load(PLUGIN_APPS_DIR "/clock.rock",NULL) != PLUGIN_OK)
+    {
+        get_action(CONTEXT_STD, TIMEOUT_BLOCK);
+    }
+    return 0;
+}
+
+/*#ifdef HAVE_LCD_CHARCELLS*/
+
 static int do_shutdown(void)
 {
 #if CONFIG_CHARGING
@@ -383,12 +396,17 @@
         charging_splash();
     else
 #endif
-        sys_poweroff();
+
+    sys_poweroff();
     return 0;
 }
-MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN),
+MENUITEM_FUNCTION(do_shutdown_item, 0, /*was ID2P(LANG_SHUTDOWN)*/ID2P(LANG_SHUT_DOWN),
                   do_shutdown, NULL, NULL, Icon_NOICON);
-#endif
+/*#endif*/
+
+MENUITEM_FUNCTION(do_clock_item, 0, /*"Show Clock"*/ ID2P(LANG_SHOW_CLOCK), do_clock, NULL, NULL, Icon_NOICON);
+
+
 MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
             item_callback, Icon_Rockbox,
             &bookmarks, &file_browser, 
@@ -404,9 +422,11 @@
 #endif
             &playlist_options, &rocks_browser,  &info_menu
 
-#ifdef HAVE_LCD_CHARCELLS
+/*#ifdef HAVE_LCD_CHARCELLS*/
             ,&do_shutdown_item
-#endif
+/*#endif*/
+
+            ,&do_clock_item
         );
 
 int item_callback(int action, const struct menu_item_ex *this_item) 
Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c	(revision 17583)
+++ apps/keymaps/keymap-e200.c	(working copy)
@@ -82,6 +82,7 @@
     
     { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_UP,      BUTTON_SELECT },
     { ACTION_WPS_ID3SCREEN,     BUTTON_SELECT|BUTTON_DOWN,    BUTTON_SELECT },
+    { ACTION_WPS_SHOWCLOCK,     BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */