diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-19 03:15:48 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-19 03:15:48 +0000 |
commit | ac07222b8359bdf5ed2dffb91e2c63b4e7cdc35d (patch) | |
tree | b287b54573f1a51118fa3814c13d8857fde2c387 /apps/settings_list.c | |
parent | 36175ac9453999d2d079c521126ecc5ac7a8d984 (diff) | |
download | rockbox-ac07222b8359bdf5ed2dffb91e2c63b4e7cdc35d.tar.gz rockbox-ac07222b8359bdf5ed2dffb91e2c63b4e7cdc35d.zip |
Flip the order of some of the setting screens. (If any more are
backwards let me know in the thread or IRC)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12400 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index a505232643..3203414afe 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -413,12 +413,12 @@ const struct settings_list settings[] = { | |||
413 | MAX_CONTRAST_SETTING, 1, NULL, NULL}}}}, | 413 | MAX_CONTRAST_SETTING, 1, NULL, NULL}}}}, |
414 | #endif | 414 | #endif |
415 | #if CONFIG_BACKLIGHT | 415 | #if CONFIG_BACKLIGHT |
416 | INT_SETTING_W_CFGVALS(0, backlight_timeout, LANG_BACKLIGHT, 6, | 416 | INT_SETTING_W_CFGVALS(F_FLIPLIST, backlight_timeout, LANG_BACKLIGHT, 6, |
417 | "backlight timeout", backlight_times_conf, UNIT_SEC, | 417 | "backlight timeout", backlight_times_conf, UNIT_SEC, |
418 | 0, 18, 1, backlight_formatter, backlight_getlang, | 418 | 0, 18, 1, backlight_formatter, backlight_getlang, |
419 | backlight_set_timeout), | 419 | backlight_set_timeout), |
420 | #if CONFIG_CHARGING | 420 | #if CONFIG_CHARGING |
421 | INT_SETTING_W_CFGVALS(0, backlight_timeout_plugged, | 421 | INT_SETTING_W_CFGVALS(F_FLIPLIST, backlight_timeout_plugged, |
422 | LANG_BACKLIGHT_ON_WHEN_CHARGING, 11, | 422 | LANG_BACKLIGHT_ON_WHEN_CHARGING, 11, |
423 | "backlight timeout plugged", backlight_times_conf, UNIT_SEC, | 423 | "backlight timeout plugged", backlight_times_conf, UNIT_SEC, |
424 | 0, 18, 1, backlight_formatter, backlight_getlang, | 424 | 0, 18, 1, backlight_formatter, backlight_getlang, |
@@ -449,7 +449,7 @@ const struct settings_list settings[] = { | |||
449 | #endif /* HAVE_LCD_BITMAP */ | 449 | #endif /* HAVE_LCD_BITMAP */ |
450 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), | 450 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), |
451 | /* system */ | 451 | /* system */ |
452 | INT_SETTING_W_CFGVALS(0, poweroff, LANG_POWEROFF_IDLE, 10, "idle poweroff", | 452 | INT_SETTING_W_CFGVALS(F_FLIPLIST, poweroff, LANG_POWEROFF_IDLE, 10, "idle poweroff", |
453 | "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60", UNIT_MIN, | 453 | "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60", UNIT_MIN, |
454 | 0, 14, 1, poweroff_idle_timer_formatter, | 454 | 0, 14, 1, poweroff_idle_timer_formatter, |
455 | poweroff_idle_timer_getlang, set_poweroff_timeout), | 455 | poweroff_idle_timer_getlang, set_poweroff_timeout), |
@@ -502,12 +502,12 @@ const struct settings_list settings[] = { | |||
502 | LANG_INVERT_LCD_INVERSE, LANG_INVERT_LCD_NORMAL, lcd_remote_set_invert_display), | 502 | LANG_INVERT_LCD_INVERSE, LANG_INVERT_LCD_NORMAL, lcd_remote_set_invert_display), |
503 | OFFON_SETTING(0,remote_flip_display, LANG_FLIP_DISPLAY, | 503 | OFFON_SETTING(0,remote_flip_display, LANG_FLIP_DISPLAY, |
504 | false,"remote flip display", NULL), | 504 | false,"remote flip display", NULL), |
505 | INT_SETTING_W_CFGVALS(0, remote_backlight_timeout, LANG_BACKLIGHT, 6, | 505 | INT_SETTING_W_CFGVALS(F_FLIPLIST, remote_backlight_timeout, LANG_BACKLIGHT, 6, |
506 | "remote backlight timeout", backlight_times_conf, UNIT_SEC, | 506 | "remote backlight timeout", backlight_times_conf, UNIT_SEC, |
507 | 0, 18, 1, backlight_formatter, backlight_getlang, | 507 | 0, 18, 1, backlight_formatter, backlight_getlang, |
508 | remote_backlight_set_timeout), | 508 | remote_backlight_set_timeout), |
509 | #if CONFIG_CHARGING | 509 | #if CONFIG_CHARGING |
510 | INT_SETTING_W_CFGVALS(0, remote_backlight_timeout_plugged, LANG_BACKLIGHT, 11, | 510 | INT_SETTING_W_CFGVALS(F_FLIPLIST, remote_backlight_timeout_plugged, LANG_BACKLIGHT, 11, |
511 | "remote backlight timeout plugged", backlight_times_conf, UNIT_SEC, | 511 | "remote backlight timeout plugged", backlight_times_conf, UNIT_SEC, |
512 | 0, 18, 1, backlight_formatter, backlight_getlang, | 512 | 0, 18, 1, backlight_formatter, backlight_getlang, |
513 | remote_backlight_set_timeout_plugged), | 513 | remote_backlight_set_timeout_plugged), |
@@ -600,7 +600,7 @@ const struct settings_list settings[] = { | |||
600 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), | 600 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), |
601 | OFFON_SETTING(0,party_mode,LANG_PARTY_MODE,false,"party mode",NULL), | 601 | OFFON_SETTING(0,party_mode,LANG_PARTY_MODE,false,"party mode",NULL), |
602 | OFFON_SETTING(0,fade_on_stop,LANG_FADE_ON_STOP,true,"volume fade",NULL), | 602 | OFFON_SETTING(0,fade_on_stop,LANG_FADE_ON_STOP,true,"volume fade",NULL), |
603 | INT_SETTING_W_CFGVALS(0, ff_rewind_min_step, LANG_FFRW_STEP, FF_REWIND_1000, | 603 | INT_SETTING_W_CFGVALS(F_FLIPLIST, ff_rewind_min_step, LANG_FFRW_STEP, FF_REWIND_1000, |
604 | "scan min step", "1,2,3,4,5,6,8,10,15,20,25,30,45,60", UNIT_SEC, | 604 | "scan min step", "1,2,3,4,5,6,8,10,15,20,25,30,45,60", UNIT_SEC, |
605 | 13, 0, -1, ff_rewind_min_step_formatter, | 605 | 13, 0, -1, ff_rewind_min_step_formatter, |
606 | ff_rewind_min_step_getlang, NULL), | 606 | ff_rewind_min_step_getlang, NULL), |