From 5e4f4d08db206809f504a9d82b39584b9de40883 Mon Sep 17 00:00:00 2001 From: teru Date: Sat, 7 Nov 2009 14:13:38 +0000 Subject: [PATCH] theme remove: add sbs to remove list. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23549 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/theme_remove.c | 26 ++++++++++++++++++++++++++ manual/plugins/theme_remove.tex | 6 ++++++ 2 files changed, 32 insertions(+) diff --git a/apps/plugins/theme_remove.c b/apps/plugins/theme_remove.c index a2e7bf21a..3bb41929f 100644 --- a/apps/plugins/theme_remove.c +++ b/apps/plugins/theme_remove.c @@ -57,8 +57,12 @@ enum remove_settings { REMOVE_FONT, #endif REMOVE_WPS, +#ifdef HAVE_LCD_BITMAP + REMOVE_SBS, +#endif #ifdef HAVE_REMOTE_LCD REMOVE_RWPS, + REMOVE_RSBS, #endif #if LCD_DEPTH > 1 REMOVE_BACKDROP, @@ -85,9 +89,15 @@ static struct remove_setting remove_list[NUM_REMOVE_ITEMS] = { #endif [REMOVE_WPS] = { "wps", WPS_DIR "/", ".wps", "", 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 [REMOVE_RWPS] = { "rwps", WPS_DIR "/", ".rwps", "", REMOVE_IF_NOT_USED, remove_wps, false }, + [REMOVE_RSBS] = { "rsbs", SBS_DIR "/", ".rsbs", "", + REMOVE_IF_NOT_USED, remove_wps, false }, #endif #if LCD_DEPTH > 1 [REMOVE_BACKDROP] = { "backdrop", BACKDROP_DIR "/", ".bmp", "", @@ -122,10 +132,18 @@ static struct configdata config[] = { { TYPE_INT, 0, NUM_REMOVE_OPTION, { .int_p = &remove_list[REMOVE_WPS].option }, "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 { TYPE_INT, 0, NUM_REMOVE_OPTION, { .int_p = &remove_list[REMOVE_RWPS].option }, "remove rwps", option_names }, + { TYPE_INT, 0, NUM_REMOVE_OPTION, + { .int_p = &remove_list[REMOVE_RSBS].option }, + "remove rsbs", option_names }, #endif #if LCD_DEPTH > 1 { TYPE_INT, 0, NUM_REMOVE_OPTION, @@ -319,8 +337,12 @@ static void check_whether_used_in_setting(void) rb->global_settings->font_file, #endif rb->global_settings->wps_file, +#ifdef HAVE_LCD_BITMAP + rb->global_settings->sbs_file, +#endif #ifdef HAVE_REMOTE_LCD rb->global_settings->rwps_file, + rb->global_settings->rsbs_file, #endif #if LCD_DEPTH > 1 rb->global_settings->backdrop_file, @@ -572,8 +594,12 @@ static bool option_menu(void) "Font", #endif "WPS", +#ifdef HAVE_LCD_BITMAP + "Statusbar Skin", +#endif #ifdef HAVE_REMOTE_LCD "Remote WPS", + "Remote Statusbar Skin", #endif #if LCD_DEPTH > 1 "Backdrop", diff --git a/manual/plugins/theme_remove.tex b/manual/plugins/theme_remove.tex index 4bea22140..e255d8822 100644 --- a/manual/plugins/theme_remove.tex +++ b/manual/plugins/theme_remove.tex @@ -42,9 +42,15 @@ Some files are not removed regardless of the \setting{Remove Options} such as }% \item[WPS.] 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}{ \item[Remote WPS.] 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}{ \item[Backdrop.] -- 2.11.4.GIT