Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make user-visible spelling "colours" rather than "colors".

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13671 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Paul Louden 2007-06-19 04:21:06 +00:00
parent f01b661116
commit f8b5913ae7
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/filetypes.c
View file

@ -143,7 +143,7 @@ static void read_config(char* config_file);
/* Colors file format is similar to icons: /* Colors file format is similar to icons:
* ext:hex_color * ext:hex_color
* load a colors file from a theme with: * load a colors file from a theme with:
* filetype colors: filename.colors */ * filetype colours: filename.colours */
void read_color_theme_file(void) { void read_color_theme_file(void) {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
int fd; int fd;
@ -152,7 +152,7 @@ void read_color_theme_file(void) {
for (i = 0; i < filetype_count; i++) { for (i = 0; i < filetype_count; i++) {
custom_colors[i] = -1; custom_colors[i] = -1;
} }
snprintf(buffer, MAX_PATH, "%s/%s.colors", THEME_DIR, snprintf(buffer, MAX_PATH, "%s/%s.colours", THEME_DIR,
global_settings.colors_file); global_settings.colors_file);
fd = open(buffer, O_RDONLY); fd = open(buffer, O_RDONLY);
if (fd < 0) if (fd < 0)

2
apps/plugins/text_editor.c
View file

@ -360,7 +360,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
} }
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
c = rb->strrchr(filename, '.'); c = rb->strrchr(filename, '.');
if (c && !rb->strcmp(c, ".colors")) if (c && !rb->strcmp(c, ".colours"))
edit_colors_file = true; edit_colors_file = true;
#endif #endif
/* read in the file */ /* read in the file */

4
apps/settings_list.c
View file

@ -1215,8 +1215,8 @@ const struct settings_list settings[] = {
ICON_DIR "/", ".bmp", MAX_FILENAME+1), ICON_DIR "/", ".bmp", MAX_FILENAME+1),
#endif /* HAVE_REMOTE_LCD */ #endif /* HAVE_REMOTE_LCD */
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colors", "", FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colours", "",
THEME_DIR "/", ".colors", MAX_FILENAME+1), THEME_DIR "/", ".colours", MAX_FILENAME+1),
#endif #endif
#ifdef HAVE_BUTTON_LIGHT #ifdef HAVE_BUTTON_LIGHT
INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout, INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout,

2
docs/FILES
View file

@ -14,4 +14,4 @@ README
TECH TECH
UISIMULATOR UISIMULATOR
KNOWN_ISSUES KNOWN_ISSUES
sample.colors sample.colours

0
docs/sample.colors → docs/sample.colours
View file

2
tools/buildzip.pl
View file

@ -363,7 +363,7 @@ STOP
if ($fonts) { if ($fonts) {
`cp $ROOT/docs/profontdoc.txt .rockbox/docs/`; `cp $ROOT/docs/profontdoc.txt .rockbox/docs/`;
} }
for(("sample.colors", for(("sample.colours",
"sample.icons" "sample.icons"
)) { )) {
`cp $ROOT/docs/$_ .rockbox/docs/`; `cp $ROOT/docs/$_ .rockbox/docs/`;