Index: apps/screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.137
diff -u -b -r1.137 screens.c
--- apps/screens.c	23 Dec 2005 00:55:01 -0000	1.137
+++ apps/screens.c	4 Jan 2006 19:47:19 -0000
@@ -564,6 +564,24 @@
 }
 
 #ifdef BUTTON_F3
+#ifndef BUTTON_F3_NOT_TOGGLE_SHUFFLE  // for now :-)
+bool quick_screen_f3(int button_enter) /* this only toggles shuffle mode */
+{
+    global_settings.playlist_shuffle = !global_settings.playlist_shuffle;
+    if( audio_status() & AUDIO_STATUS_PLAY)
+        {
+#if CONFIG_CODEC == SWCODEC
+            dsp_set_replaygain(true);
+#endif
+            if (global_settings.playlist_shuffle)
+                playlist_randomise(NULL, current_tick, true);
+            else
+                playlist_sort(NULL, true);
+        }
+    settings_save();
+    return(false);
+}
+#else
 void quick_screen_f3_apply(struct gui_quickscreen *qs)
 {
     global_settings.scrollbar=int_to_bool(qs->left_option->option);
@@ -615,6 +633,7 @@
         settings_save();
     return(res);
 }
+#endif /* BUTTON_F3_TOGGLE_SHUFFLE */
 #endif /* BUTTON_F3 */
 #endif /* CONFIG_KEYPAD in (RECORDER_PAD |IRIVER_H100_PAD | IRIVER_H300_PAD) */
 
Index: apps/gui/quickscreen.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/quickscreen.c,v
retrieving revision 1.7
diff -u -b -r1.7 quickscreen.c
--- apps/gui/quickscreen.c	6 Dec 2005 13:27:00 -0000	1.7
+++ apps/gui/quickscreen.c	4 Jan 2006 19:47:19 -0000
@@ -187,6 +187,18 @@
 #ifdef QUICKSCREEN_QUIT2
            || raw_key==QUICKSCREEN_QUIT2
 #endif
+#ifdef QUICKSCREEN_QUIT3
+           || raw_key==QUICKSCREEN_QUIT3
+#endif
+#ifdef QUICKSCREEN_QUIT4
+           || raw_key==QUICKSCREEN_QUIT4
+#endif
+#ifdef QUICKSCREEN_QUIT5
+           || raw_key==QUICKSCREEN_QUIT5
+#endif
+#ifdef QUICKSCREEN_QUIT6
+           || raw_key==QUICKSCREEN_QUIT6
+#endif
 #if QUICKSCREEN_RC_QUIT
            || raw_key==QUICKSCREEN_RC_QUIT
 #endif
Index: apps/gui/quickscreen.h
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/quickscreen.h,v
retrieving revision 1.2
diff -u -b -r1.2 quickscreen.h
--- apps/gui/quickscreen.h	22 Nov 2005 21:55:04 -0000	1.2
+++ apps/gui/quickscreen.h	4 Jan 2006 19:47:20 -0000
@@ -35,7 +35,15 @@
 #define QUICKSCREEN_RIGHT       BUTTON_RIGHT
 
 
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#if CONFIG_KEYPAD == RECORDER_PAD  // all unused buttons quit!
+#define QUICKSCREEN_QUIT        BUTTON_F1
+#define QUICKSCREEN_QUIT2       BUTTON_OFF
+#define QUICKSCREEN_QUIT3       BUTTON_PLAY
+#define QUICKSCREEN_QUIT4       BUTTON_ON
+#define QUICKSCREEN_QUIT5       BUTTON_F2
+#define QUICKSCREEN_QUIT6       BUTTON_F3
+/* BUTTON_UP is used for selection options, too! (the previous one)*/ 
+#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define QUICKSCREEN_QUIT        BUTTON_MODE
 #define QUICKSCREEN_QUIT2       BUTTON_OFF
 #define QUICKSCREEN_RC_QUIT     BUTTON_RC_MODE