diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
commit | a9b5f4d810903996d868b0fcdcf9859cf3f47d7d (patch) | |
tree | 4acbdcace28f00451d5b5c9687cc53c6f997886c /apps/filetree.c | |
parent | 43ed678b4645a48cf2072ab72c93e730f4d329ff (diff) | |
download | rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.tar.gz rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.zip |
cleanup statusbar+base skin relationship...
* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi - use to draw the inbuilt statusbar in the current viewport
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index c9c8b3810a..e3977e5a44 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -510,18 +510,14 @@ int ft_enter(struct tree_context* c) | |||
510 | #ifdef HAVE_LCD_BITMAP | 510 | #ifdef HAVE_LCD_BITMAP |
511 | case FILE_ATTR_SBS: | 511 | case FILE_ATTR_SBS: |
512 | splash(0, ID2P(LANG_WAIT)); | 512 | splash(0, ID2P(LANG_WAIT)); |
513 | set_file(buf, (char *)global_settings.sbs_file, | 513 | set_file(buf, (char *)global_settings.sbs_file, MAX_FILENAME); |
514 | MAX_FILENAME); | ||
515 | global_settings.statusbar = STATUSBAR_CUSTOM; | ||
516 | settings_apply_skins(); | 514 | settings_apply_skins(); |
517 | break; | 515 | break; |
518 | #endif | 516 | #endif |
519 | #ifdef HAVE_REMOTE_LCD | 517 | #ifdef HAVE_REMOTE_LCD |
520 | case FILE_ATTR_RSBS: | 518 | case FILE_ATTR_RSBS: |
521 | splash(0, ID2P(LANG_WAIT)); | 519 | splash(0, ID2P(LANG_WAIT)); |
522 | set_file(buf, (char *)global_settings.rsbs_file, | 520 | set_file(buf, (char *)global_settings.rsbs_file, MAX_FILENAME); |
523 | MAX_FILENAME); | ||
524 | global_settings.remote_statusbar = STATUSBAR_CUSTOM; | ||
525 | settings_apply_skins(); | 521 | settings_apply_skins(); |
526 | break; | 522 | break; |
527 | #endif | 523 | #endif |