summaryrefslogtreecommitdiff
path: root/apps/filetree.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-01-29 07:52:13 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-01-29 07:52:13 +0000
commiteee5423fe10f247f74d69404924edf3a0d54e8cd (patch)
treedf46391368a2ad7930a926c59f53796229a933ab /apps/filetree.c
parente3e436e2b5519637981b2667f79c42b2e4ed110b (diff)
downloadrockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.tar.gz
rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.zip
skin rework (FS#10922) notable changes:
- simplify the setting/skin relationship. settings are used as the fallback if it's not specified in the skin - backdrop buffers are now in the skin buffer (which has also increased slightly to accomodate 1 backdrop for each skin and 2 full colour screens for bmps (up for 1.5)) - if no %X is specified in a skin then the backdrop setting will be used. use %Xd to explicitly disable a skin from displaying a backdrop - the base skin can now specify a backdrop. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24366 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/filetree.c')
-rw-r--r--apps/filetree.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index ccf4c2bd91..6062080baa 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -52,7 +52,6 @@
52#include "radio.h" 52#include "radio.h"
53#endif 53#endif
54#include "wps.h" 54#include "wps.h"
55#include "backdrop.h"
56 55
57static int compare_sort_dir; /* qsort key for sorting directories */ 56static int compare_sort_dir; /* qsort key for sorting directories */
58 57
@@ -503,9 +502,6 @@ int ft_enter(struct tree_context* c)
503 /* wps config file */ 502 /* wps config file */
504 case FILE_ATTR_WPS: 503 case FILE_ATTR_WPS:
505 splash(0, ID2P(LANG_WAIT)); 504 splash(0, ID2P(LANG_WAIT));
506#if LCD_DEPTH > 1
507 backdrop_unload(BACKDROP_SKIN_WPS);
508#endif
509 set_file(buf, (char *)global_settings.wps_file, 505 set_file(buf, (char *)global_settings.wps_file,
510 MAX_FILENAME); 506 MAX_FILENAME);
511 settings_apply_skins(); 507 settings_apply_skins();
@@ -515,9 +511,6 @@ int ft_enter(struct tree_context* c)
515 /* remote-wps config file */ 511 /* remote-wps config file */
516 case FILE_ATTR_RWPS: 512 case FILE_ATTR_RWPS:
517 splash(0, ID2P(LANG_WAIT)); 513 splash(0, ID2P(LANG_WAIT));
518#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
519 remote_backdrop_unload(BACKDROP_SKIN_WPS);
520#endif
521 set_file(buf, (char *)global_settings.rwps_file, 514 set_file(buf, (char *)global_settings.rwps_file,
522 MAX_FILENAME); 515 MAX_FILENAME);
523 settings_apply_skins(); 516 settings_apply_skins();