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

Henrik Backe's patch that introduces 'fonts' and 'langs' subdirectories

Browse source 
in .rockbox


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4206 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2004-01-08 12:40:25 +00:00
parent 7b4cc78f03
commit 0f68958b11
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/settings.c
View file

@ -544,7 +544,7 @@ void settings_apply(void)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
if ( global_settings.font_file[0] && if ( global_settings.font_file[0] &&
global_settings.font_file[0] != 0xff ) { global_settings.font_file[0] != 0xff ) {
snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.fnt", snprintf(buf, sizeof buf, ROCKBOX_DIR FONT_DIR "/%s.fnt",
global_settings.font_file); global_settings.font_file);
font_load(buf); font_load(buf);
} }
@ -561,7 +561,7 @@ void settings_apply(void)
if ( global_settings.lang_file[0] && if ( global_settings.lang_file[0] &&
global_settings.lang_file[0] != 0xff ) { global_settings.lang_file[0] != 0xff ) {
snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.lng", snprintf(buf, sizeof buf, ROCKBOX_DIR LANG_DIR "/%s.lng",
global_settings.lang_file); global_settings.lang_file);
lang_load(buf); lang_load(buf);
} }
@ -829,7 +829,8 @@ void set_file(char* filename, char* setting, int maxlen)
ptr--; ptr--;
} }
if (strcmp(ROCKBOX_DIR, filename) || (len-extlen > maxlen)) if (strncmp(ROCKBOX_DIR, filename ,strlen(ROCKBOX_DIR)) ||
(len-extlen > maxlen))
return; return;
strncpy(setting, fptr, len-extlen); strncpy(setting, fptr, len-extlen);
@ -1187,12 +1188,12 @@ bool settings_save_config(void)
global_settings.wps_file); global_settings.wps_file);
if (global_settings.lang_file[0] != 0) if (global_settings.lang_file[0] != 0)
fprintf(fd, "lang: %s/%s.lng\r\n", ROCKBOX_DIR, fprintf(fd, "lang: %s/%s.lng\r\n", ROCKBOX_DIR LANG_DIR,
global_settings.lang_file); global_settings.lang_file);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
if (global_settings.font_file[0] != 0) if (global_settings.font_file[0] != 0)
fprintf(fd, "font: %s/%s.fnt\r\n", ROCKBOX_DIR, fprintf(fd, "font: %s/%s.fnt\r\n", ROCKBOX_DIR FONT_DIR,
global_settings.font_file); global_settings.font_file);
#endif #endif

2
apps/settings.h
View file

@ -25,6 +25,8 @@
#include "file.h" #include "file.h"
#define ROCKBOX_DIR "/.rockbox" #define ROCKBOX_DIR "/.rockbox"
#define FONT_DIR "/fonts"
#define LANG_DIR "/langs"
#define PLUGIN_DIR ROCKBOX_DIR"/rocks" #define PLUGIN_DIR ROCKBOX_DIR"/rocks"
#define MAX_FILENAME 20 #define MAX_FILENAME 20

4
apps/settings_menu.c
View file

@ -731,13 +731,13 @@ static bool custom_cfg_browse(void)
static bool language_browse(void) static bool language_browse(void)
{ {
return rockbox_browse(ROCKBOX_DIR, SHOW_LNG); return rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG);
} }
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
static bool font_browse(void) static bool font_browse(void)
{ {
return rockbox_browse(ROCKBOX_DIR, SHOW_FONT); return rockbox_browse(ROCKBOX_DIR FONT_DIR, SHOW_FONT);
} }
#endif #endif