diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2008-02-23 03:56:39 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2008-02-23 03:56:39 +0000 |
commit | aa269621047136db9960634057a7dac1d3981e5d (patch) | |
tree | 5b9d1b03496a1c32e7f2ff1200f76144199ca2fa /apps/settings_list.c | |
parent | 875937a26dd25ee2b8d116dcab8880b7e696f02d (diff) | |
download | rockbox-aa269621047136db9960634057a7dac1d3981e5d.tar.gz rockbox-aa269621047136db9960634057a7dac1d3981e5d.zip |
Make cabbiev2 the default theme. Should not have any impact if you have already selected a theme. Please report any bugs in FS#8443.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16377 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 68 |
1 files changed, 53 insertions, 15 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 8a0b0e1d50..df01eb53f1 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -164,6 +164,42 @@ static const char off_number_spell[] = "off,number,spell"; | |||
164 | static const char graphic_numeric[] = "graphic,numeric"; | 164 | static const char graphic_numeric[] = "graphic,numeric"; |
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | /* Default theme settings */ | ||
168 | #ifdef HAVE_LCD_BITMAP | ||
169 | |||
170 | #if LCD_HEIGHT <= 64 | ||
171 | #define DEFAULT_FONTNAME "rockfont-8" | ||
172 | #elif LCD_HEIGHT <= 80 | ||
173 | #define DEFAULT_FONTNAME "Sazanami-Mincho-Regular-11" | ||
174 | #elif LCD_HEIGHT <= 220 | ||
175 | #define DEFAULT_FONTNAME "helvR10" | ||
176 | #elif LCD_HEIGHT <= 240 | ||
177 | #define DEFAULT_FONTNAME "helvR12" | ||
178 | #elif LCD_HEIGHT <= 320 | ||
179 | #define DEFAULT_FONTNAME "helvR14" | ||
180 | #endif | ||
181 | #define DEFAULT_WPSNAME "cabbiev2" | ||
182 | #else | ||
183 | #define DEFAULT_FONTNAME "" | ||
184 | #define DEFAULT_WPSNAME "" | ||
185 | #endif | ||
186 | |||
187 | #ifdef HAVE_LCD_COLOR | ||
188 | #define DEFAULT_ICONSET "tango_small" | ||
189 | #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers" | ||
190 | #else | ||
191 | #define DEFAULT_ICONSET "tango_small_mono" | ||
192 | #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers_mono" | ||
193 | #endif | ||
194 | |||
195 | #define DEFAULT_THEME_FOREGROUND LCD_RGBPACK(0xce, 0xcf, 0xce) | ||
196 | #define DEFAULT_THEME_BACKGROUND LCD_RGBPACK(0x00, 0x00, 0x00) | ||
197 | #define DEFAULT_THEME_SELECTOR_START LCD_RGBPACK(0xff, 0xeb, 0x9c) | ||
198 | #define DEFAULT_THEME_SELECTOR_END LCD_RGBPACK(0xb5, 0x8e, 0x00) | ||
199 | #define DEFAULT_THEME_SELECTOR_TEXT LCD_RGBPACK(0x00, 0x00, 0x00) | ||
200 | |||
201 | #define DEFAULT_BACKDROP "cabbiev2" | ||
202 | |||
167 | #ifdef HAVE_RECORDING | 203 | #ifdef HAVE_RECORDING |
168 | /* keep synchronous to trig_durations and | 204 | /* keep synchronous to trig_durations and |
169 | trigger_times in settings_apply_trigger */ | 205 | trigger_times in settings_apply_trigger */ |
@@ -401,7 +437,7 @@ const struct settings_list settings[] = { | |||
401 | OFFON_SETTING(0,flip_display, LANG_FLIP_DISPLAY, false,"flip display", NULL), | 437 | OFFON_SETTING(0,flip_display, LANG_FLIP_DISPLAY, false,"flip display", NULL), |
402 | #endif | 438 | #endif |
403 | /* display */ | 439 | /* display */ |
404 | CHOICE_SETTING(F_TEMPVAR|F_THEMESETTING, cursor_style, LANG_INVERT_CURSOR, 1, | 440 | CHOICE_SETTING(F_TEMPVAR|F_THEMESETTING, cursor_style, LANG_INVERT_CURSOR, 3, |
405 | #ifdef HAVE_LCD_COLOR | 441 | #ifdef HAVE_LCD_COLOR |
406 | "selector type", "pointer,bar (inverse),bar (color),bar (gradient)", | 442 | "selector type", "pointer,bar (inverse),bar (color),bar (gradient)", |
407 | NULL, 4, | 443 | NULL, 4, |
@@ -575,16 +611,18 @@ const struct settings_list settings[] = { | |||
575 | OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, | 611 | OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, |
576 | false,"scroll paginated",NULL), | 612 | false,"scroll paginated",NULL), |
577 | #ifdef HAVE_LCD_COLOR | 613 | #ifdef HAVE_LCD_COLOR |
578 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.fg_color,-1,INT(LCD_DEFAULT_FG), | 614 | |
615 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.fg_color,-1,INT(DEFAULT_THEME_FOREGROUND), | ||
579 | "foreground color",NULL,UNUSED}, | 616 | "foreground color",NULL,UNUSED}, |
580 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.bg_color,-1,INT(LCD_DEFAULT_BG), | 617 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.bg_color,-1,INT(DEFAULT_THEME_BACKGROUND), |
581 | "background color",NULL,UNUSED}, | 618 | "background color",NULL,UNUSED}, |
582 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lss_color,-1,INT(LCD_DEFAULT_LS), | 619 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lss_color,-1,INT(DEFAULT_THEME_SELECTOR_START), |
583 | "line selector start color",NULL,UNUSED}, | 620 | "line selector start color",NULL,UNUSED}, |
584 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lse_color,-1,INT(LCD_DEFAULT_BG), | 621 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lse_color,-1,INT(DEFAULT_THEME_SELECTOR_END), |
585 | "line selector end color",NULL,UNUSED}, | 622 | "line selector end color",NULL,UNUSED}, |
586 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lst_color,-1,INT(LCD_DEFAULT_FG), | 623 | {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lst_color,-1,INT(DEFAULT_THEME_SELECTOR_TEXT), |
587 | "line selector text color",NULL,UNUSED}, | 624 | "line selector text color",NULL,UNUSED}, |
625 | |||
588 | #endif | 626 | #endif |
589 | /* more playback */ | 627 | /* more playback */ |
590 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), | 628 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), |
@@ -1078,25 +1116,25 @@ const struct settings_list settings[] = { | |||
1078 | INT(0),"trigger type","stop,pause,nf stp",UNUSED}, | 1116 | INT(0),"trigger type","stop,pause,nf stp",UNUSED}, |
1079 | #endif | 1117 | #endif |
1080 | 1118 | ||
1081 | /** settings not in the old config blocks **/ | 1119 | /** settings not in the old config blocks **/ |
1082 | #if CONFIG_TUNER | 1120 | #if CONFIG_TUNER |
1083 | FILENAME_SETTING(0, fmr_file, "fmr", | 1121 | FILENAME_SETTING(0, fmr_file, "fmr", |
1084 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), | 1122 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), |
1085 | #endif | 1123 | #endif |
1086 | #ifdef HAVE_LCD_BITMAP | 1124 | #ifdef HAVE_LCD_BITMAP |
1087 | FILENAME_SETTING(F_THEMESETTING, font_file, "font", | 1125 | FILENAME_SETTING(F_THEMESETTING, font_file, "font", |
1088 | "", FONT_DIR "/", ".fnt", MAX_FILENAME+1), | 1126 | DEFAULT_FONTNAME, FONT_DIR "/", ".fnt", MAX_FILENAME+1), |
1089 | #endif | 1127 | #endif |
1090 | FILENAME_SETTING(F_THEMESETTING,wps_file, "wps", | 1128 | FILENAME_SETTING(F_THEMESETTING,wps_file, "wps", |
1091 | "", WPS_DIR "/", ".wps", MAX_FILENAME+1), | 1129 | DEFAULT_WPSNAME, WPS_DIR "/", ".wps", MAX_FILENAME+1), |
1092 | FILENAME_SETTING(0,lang_file,"lang","",LANG_DIR "/",".lng",MAX_FILENAME+1), | 1130 | FILENAME_SETTING(0,lang_file,"lang","",LANG_DIR "/",".lng",MAX_FILENAME+1), |
1093 | #ifdef HAVE_REMOTE_LCD | 1131 | #ifdef HAVE_REMOTE_LCD |
1094 | FILENAME_SETTING(F_THEMESETTING,rwps_file,"rwps", | 1132 | FILENAME_SETTING(F_THEMESETTING,rwps_file,"rwps", |
1095 | "", WPS_DIR "/", ".rwps", MAX_FILENAME+1), | 1133 | DEFAULT_WPSNAME, WPS_DIR "/", ".rwps", MAX_FILENAME+1), |
1096 | #endif | 1134 | #endif |
1097 | #if LCD_DEPTH > 1 | 1135 | #if LCD_DEPTH > 1 |
1098 | FILENAME_SETTING(F_THEMESETTING,backdrop_file,"backdrop", | 1136 | FILENAME_SETTING(F_THEMESETTING,backdrop_file,"backdrop", |
1099 | "", BACKDROP_DIR "/", ".bmp", MAX_FILENAME+1), | 1137 | DEFAULT_BACKDROP, BACKDROP_DIR "/", ".bmp", MAX_FILENAME+1), |
1100 | #endif | 1138 | #endif |
1101 | #ifdef HAVE_LCD_BITMAP | 1139 | #ifdef HAVE_LCD_BITMAP |
1102 | FILENAME_SETTING(0,kbd_file,"kbd","",ROCKBOX_DIR "/",".kbd",MAX_FILENAME+1), | 1140 | FILENAME_SETTING(0,kbd_file,"kbd","",ROCKBOX_DIR "/",".kbd",MAX_FILENAME+1), |
@@ -1140,12 +1178,12 @@ const struct settings_list settings[] = { | |||
1140 | {F_T_INT, &global_settings.alarm_wake_up_screen, LANG_ALARM_WAKEUP_SCREEN, | 1178 | {F_T_INT, &global_settings.alarm_wake_up_screen, LANG_ALARM_WAKEUP_SCREEN, |
1141 | INT(ALARM_START_WPS), "alarm wakeup screen", ALARM_SETTING_TEXT, UNUSED}, | 1179 | INT(ALARM_START_WPS), "alarm wakeup screen", ALARM_SETTING_TEXT, UNUSED}, |
1142 | #endif /* HAVE_RTC_ALARM */ | 1180 | #endif /* HAVE_RTC_ALARM */ |
1143 | 1181 | ||
1144 | /* Customizable icons */ | 1182 | /* Customizable icons */ |
1145 | #ifdef HAVE_LCD_BITMAP | 1183 | #ifdef HAVE_LCD_BITMAP |
1146 | FILENAME_SETTING(F_THEMESETTING, icon_file, "iconset", "", | 1184 | FILENAME_SETTING(F_THEMESETTING, icon_file, "iconset", DEFAULT_ICONSET, |
1147 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), | 1185 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), |
1148 | FILENAME_SETTING(F_THEMESETTING, viewers_icon_file, "viewers iconset", "", | 1186 | FILENAME_SETTING(F_THEMESETTING, viewers_icon_file, "viewers iconset", DEFAULT_VIEWERS_ICONSET, |
1149 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), | 1187 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), |
1150 | #endif | 1188 | #endif |
1151 | #ifdef HAVE_REMOTE_LCD | 1189 | #ifdef HAVE_REMOTE_LCD |
@@ -1156,7 +1194,7 @@ const struct settings_list settings[] = { | |||
1156 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), | 1194 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), |
1157 | #endif /* HAVE_REMOTE_LCD */ | 1195 | #endif /* HAVE_REMOTE_LCD */ |
1158 | #ifdef HAVE_LCD_COLOR | 1196 | #ifdef HAVE_LCD_COLOR |
1159 | FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colours", "", | 1197 | FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colours", "-", |
1160 | THEME_DIR "/", ".colours", MAX_FILENAME+1), | 1198 | THEME_DIR "/", ".colours", MAX_FILENAME+1), |
1161 | #endif | 1199 | #endif |
1162 | #ifdef HAVE_BUTTON_LIGHT | 1200 | #ifdef HAVE_BUTTON_LIGHT |