Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 18933)
+++ apps/lang/english.lang	(working copy)
@@ -12109,3 +12109,71 @@
     *: "Search Results"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Quickscreen Items"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Quickscreen Items"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Quickscreen Items"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Left"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Left"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Left"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Right"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Right"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Right"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Bottom"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Bottom"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Bottom"
+  </voice>
+</phrase>
Index: apps/gui/quickscreen.c
===================================================================
--- apps/gui/quickscreen.c	(revision 18933)
+++ apps/gui/quickscreen.c	(working copy)
@@ -37,6 +37,7 @@
 #include "audio.h"
 #include "quickscreen.h"
 #include "talk.h"
+#include "list.h"
 
 static struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT];
 static struct viewport vp_icons[NB_SCREENS];
@@ -111,7 +112,7 @@
     {
         /* scrolling needed */
         int center = (parent->width - CENTER_ICONAREA_WIDTH)/2;
-        int width = MIN(center, MIN(left_width, right_width));
+        int width = MAX(center, MIN(left_width, right_width));
         vps[screen][QUICKSCREEN_LEFT].width = width;
         vps[screen][QUICKSCREEN_RIGHT].width = width;
         vps[screen][QUICKSCREEN_RIGHT].x = parent->x+parent->width - width;
@@ -331,23 +332,39 @@
     cond_talk_ids_fq(VOICE_OK);
     return changed;
 }
