diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-11-07 14:13:38 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-11-07 14:13:38 +0000 |
commit | fedc7b21f1d823256d955b55ef4f301f915312e0 (patch) | |
tree | ab38a133eabe330922458e16b01e4ec8cd9dcb3d | |
parent | ea669d7c4a07bbc1709a69b3b28d9e96b415c88f (diff) | |
download | rockbox-fedc7b21f1d823256d955b55ef4f301f915312e0.tar.gz rockbox-fedc7b21f1d823256d955b55ef4f301f915312e0.zip |
theme remove: add sbs to remove list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23549 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/theme_remove.c | 26 | ||||
-rw-r--r-- | manual/plugins/theme_remove.tex | 6 |
2 files changed, 32 insertions, 0 deletions
diff --git a/apps/plugins/theme_remove.c b/apps/plugins/theme_remove.c index a2e7bf21a5..3bb41929f3 100644 --- a/apps/plugins/theme_remove.c +++ b/apps/plugins/theme_remove.c | |||
@@ -57,8 +57,12 @@ enum remove_settings { | |||
57 | REMOVE_FONT, | 57 | REMOVE_FONT, |
58 | #endif | 58 | #endif |
59 | REMOVE_WPS, | 59 | REMOVE_WPS, |
60 | #ifdef HAVE_LCD_BITMAP | ||
61 | REMOVE_SBS, | ||
62 | #endif | ||
60 | #ifdef HAVE_REMOTE_LCD | 63 | #ifdef HAVE_REMOTE_LCD |
61 | REMOVE_RWPS, | 64 | REMOVE_RWPS, |
65 | REMOVE_RSBS, | ||
62 | #endif | 66 | #endif |
63 | #if LCD_DEPTH > 1 | 67 | #if LCD_DEPTH > 1 |
64 | REMOVE_BACKDROP, | 68 | REMOVE_BACKDROP, |
@@ -85,9 +89,15 @@ static struct remove_setting remove_list[NUM_REMOVE_ITEMS] = { | |||
85 | #endif | 89 | #endif |
86 | [REMOVE_WPS] = { "wps", WPS_DIR "/", ".wps", "", | 90 | [REMOVE_WPS] = { "wps", WPS_DIR "/", ".wps", "", |
87 | REMOVE_IF_NOT_USED, remove_wps, false }, | 91 | REMOVE_IF_NOT_USED, remove_wps, false }, |
92 | #ifdef HAVE_LCD_BITMAP | ||
93 | [REMOVE_SBS] = { "sbs", SBS_DIR "/", ".sbs", "", | ||
94 | REMOVE_IF_NOT_USED, remove_wps, false }, | ||
95 | #endif | ||
88 | #ifdef HAVE_REMOTE_LCD | 96 | #ifdef HAVE_REMOTE_LCD |
89 | [REMOVE_RWPS] = { "rwps", WPS_DIR "/", ".rwps", "", | 97 | [REMOVE_RWPS] = { "rwps", WPS_DIR "/", ".rwps", "", |
90 | REMOVE_IF_NOT_USED, remove_wps, false }, | 98 | REMOVE_IF_NOT_USED, remove_wps, false }, |
99 | [REMOVE_RSBS] = { "rsbs", SBS_DIR "/", ".rsbs", "", | ||
100 | REMOVE_IF_NOT_USED, remove_wps, false }, | ||
91 | #endif | 101 | #endif |
92 | #if LCD_DEPTH > 1 | 102 | #if LCD_DEPTH > 1 |
93 | [REMOVE_BACKDROP] = { "backdrop", BACKDROP_DIR "/", ".bmp", "", | 103 | [REMOVE_BACKDROP] = { "backdrop", BACKDROP_DIR "/", ".bmp", "", |
@@ -122,10 +132,18 @@ static struct configdata config[] = { | |||
122 | { TYPE_INT, 0, NUM_REMOVE_OPTION, | 132 | { TYPE_INT, 0, NUM_REMOVE_OPTION, |
123 | { .int_p = &remove_list[REMOVE_WPS].option }, | 133 | { .int_p = &remove_list[REMOVE_WPS].option }, |
124 | "remove wps", option_names }, | 134 | "remove wps", option_names }, |
135 | #ifdef HAVE_LCD_BITMAP | ||
136 | { TYPE_INT, 0, NUM_REMOVE_OPTION, | ||
137 | { .int_p = &remove_list[REMOVE_SBS].option }, | ||
138 | "remove sbs", option_names }, | ||
139 | #endif | ||
125 | #ifdef HAVE_REMOTE_LCD | 140 | #ifdef HAVE_REMOTE_LCD |
126 | { TYPE_INT, 0, NUM_REMOVE_OPTION, | 141 | { TYPE_INT, 0, NUM_REMOVE_OPTION, |
127 | { .int_p = &remove_list[REMOVE_RWPS].option }, | 142 | { .int_p = &remove_list[REMOVE_RWPS].option }, |
128 | "remove rwps", option_names }, | 143 | "remove rwps", option_names }, |
144 | { TYPE_INT, 0, NUM_REMOVE_OPTION, | ||
145 | { .int_p = &remove_list[REMOVE_RSBS].option }, | ||
146 | "remove rsbs", option_names }, | ||
129 | #endif | 147 | #endif |
130 | #if LCD_DEPTH > 1 | 148 | #if LCD_DEPTH > 1 |
131 | { TYPE_INT, 0, NUM_REMOVE_OPTION, | 149 | { TYPE_INT, 0, NUM_REMOVE_OPTION, |
@@ -319,8 +337,12 @@ static void check_whether_used_in_setting(void) | |||
319 | rb->global_settings->font_file, | 337 | rb->global_settings->font_file, |
320 | #endif | 338 | #endif |
321 | rb->global_settings->wps_file, | 339 | rb->global_settings->wps_file, |
340 | #ifdef HAVE_LCD_BITMAP | ||
341 | rb->global_settings->sbs_file, | ||
342 | #endif | ||
322 | #ifdef HAVE_REMOTE_LCD | 343 | #ifdef HAVE_REMOTE_LCD |
323 | rb->global_settings->rwps_file, | 344 | rb->global_settings->rwps_file, |
345 | rb->global_settings->rsbs_file, | ||
324 | #endif | 346 | #endif |
325 | #if LCD_DEPTH > 1 | 347 | #if LCD_DEPTH > 1 |
326 | rb->global_settings->backdrop_file, | 348 | rb->global_settings->backdrop_file, |
@@ -572,8 +594,12 @@ static bool option_menu(void) | |||
572 | "Font", | 594 | "Font", |
573 | #endif | 595 | #endif |
574 | "WPS", | 596 | "WPS", |
597 | #ifdef HAVE_LCD_BITMAP | ||
598 | "Statusbar Skin", | ||
599 | #endif | ||
575 | #ifdef HAVE_REMOTE_LCD | 600 | #ifdef HAVE_REMOTE_LCD |
576 | "Remote WPS", | 601 | "Remote WPS", |
602 | "Remote Statusbar Skin", | ||
577 | #endif | 603 | #endif |
578 | #if LCD_DEPTH > 1 | 604 | #if LCD_DEPTH > 1 |
579 | "Backdrop", | 605 | "Backdrop", |
diff --git a/manual/plugins/theme_remove.tex b/manual/plugins/theme_remove.tex index 4bea221403..e255d8822d 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 | |||
42 | }% | 42 | }% |
43 | \item[WPS.] | 43 | \item[WPS.] |
44 | Specifies how the \fname{.wps} file belonging to a theme \fname{.cfg} file is handled. | 44 | Specifies how the \fname{.wps} file belonging to a theme \fname{.cfg} file is handled. |
45 | \opt{lcd_bitmap}{ | ||
46 | \item[Statusbar Skin.] | ||
47 | Specifies how the \fname{.rsbs} file belonging to a theme \fname{.cfg} file is handled. | ||
48 | }% | ||
45 | \opt{HAVE_REMOTE_LCD}{ | 49 | \opt{HAVE_REMOTE_LCD}{ |
46 | \item[Remote WPS.] | 50 | \item[Remote WPS.] |
47 | Specifies how the \fname{.rwps} file belonging to a theme \fname{.cfg} file is handled. | 51 | Specifies how the \fname{.rwps} file belonging to a theme \fname{.cfg} file is handled. |
52 | \item[Remote Statusbar Skin.] | ||
53 | Specifies how the \fname{.rsbs} file belonging to a theme \fname{.cfg} file is handled. | ||
48 | }% | 54 | }% |
49 | \opt{lcd_non-mono}{ | 55 | \opt{lcd_non-mono}{ |
50 | \item[Backdrop.] | 56 | \item[Backdrop.] |