theme remove: add sbs to remove list.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23549 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2009-11-07 14:13:38 +00:00
parent ea669d7c4a
commit fedc7b21f1
2 changed files with 32 additions and 0 deletions

View file

@ -57,8 +57,12 @@ enum remove_settings {
REMOVE_FONT, REMOVE_FONT,
#endif #endif
REMOVE_WPS, REMOVE_WPS,
#ifdef HAVE_LCD_BITMAP
REMOVE_SBS,
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
REMOVE_RWPS, REMOVE_RWPS,
REMOVE_RSBS,
#endif #endif
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
REMOVE_BACKDROP, REMOVE_BACKDROP,
@ -85,9 +89,15 @@ static struct remove_setting remove_list[NUM_REMOVE_ITEMS] = {
#endif #endif
[REMOVE_WPS] = { "wps", WPS_DIR "/", ".wps", "", [REMOVE_WPS] = { "wps", WPS_DIR "/", ".wps", "",
REMOVE_IF_NOT_USED, remove_wps, false }, REMOVE_IF_NOT_USED, remove_wps, false },
#ifdef HAVE_LCD_BITMAP
[REMOVE_SBS] = { "sbs", SBS_DIR "/", ".sbs", "",
REMOVE_IF_NOT_USED, remove_wps, false },
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
[REMOVE_RWPS] = { "rwps", WPS_DIR "/", ".rwps", "", [REMOVE_RWPS] = { "rwps", WPS_DIR "/", ".rwps", "",
REMOVE_IF_NOT_USED, remove_wps, false }, REMOVE_IF_NOT_USED, remove_wps, false },
[REMOVE_RSBS] = { "rsbs", SBS_DIR "/", ".rsbs", "",
REMOVE_IF_NOT_USED, remove_wps, false },
#endif #endif
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
[REMOVE_BACKDROP] = { "backdrop", BACKDROP_DIR "/", ".bmp", "", [REMOVE_BACKDROP] = { "backdrop", BACKDROP_DIR "/", ".bmp", "",
@ -122,10 +132,18 @@ static struct configdata config[] = {
{ TYPE_INT, 0, NUM_REMOVE_OPTION, { TYPE_INT, 0, NUM_REMOVE_OPTION,
{ .int_p = &remove_list[REMOVE_WPS].option }, { .int_p = &remove_list[REMOVE_WPS].option },
"remove wps", option_names }, "remove wps", option_names },
#ifdef HAVE_LCD_BITMAP
{ TYPE_INT, 0, NUM_REMOVE_OPTION,
{ .int_p = &remove_list[REMOVE_SBS].option },
"remove sbs", option_names },
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
{ TYPE_INT, 0, NUM_REMOVE_OPTION, { TYPE_INT, 0, NUM_REMOVE_OPTION,
{ .int_p = &remove_list[REMOVE_RWPS].option }, { .int_p = &remove_list[REMOVE_RWPS].option },
"remove rwps", option_names }, "remove rwps", option_names },
{ TYPE_INT, 0, NUM_REMOVE_OPTION,
{ .int_p = &remove_list[REMOVE_RSBS].option },
"remove rsbs", option_names },
#endif #endif
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
{ TYPE_INT, 0, NUM_REMOVE_OPTION, { TYPE_INT, 0, NUM_REMOVE_OPTION,
@ -319,8 +337,12 @@ static void check_whether_used_in_setting(void)
rb->global_settings->font_file, rb->global_settings->font_file,
#endif #endif
rb->global_settings->wps_file, rb->global_settings->wps_file,
#ifdef HAVE_LCD_BITMAP
rb->global_settings->sbs_file,
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
rb->global_settings->rwps_file, rb->global_settings->rwps_file,
rb->global_settings->rsbs_file,
#endif #endif
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
rb->global_settings->backdrop_file, rb->global_settings->backdrop_file,
@ -572,8 +594,12 @@ static bool option_menu(void)
"Font", "Font",
#endif #endif
"WPS", "WPS",
#ifdef HAVE_LCD_BITMAP
"Statusbar Skin",
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
"Remote WPS", "Remote WPS",
"Remote Statusbar Skin",
#endif #endif
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
"Backdrop", "Backdrop",

View file

@ -42,9 +42,15 @@ Some files are not removed regardless of the \setting{Remove Options} such as
}% }%
\item[WPS.] \item[WPS.]
Specifies how the \fname{.wps} file belonging to a theme \fname{.cfg} file is handled. Specifies how the \fname{.wps} file belonging to a theme \fname{.cfg} file is handled.
\opt{lcd_bitmap}{
\item[Statusbar Skin.]
Specifies how the \fname{.rsbs} file belonging to a theme \fname{.cfg} file is handled.
}%
\opt{HAVE_REMOTE_LCD}{ \opt{HAVE_REMOTE_LCD}{
\item[Remote WPS.] \item[Remote WPS.]
Specifies how the \fname{.rwps} file belonging to a theme \fname{.cfg} file is handled. Specifies how the \fname{.rwps} file belonging to a theme \fname{.cfg} file is handled.
\item[Remote Statusbar Skin.]
Specifies how the \fname{.rsbs} file belonging to a theme \fname{.cfg} file is handled.
}% }%
\opt{lcd_non-mono}{ \opt{lcd_non-mono}{
\item[Backdrop.] \item[Backdrop.]