devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove to top/bottom quickscreen defaults.

Browse source 
As constantly discussed in IRC, it is insane that dirfilter and party mode are defaults on the quickscreen, both have caused countless problems for users accidentaly enabling them.
This wont change anything for users who have changed their setting, only for people who left it default

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30176 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-07-20 01:30:29 +00:00
parent ded03f43f2
commit 4983d052a0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/gui/quickscreen.c
View file

@ -392,8 +392,7 @@ bool quick_screen_quick(int button_enter)
int oldrepeat = global_settings.repeat_mode;
qs.items[QUICKSCREEN_TOP] =
get_setting(global_settings.qs_items[QUICKSCREEN_TOP],
find_setting(&global_settings.party_mode, NULL));
get_setting(global_settings.qs_items[QUICKSCREEN_TOP], NULL);
qs.items[QUICKSCREEN_LEFT] =
get_setting(global_settings.qs_items[QUICKSCREEN_LEFT],
find_setting(&global_settings.playlist_shuffle, NULL));
@ -401,8 +400,7 @@ bool quick_screen_quick(int button_enter)
get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT],
find_setting(&global_settings.repeat_mode, NULL));
qs.items[QUICKSCREEN_BOTTOM] =
get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM],
find_setting(&global_settings.dirfilter, NULL));
get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], NULL);
qs.callback = NULL;
if (gui_syncquickscreen_run(&qs, button_enter))

6
apps/settings_list.c
View file

@ -460,6 +460,8 @@ static bool qs_is_changed(void* setting, void* defaultval)
}
static void qs_set_default(void* setting, void* defaultval)
{
if (defaultval == NULL)
*(int*)setting = -1;
find_setting(defaultval, (int*)setting);
}
#endif
@ -1728,7 +1730,7 @@ const struct settings_list settings[] = {
#endif
#ifdef HAVE_QUICKSCREEN
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM,
&global_settings.dirfilter, "qs top",
NULL, "qs top",
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_LEFT], LANG_LEFT_QS_ITEM,
@ -1740,7 +1742,7 @@ const struct settings_list settings[] = {
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_BOTTOM], LANG_BOTTOM_QS_ITEM,
&global_settings.dirfilter, "qs bottom",
NULL, "qs bottom",
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
#endif