Forgot to add keys for the quickscreens' top item for the ipods (they didn't have ACTION_QS_DOWNINV before). As that one was used as exit button, remap the exit button to select as the other scrollwheel targets also do.

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

4 files changed, 6 insertions, 4 deletions

diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 83f46e6575..774597a3c0 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -124,13 +124,15 @@ static const struct button_mapping button_context_bmark[]  = {
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
+    { ACTION_QS_TOP,        BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_QS_TOP,        BUTTON_MENU|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_DOWN,       BUTTON_PLAY,                    BUTTON_NONE },
     { ACTION_QS_DOWN,       BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,    BUTTON_SELECT,                  BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_quickscreen */
diff --git a/manual/platform/keymap-ipod1g2g.tex b/manual/platform/keymap-ipod1g2g.tex
index f3bf5d6785..f3735cffbb 100644
--- a/manual/platform/keymap-ipod1g2g.tex
+++ b/manual/platform/keymap-ipod1g2g.tex
@@ -17,7 +17,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
-\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonSelect}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 
diff --git a/manual/platform/keymap-ipod3g.tex b/manual/platform/keymap-ipod3g.tex
index f3bf5d6785..f3735cffbb 100644
--- a/manual/platform/keymap-ipod3g.tex
+++ b/manual/platform/keymap-ipod3g.tex
@@ -17,7 +17,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
-\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonSelect}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 
diff --git a/manual/platform/keymap-ipod4g.tex b/manual/platform/keymap-ipod4g.tex
index c24fafa32e..79b7cc8e43 100644
--- a/manual/platform/keymap-ipod4g.tex
+++ b/manual/platform/keymap-ipod4g.tex
@@ -17,7 +17,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
-\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonSelect}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}