Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang (revision 18933)
+++ apps/lang/english.lang (working copy)
@@ -12109,3 +12109,71 @@
*: "Search Results"
+
+ id: LANG_QS_ITEMS
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Quickscreen Items"
+
+
+ *: none
+ quickscreen: "Quickscreen Items"
+
+
+ *: none
+ quickscreen: "Quickscreen Items"
+
+
+
+ id: LANG_LEFT
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Left"
+
+
+ *: none
+ quickscreen: "Left"
+
+
+ *: none
+ quickscreen: "Left"
+
+
+
+ id: LANG_RIGHT
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Right"
+
+
+ *: none
+ quickscreen: "Right"
+
+
+ *: none
+ quickscreen: "Right"
+
+
+
+ id: LANG_BOTTOM
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Bottom"
+
+
+ *: none
+ quickscreen: "Bottom"
+
+
+ *: none
+ quickscreen: "Bottom"
+
+
Index: apps/gui/quickscreen.c
===================================================================
--- apps/gui/quickscreen.c (revision 18943)
+++ 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];
@@ -113,7 +114,7 @@
vps[screen][QUICKSCREEN_RIGHT].width = width;
/* shrink the icons vp by a few pixels if there is room so the arrows
- arnt' drawn right next to the text */
+ aren't drawn right next to the text */
if (vp_icons[screen].width > CENTER_ICONAREA_WIDTH+8)
{
vp_icons[screen].width -= 8;
@@ -320,18 +321,31 @@
cond_talk_ids_fq(VOICE_OK);
return changed;
}
-
+static bool is_setting_quickscreenable(const struct settings_list *setting);
+static inline const struct settings_list *get_setting(int gs_value,
+ const struct settings_list *defaultval)
+{
+ if (gs_value != -1 && gs_value < nb_settings &&
+ is_setting_quickscreenable(&settings[gs_value]))
+ return &settings[gs_value];
+ return defaultval;
+}
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] =
- find_setting(&global_settings.playlist_shuffle, NULL);
- qs.items[QUICKSCREEN_RIGHT] =
- find_setting(&global_settings.repeat_mode, NULL);
- qs.items[QUICKSCREEN_BOTTOM] =
- find_setting(&global_settings.dirfilter, NULL);
+
+ qs.items[QUICKSCREEN_LEFT] =
+ get_setting(global_settings.qs_item_left,
+ find_setting(&global_settings.playlist_shuffle, NULL));
+ qs.items[QUICKSCREEN_RIGHT] =
+ get_setting(global_settings.qs_item_right,
+ find_setting(&global_settings.repeat_mode, NULL));
+ qs.items[QUICKSCREEN_BOTTOM] =
+ get_setting(global_settings.qs_item_bottom,
+ find_setting(&global_settings.dirfilter, NULL));
+
qs.callback = NULL;
if (gui_syncquickscreen_run(&qs, button_enter))
{
@@ -378,3 +392,112 @@
}
#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;
+ }
+}
+
+const struct settings_list *find_setting_from_index(int index)
+{
+ int count = -1, i;
+ const struct settings_list *setting = &settings[0];
+ for(i=0;ilang_id), setting->cfg_name);
+ return buffer;
+}
+static int quickscreen_setter_speak_item(int selected_item, void * data)
+{
+ (void)data;
+ talk_id(find_setting_from_index(selected_item)->lang_id, true);
+ return 0;
+}
+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;icfg_name && !strcmp(setting->cfg_name, name))
+ {
+ return i;
+ }
+ i++;
+ }
+ return -1;
+}
+void qs_load_from_cfg(void* var, char*value)
+{
+ *(int*)var = find_setting_by_name(value);
+}
+char* qs_write_to_cfg(void* setting, char*buf, int buf_len)
+{
+ const struct settings_list *var = &settings[*(int*)setting];
+ strncpy(buf, var->cfg_name, buf_len);
+ return buf;
+}
+bool qs_is_changed(void* setting, void* defaultval)
+{
+ int i = *(int*)setting;
+ if (i < 0 || i >= nb_settings)
+ return false;
+ const struct settings_list *var = &settings[i];
+ return var != find_setting(defaultval, NULL);
+}
+void qs_set_default(void* setting, void* defaultval)
+{
+ find_setting(defaultval, (int*)setting);
+}
+#endif
const struct settings_list settings[] = {
/* sound settings */
SOUND_SETTING(F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME),
@@ -1364,6 +1411,20 @@
"touchpad sensitivity", "normal,high", touchpad_set_sensitivity, 2,
ID2P(LANG_NORMAL), ID2P(LANG_HIGH)),
#endif
+#ifdef HAVE_QUICKSCREEN
+ CUSTOM_SETTING(0, qs_item_left, LANG_LEFT,
+ &global_settings.playlist_shuffle, "qs left",
+ qs_load_from_cfg, qs_write_to_cfg,
+ qs_is_changed, qs_set_default),
+ CUSTOM_SETTING(0, qs_item_right, LANG_RIGHT,
+ &global_settings.repeat_mode, "qs right",
+ qs_load_from_cfg, qs_write_to_cfg,
+ qs_is_changed, qs_set_default),
+ CUSTOM_SETTING(0, qs_item_bottom, LANG_BOTTOM,
+ &global_settings.dirfilter, "qs bottom",
+ qs_load_from_cfg, qs_write_to_cfg,
+ qs_is_changed, qs_set_default),
+#endif
};
const int nb_settings = sizeof(settings)/sizeof(*settings);