-
+static bool is_setting_quickscreenable(const struct settings_list *setting);
 bool quick_screen_quick(int button_enter)
 {
     struct gui_quickscreen qs;
     bool oldshuffle = global_settings.playlist_shuffle;
     int oldrepeat = global_settings.repeat_mode;
-    qs.items[QUICKSCREEN_LEFT] =
+    if (global_settings.qs_item_left != -1 &&
+        global_settings.qs_item_left < nb_settings &&
+        is_setting_quickscreenable(&settings[global_settings.qs_item_left]))
+        qs.items[QUICKSCREEN_LEFT] = &settings[global_settings.qs_item_left];
+    else
+        qs.items[QUICKSCREEN_LEFT] =
                     find_setting(&global_settings.playlist_shuffle, NULL);
-    qs.items[QUICKSCREEN_RIGHT] =
+    if (global_settings.qs_item_right != -1 &&
+        global_settings.qs_item_right < nb_settings &&
+        is_setting_quickscreenable(&settings[global_settings.qs_item_right]))
+        qs.items[QUICKSCREEN_RIGHT] = &settings[global_settings.qs_item_right];
+    else
+        qs.items[QUICKSCREEN_RIGHT] =
                     find_setting(&global_settings.repeat_mode, NULL);
-    qs.items[QUICKSCREEN_BOTTOM] =
+    if (global_settings.qs_item_bottom != -1 &&
+        global_settings.qs_item_bottom < nb_settings &&
+        is_setting_quickscreenable(&settings[global_settings.qs_item_bottom]))
+        qs.items[QUICKSCREEN_BOTTOM] = &settings[global_settings.qs_item_bottom];
+    else
+        qs.items[QUICKSCREEN_BOTTOM] =
                     find_setting(&global_settings.dirfilter, NULL);
     qs.callback = NULL;
     if (gui_syncquickscreen_run(&qs, button_enter))
     {
         settings_save();
         settings_apply(false);
+        /* this all shuold be changed to using the settings callbacks */
         /* make sure repeat/shuffle/any other nasty ones get updated */
         if ( oldrepeat != global_settings.repeat_mode &&
              (audio_status() & AUDIO_STATUS_PLAY) )
@@ -389,3 +406,104 @@
 }
 #endif /* BUTTON_F3 */
 
+/* stuff to make the quickscreen configurable */
+static bool is_setting_quickscreenable(const struct settings_list *setting)
+{
+    /* to keep things simple, only settings which have a lang_id set are ok */
+    if (setting->lang_id < 0 || (setting->flags&F_BANFROMQS))
+        return false;
+    switch (setting->flags&F_T_MASK)
+    {
+        case F_T_BOOL:
+            return true;
+        case F_T_INT:
+        case F_T_UINT:
+            return (setting->RESERVED != NULL);
+        default:
+            return false;
+    }
+}
+
+static const struct settings_list *find_setting_from_index(int index)
+{
+    int count = -1, i;
+    const struct settings_list *setting = &settings[0];
+    for(i=0;i<nb_settings;i++)
+    {
+        setting = &settings[i];
+        if (is_setting_quickscreenable(setting))
+            count++;
+        if (count == index)
+            return setting;
+    }
+    return NULL;
+}
+static char* quickscreen_setter_getname(int selected_item, void *data,
+                                        char *buffer, size_t buffer_len)
+{
+    (void)data;
+    const struct settings_list *setting = find_setting_from_index(selected_item);
+    snprintf(buffer, buffer_len, "%s  (%s)",
+             str(setting->lang_id), setting->cfg_name);
+    return buffer;
+}
+static int quickscreen_setter_speak_item(int selected_item, void * data)
+{
+    (void)data;
+    return find_setting_from_index(selected_item)->lang_id;
+}
+static int quickscreen_setter_action_callback(int action, 
+                                              struct gui_synclist *lists)
+{
+    (void)lists;
+    switch (action)
+    {
+        case ACTION_STD_OK:
+            /* ok, quit */
+            return ACTION_STD_CANCEL;
+    }
+    return action;
+}
+int quickscreen_set_option(void *data)
+{
+    int valid_settings_count = 0;
+    int i, newval = 0, oldval, *setting = NULL;
+    struct simplelist_info info;
+    switch ((intptr_t)data)
+    {
+        case QUICKSCREEN_LEFT:
+            setting = &global_settings.qs_item_left;
+            break;
+        case QUICKSCREEN_RIGHT:
+            setting = &global_settings.qs_item_right;
+            break;
+        case QUICKSCREEN_BOTTOM:
+            setting = &global_settings.qs_item_bottom;
+            break;
+    }
+    oldval = *setting;
+    for(i=0;i<nb_settings;i++)
+    {
+        if (is_setting_quickscreenable(&settings[i]))
+            valid_settings_count++;
+        if (oldval == i)
+            newval = valid_settings_count - 1;
+    }
+    
+    simplelist_info_init(&info, str(LANG_QS_ITEMS), 
+                          valid_settings_count, NULL);
+    info.get_name = quickscreen_setter_getname;
+    if(global_settings.talk_menu)
+        info.get_talk = quickscreen_setter_speak_item;
+    info.action_callback = quickscreen_setter_action_callback;
+    info.selection = newval;
+    simplelist_show_list(&info);
+    if (info.selection != -1 && info.selection != oldval)
+    {
+        *setting = info.selection;
+        settings_save();
+    }
+    return 0;
+}
+
+
Index: apps/gui/quickscreen.h
===================================================================
--- apps/gui/quickscreen.h	(revision 18933)
+++ apps/gui/quickscreen.h	(working copy)
@@ -50,7 +50,7 @@
 extern bool quick_screen_f3(int button_enter);
 #endif
 extern bool quick_screen_quick(int button_enter);
+int quickscreen_set_option(void *data);
 
-
 #endif /*_GUI_QUICK_SCREEN_H_*/
 #endif /* HAVE_QUICKSCREEN */
Index: apps/settings.h
===================================================================
--- apps/settings.h	(revision 18933)
+++ apps/settings.h	(working copy)
@@ -751,6 +751,12 @@
 #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
     int touchpad_sensitivity;
 #endif
+#ifdef HAVE_QUICKSCREEN
+    /* these are split because settings_list cant handle arrays */
+    int qs_item_left;
+    int qs_item_right;
+    int qs_item_bottom;
+#endif
 };
 
 /** global variables **/
Index: apps/menus/settings_menu.c
===================================================================
--- apps/menus/settings_menu.c	(revision 18933)
+++ apps/menus/settings_menu.c	(working copy)
@@ -49,6 +49,7 @@
 #if CONFIG_RTC
 #include "screens.h"
 #endif
+#include "quickscreen.h"
 
 /***********************************/
 /*    TAGCACHE MENU                */
