diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-08-24 00:22:54 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-08-24 00:22:54 +0000 |
commit | 97548f34d767f14de3fafc2333cfeac97ab36151 (patch) | |
tree | 826766d12ef25140bb6f8c0dbeda58a719444d81 /apps/settings_list.c | |
parent | 5850207d332f78d4fcf4a7ec22ae8b95b921a183 (diff) | |
download | rockbox-97548f34d767f14de3fafc2333cfeac97ab36151.tar.gz rockbox-97548f34d767f14de3fafc2333cfeac97ab36151.zip |
Move the "Status/Scrollbar" menu to Theme Settings, and add the F_THEMESETTING flag to the settings it was missing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22486 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 23424f94cc..23f07cb24c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -612,19 +612,20 @@ const struct settings_list settings[] = { | |||
612 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), | 612 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), |
613 | ID2P(LANG_STATUSBAR_BOTTOM)), | 613 | ID2P(LANG_STATUSBAR_BOTTOM)), |
614 | #endif | 614 | #endif |
615 | CHOICE_SETTING(F_TEMPVAR, scrollbar, | 615 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, |
616 | LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right", | 616 | LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right", |
617 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_LEFT), ID2P(LANG_RIGHT)), | 617 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_LEFT), ID2P(LANG_RIGHT)), |
618 | INT_SETTING(0, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, "scrollbar width", | 618 | INT_SETTING(F_THEMESETTING, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, |
619 | UNIT_INT, 3, LCD_WIDTH/10, 1, NULL, NULL, NULL), | 619 | "scrollbar width",UNIT_INT, 3, MAX(LCD_WIDTH/10,25), 1, |
620 | NULL, NULL, NULL), | ||
620 | #if CONFIG_KEYPAD == RECORDER_PAD | 621 | #if CONFIG_KEYPAD == RECORDER_PAD |
621 | OFFON_SETTING(0,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), | 622 | OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), |
622 | #endif | 623 | #endif |
623 | CHOICE_SETTING(0, volume_type, LANG_VOLUME_DISPLAY, 0, | 624 | CHOICE_SETTING(F_THEMESETTING, volume_type, LANG_VOLUME_DISPLAY, 0, |
624 | "volume display", graphic_numeric, NULL, 2, | 625 | "volume display", graphic_numeric, NULL, 2, |
625 | ID2P(LANG_DISPLAY_GRAPHIC), | 626 | ID2P(LANG_DISPLAY_GRAPHIC), |
626 | ID2P(LANG_DISPLAY_NUMERIC)), | 627 | ID2P(LANG_DISPLAY_NUMERIC)), |
627 | CHOICE_SETTING(0, battery_display, LANG_BATTERY_DISPLAY, 0, | 628 | CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0, |
628 | "battery display", graphic_numeric, NULL, 2, | 629 | "battery display", graphic_numeric, NULL, 2, |
629 | ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)), | 630 | ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)), |
630 | #if CONFIG_RTC | 631 | #if CONFIG_RTC |