initial (re)support for F3

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

4 files changed, 7 insertions, 4 deletions

diff --git a/apps/action.h b/apps/action.h
index 549886b549..df07606171 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -90,6 +90,7 @@ enum {
     ACTION_STD_QUICKSCREEN,
     ACTION_STD_KEYLOCK,
     
+    ACTION_F3, /* just so everything works again, possibly change me */
     /* code context actions */
     
     /* WPS codes */
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index c3658e6c82..a9ceae822e 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -462,11 +462,11 @@ long gui_wps_show(void)
 
                 /* screen settings */
 #ifdef BUTTON_F3
-            case BUTTON_F3:
+            case ACTION_F3:
 #ifdef HAVE_LCD_COLOR
                 show_main_backdrop();
 #endif
-                if (quick_screen_f3(button))
+                if (quick_screen_f3(BUTTON_F3))
                     return SYS_USB_CONNECTED;
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 85c4213cf4..6fe59a819d 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -51,6 +51,7 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_CANCEL,      BUTTON_OFF,                 BUTTON_NONE },
     { ACTION_STD_CANCEL,      BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_F3,      BUTTON_F3,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
@@ -76,6 +77,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP,        BUTTON_ON },
     { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_DOWN,      BUTTON_ON },
     { ACTION_STD_KEYLOCK,     BUTTON_F1|BUTTON_DOWN,      BUTTON_NONE },
+    { ACTION_F3,      BUTTON_F3,                BUTTON_NONE },
     
 
     LAST_ITEM_IN_LIST
diff --git a/apps/tree.c b/apps/tree.c
index 0616c0f09e..21405c9f46 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -725,11 +725,11 @@ static bool dirbrowse(void)
                 break;
 #endif
 #ifdef BUTTON_F3
-            case BUTTON_F3:
+            case ACTION_F3:
                 /* don't enter f3 from plugin browser */
                 if (*tc.dirfilter < NUM_FILTER_MODES)
                 {
-                    if (quick_screen_f3(button))
+                    if (quick_screen_f3(BUTTON_F3))
                         reload_dir = true;
                     restore = true;
                 }