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

fix typo of wps and sbs.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24841 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-22 05:16:11 +00:00
parent 31eda59720
commit f11fd781d4
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/settings.c
View file

@ -754,17 +754,18 @@ void settings_apply_skins(void)
skin_font_init(); skin_font_init();
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
const char* setting; const char* setting = global_settings.sbs_file;
const char* suffix = ".sbs";
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE) if (i == SCREEN_REMOTE)
{
setting = global_settings.rsbs_file; setting = global_settings.rsbs_file;
else suffix = ".rsbs";
}
#endif #endif
setting = global_settings.sbs_file;
if (setting[0] && setting[0] != '-') if (setting[0] && setting[0] != '-')
{ {
snprintf(buf, sizeof buf, SBS_DIR "/%s.%ssbs", setting, snprintf(buf, sizeof buf, SBS_DIR "/%s%s", setting, suffix);
i == SCREEN_MAIN? "" : "r");
sb_skin_data_load(i, buf, true); sb_skin_data_load(i, buf, true);
} }
else else
@ -776,14 +777,17 @@ void settings_apply_skins(void)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
const char* setting = global_settings.wps_file; const char* setting = global_settings.wps_file;
const char* suffix = ".wps";
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE) if (i == SCREEN_REMOTE)
setting = global_settings.rsbs_file; {
setting = global_settings.rwps_file;
suffix = ".rwps";
}
#endif #endif
if (setting[0] && setting[0] != '-') if (setting[0] && setting[0] != '-')
{ {
snprintf(buf, sizeof buf, WPS_DIR "/%s.%swps", setting, snprintf(buf, sizeof buf, WPS_DIR "/%s%s", setting, suffix);
i == SCREEN_MAIN? "" : "r");
wps_data_load(SCREEN_MAIN, buf, true); wps_data_load(SCREEN_MAIN, buf, true);
} }
else else

8
apps/settings_list.c
View file

@ -199,7 +199,7 @@ static const char graphic_numeric[] = "graphic,numeric";
/* Default theme settings */ /* Default theme settings */
#define DEFAULT_WPSNAME "cabbiev2" #define DEFAULT_WPSNAME "cabbiev2"
#define DEFAULT_SBS_NAME "-" #define DEFAULT_SBSNAME "-"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -1440,13 +1440,13 @@ const struct settings_list settings[] = {
DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), DEFAULT_WPSNAME, WPS_DIR "/", ".wps"),
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs",
DEFAULT_SBS_NAME, SBS_DIR "/", ".sbs"), DEFAULT_SBSNAME, SBS_DIR "/", ".sbs"),
#endif #endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps",
DEFAULT_SBS_NAME, WPS_DIR "/", ".rwps"), DEFAULT_WPSNAME, WPS_DIR "/", ".rwps"),
TEXT_SETTING(F_THEMESETTING,rsbs_file, "rsbs", TEXT_SETTING(F_THEMESETTING,rsbs_file, "rsbs",
DEFAULT_WPSNAME, SBS_DIR "/", ".rsbs"), DEFAULT_SBSNAME, SBS_DIR "/", ".rsbs"),
#endif #endif
TEXT_SETTING(0,lang_file,"lang","-",LANG_DIR "/",".lng"), TEXT_SETTING(0,lang_file,"lang","-",LANG_DIR "/",".lng"),
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1