diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.c | 6 | ||||
-rw-r--r-- | apps/lang/english.lang | 34 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 15 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/tree.c | 10 |
5 files changed, 66 insertions, 2 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 601e0a0b2e..1f7559f5fe 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -330,8 +330,13 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
330 | (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_M3U) || | 330 | (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_M3U) || |
331 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || | 331 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || |
332 | (*c->dirfilter == SHOW_WPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_WPS) || | 332 | (*c->dirfilter == SHOW_WPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_WPS) || |
333 | #ifdef HAVE_LCD_BITMAP | ||
334 | (*c->dirfilter == SHOW_FONT && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FONT) || | ||
335 | (*c->dirfilter == SHOW_SBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_SBS) || | ||
336 | #endif | ||
333 | #ifdef HAVE_REMOTE_LCD | 337 | #ifdef HAVE_REMOTE_LCD |
334 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RWPS) || | 338 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RWPS) || |
339 | (*c->dirfilter == SHOW_RSBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RSBS) || | ||
335 | #endif | 340 | #endif |
336 | #if CONFIG_TUNER | 341 | #if CONFIG_TUNER |
337 | (*c->dirfilter == SHOW_FMR && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FMR) || | 342 | (*c->dirfilter == SHOW_FMR && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FMR) || |
@@ -339,7 +344,6 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
339 | (*c->dirfilter == SHOW_CFG && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_CFG) || | 344 | (*c->dirfilter == SHOW_CFG && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_CFG) || |
340 | (*c->dirfilter == SHOW_LNG && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_LNG) || | 345 | (*c->dirfilter == SHOW_LNG && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_LNG) || |
341 | (*c->dirfilter == SHOW_MOD && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_MOD) || | 346 | (*c->dirfilter == SHOW_MOD && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_MOD) || |
342 | (*c->dirfilter == SHOW_FONT && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FONT) || | ||
343 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_ROCK)) | 347 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_ROCK)) |
344 | { | 348 | { |
345 | i--; | 349 | i--; |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 2a2a34c021..16fc022af6 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13131,3 +13131,37 @@ | |||
13131 | *: "remote statusbar skin" | 13131 | *: "remote statusbar skin" |
13132 | </voice> | 13132 | </voice> |
13133 | </phrase> | 13133 | </phrase> |
13134 | <phrase> | ||
13135 | id: LANG_CUSTOM_STATUSBAR | ||
13136 | desc: browse for custom statusbar in theme settings | ||
13137 | user: core | ||
13138 | <source> | ||
13139 | *:none | ||
13140 | lcd_bitmap: "Custom Statusbar" | ||
13141 | </source> | ||
13142 | <dest> | ||
13143 | *:none | ||
13144 | lcd_bitmap: "Custom Statusbar" | ||
13145 | </dest> | ||
13146 | <voice> | ||
13147 | *:none | ||
13148 | lcd_bitmap: "Custom Statusbar" | ||
13149 | </voice> | ||
13150 | </phrase> | ||
13151 | <phrase> | ||
13152 | id: LANG_REMOTE_CUSTOM_STATUSBAR | ||
13153 | desc: browse for remote custom statusbar in theme settings | ||
13154 | user: core | ||
13155 | <source> | ||
13156 | *:none | ||
13157 | remote: "Remote Custom Statusbar" | ||
13158 | </source> | ||
13159 | <dest> | ||
13160 | *:none | ||
13161 | remote: "Remote Custom Statusbar" | ||
13162 | </dest> | ||
13163 | <voice> | ||
13164 | *:none | ||
13165 | remote: "Remote Custom Statusbar" | ||
13166 | </voice> | ||
13167 | </phrase> | ||
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 704bbe6df1..21ad2b0713 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -228,10 +228,12 @@ MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, | |||
228 | 228 | ||
229 | #ifdef HAVE_LCD_BITMAP | 229 | #ifdef HAVE_LCD_BITMAP |
230 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; | 230 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; |
231 | static struct browse_folder_info sbs = {SBS_DIR, SHOW_SBS}; | ||
231 | #endif | 232 | #endif |
232 | static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS}; | 233 | static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS}; |
233 | #ifdef HAVE_REMOTE_LCD | 234 | #ifdef HAVE_REMOTE_LCD |
234 | static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; | 235 | static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; |
236 | static struct browse_folder_info rsbs = {SBS_DIR, SHOW_RSBS}; | ||
235 | #endif | 237 | #endif |
236 | static struct browse_folder_info themes = {THEME_DIR, SHOW_CFG}; | 238 | static struct browse_folder_info themes = {THEME_DIR, SHOW_CFG}; |
237 | 239 | ||
@@ -246,6 +248,10 @@ int browse_folder(void *param) | |||
246 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, | 248 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, |
247 | ID2P(LANG_CUSTOM_FONT), | 249 | ID2P(LANG_CUSTOM_FONT), |
248 | browse_folder, (void*)&fonts, NULL, Icon_Font); | 250 | browse_folder, (void*)&fonts, NULL, Icon_Font); |
251 | |||
252 | MENUITEM_FUNCTION(browse_sbs, MENU_FUNC_USEPARAM, | ||
253 | ID2P(LANG_CUSTOM_STATUSBAR), | ||
254 | browse_folder, (void*)&sbs, NULL, Icon_Wps); | ||
249 | #endif | 255 | #endif |
250 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, | 256 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, |
251 | ID2P(LANG_WHILE_PLAYING), | 257 | ID2P(LANG_WHILE_PLAYING), |
@@ -254,6 +260,9 @@ MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, | |||
254 | MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, | 260 | MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, |
255 | ID2P(LANG_REMOTE_WHILE_PLAYING), | 261 | ID2P(LANG_REMOTE_WHILE_PLAYING), |
256 | browse_folder, (void*)&rwps, NULL, Icon_Wps); | 262 | browse_folder, (void*)&rwps, NULL, Icon_Wps); |
263 | MENUITEM_FUNCTION(browse_rsbs, MENU_FUNC_USEPARAM, | ||
264 | ID2P(LANG_REMOTE_CUSTOM_STATUSBAR), | ||
265 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); | ||
257 | #endif | 266 | #endif |
258 | 267 | ||
259 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); | 268 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); |
@@ -274,6 +283,12 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | |||
274 | #ifdef HAVE_REMOTE_LCD | 283 | #ifdef HAVE_REMOTE_LCD |
275 | &browse_rwps, | 284 | &browse_rwps, |
276 | #endif | 285 | #endif |
286 | #ifdef HAVE_LCD_BITMAP | ||
287 | &browse_sbs, | ||
288 | #endif | ||
289 | #ifdef HAVE_REMOTE_LCD | ||
290 | &browse_rsbs, | ||
291 | #endif | ||
277 | &show_icons, | 292 | &show_icons, |
278 | #if LCD_DEPTH > 1 | 293 | #if LCD_DEPTH > 1 |
279 | &clear_main_bd, | 294 | &clear_main_bd, |
diff --git a/apps/settings.h b/apps/settings.h index 7ad139e485..d1179ed5bc 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -142,7 +142,8 @@ enum | |||
142 | * must be added after NUM_FILTER_MODES. */ | 142 | * must be added after NUM_FILTER_MODES. */ |
143 | enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, SHOW_ID3DB, | 143 | enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, SHOW_ID3DB, |
144 | NUM_FILTER_MODES, | 144 | NUM_FILTER_MODES, |
145 | SHOW_WPS, SHOW_RWPS, SHOW_FMR, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS}; | 145 | SHOW_WPS, SHOW_RWPS, SHOW_SBS, SHOW_RSBS, SHOW_FMR, SHOW_CFG, |
146 | SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS}; | ||
146 | 147 | ||
147 | /* file and dir sort options */ | 148 | /* file and dir sort options */ |
148 | enum { SORT_ALPHA, SORT_DATE, SORT_DATE_REVERSED, SORT_TYPE, /* available as settings */ | 149 | enum { SORT_ALPHA, SORT_DATE, SORT_DATE_REVERSED, SORT_TYPE, /* available as settings */ |
diff --git a/apps/tree.c b/apps/tree.c index 3570798706..db39e838ad 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -947,6 +947,11 @@ int rockbox_browse(const char *root, int dirfilter) | |||
947 | snprintf(current, sizeof(current), WPS_DIR "/%s.rwps", | 947 | snprintf(current, sizeof(current), WPS_DIR "/%s.rwps", |
948 | global_settings.rwps_file); | 948 | global_settings.rwps_file); |
949 | } | 949 | } |
950 | else if (dirfilter == SHOW_RSBS) | ||
951 | { | ||
952 | snprintf(current, sizeof(current), SBS_DIR "/%s.rsbs", | ||
953 | global_settings.rsbs_file); | ||
954 | } | ||
950 | #endif | 955 | #endif |
951 | #ifdef HAVE_LCD_BITMAP | 956 | #ifdef HAVE_LCD_BITMAP |
952 | /* Center on the currently loaded font when browsing fonts */ | 957 | /* Center on the currently loaded font when browsing fonts */ |
@@ -955,6 +960,11 @@ int rockbox_browse(const char *root, int dirfilter) | |||
955 | snprintf(current, sizeof(current), FONT_DIR "/%s.fnt", | 960 | snprintf(current, sizeof(current), FONT_DIR "/%s.fnt", |
956 | global_settings.font_file); | 961 | global_settings.font_file); |
957 | } | 962 | } |
963 | else if (dirfilter == SHOW_SBS) | ||
964 | { | ||
965 | snprintf(current, sizeof(current), SBS_DIR "/%s.sbs", | ||
966 | global_settings.sbs_file); | ||
967 | } | ||
958 | #endif | 968 | #endif |
959 | #if CONFIG_TUNER | 969 | #if CONFIG_TUNER |
960 | /* Center on the currently loaded FM preset when browsing those */ | 970 | /* Center on the currently loaded FM preset when browsing those */ |