@@ -486,9 +487,27 @@
 /*    VOICE MENU                   */
 /***********************************/
 
+#ifdef HAVE_QUICKSCREEN
 /***********************************/
+/* CUSTOMISABLE QUICKSCREEN CODE   */
 
+MENUITEM_FUNCTION(qs_left_item, MENU_FUNC_USEPARAM, ID2P(LANG_LEFT),
+                (menu_function)quickscreen_set_option, (intptr_t*)QUICKSCREEN_LEFT, NULL,
+                Icon_Menu_setting);
+MENUITEM_FUNCTION(qs_right_item, MENU_FUNC_USEPARAM, ID2P(LANG_RIGHT),
+                (menu_function)quickscreen_set_option, (intptr_t*)QUICKSCREEN_RIGHT, NULL,
+                Icon_Menu_setting);
+MENUITEM_FUNCTION(qs_bottom_item, MENU_FUNC_USEPARAM, ID2P(LANG_BOTTOM),
+                (menu_function)quickscreen_set_option, (intptr_t*)QUICKSCREEN_BOTTOM, NULL,
+                Icon_Menu_setting);
+
+MAKE_MENU(quickscreen_settings, ID2P(LANG_QS_ITEMS), NULL, Icon_Config,
+        &qs_left_item, &qs_right_item, &qs_bottom_item);
+/* CUSTOMISABLE QUICKSCREEN CODE   */
 /***********************************/
+#endif
+
+/***********************************/
 /*    SETTINGS MENU                */
 static int language_browse(void)
 {
@@ -500,6 +519,9 @@
 MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
           Icon_General_settings_menu,
           &playlist_settings, &file_menu,
+#ifdef HAVE_QUICKSCREEN
+          &quickscreen_settings,
+#endif
 #ifdef HAVE_TAGCACHE
           &tagcache_menu,
 #endif
Index: apps/menus/main_menu.c
===================================================================
--- apps/menus/main_menu.c	(revision 18933)
+++ apps/menus/main_menu.c	(working copy)
@@ -524,6 +524,7 @@
 /*      INFO MENU                  */
 /***********************************/
 
+
 /***********************************/
 /*    MAIN MENU                    */
 
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c	(revision 18933)
+++ apps/settings_list.c	(working copy)
@@ -1364,6 +1364,16 @@
                    "touchpad sensitivity", "normal,high", touchpad_set_sensitivity, 2,
                    ID2P(LANG_NORMAL), ID2P(LANG_HIGH)),
 #endif
+#ifdef HAVE_QUICKSCREEN
+    /* These should not be used by the generic option screen! 
+        (i.e not in MENUITEM_SETTING() macro) */
+    INT_SETTING(F_BANFROMQS, qs_item_left, LANG_LEFT, -1, "qs left", UNIT_INT, 0,
+                666, 1, NULL, NULL, NULL),
+    INT_SETTING(F_BANFROMQS, qs_item_right, LANG_RIGHT, -1, "qs right", UNIT_INT, 0,
+                666, 1, NULL, NULL, NULL),
+    INT_SETTING(F_BANFROMQS, qs_item_bottom, LANG_BOTTOM, -1, "qs bottom", UNIT_INT, 0,
+                666, 1, NULL, NULL, NULL),
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);
Index: apps/settings_list.h
===================================================================
--- apps/settings_list.h	(revision 18933)
+++ apps/settings_list.h	(working copy)
@@ -121,8 +121,9 @@
 #define F_PADTITLE   0x800 /* pad the title with spaces to force it to scroll */
 #define F_NO_WRAP     0x1000 /* used if the list should not wrap */
 
+#define F_BANFROMQS 0x80000000 /* ban the setting from the quickscreen items */
 struct settings_list {
-    uint32_t             flags;   /* ____ _SER TFFF NNN_ _ATW PTVC IFRB STTT */
+    uint32_t             flags;   /* B___ _SER TFFF NNN_ _ATW PTVC IFRB STTT */
     void                *setting;
     int                  lang_id; /* -1 for none */
     union storage_type   default_val;