diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-14 06:26:16 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-14 06:26:16 +0000 |
| commit | 1c2aa35371aed8d895b3448dad865b913da57cfb (patch) | |
| tree | 8a790ad8efe5d0abd73eaf77adc854d336ce0ef4 /apps/filetree.c | |
| parent | ed21ab1c8c9b16ec62933313c3d36a93d9255f62 (diff) | |
| download | rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.zip rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.gz rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.bz2 rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.xz | |
FS#10984 - multifont! 2 major additions:
1) seperate UI font for the remote and main displays
2) allow individual skins to load additional fonts for use in the skin (Uo to 7 extra in this first version) see CustomWPS for info on how to load a font in the skins.
Code should always use FONT_UI+screen_number to get the correct user font
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24644 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/filetree.c')
| -rw-r--r-- | apps/filetree.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 6062080..c9c8b38 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -379,6 +379,32 @@ int ft_load(struct tree_context* c, const char* tempdir) return 0; } +#ifdef HAVE_LCD_BITMAP +static void ft_load_font(char *file) +{ +#if NB_SCREENS > 1 + MENUITEM_STRINGLIST(menu, ID2P(LANG_CUSTOM_FONT), NULL, + ID2P(LANG_MAIN_SCREEN), ID2P(LANG_REMOTE_SCREEN)) + switch (do_menu(&menu, NULL, NULL, false)) + { + case 0: /* main lcd */ + splash(0, ID2P(LANG_WAIT)); + font_load(NULL, file); + set_file(file, (char *)global_settings.font_file, MAX_FILENAME); + break; + case 1: /* remote */ + splash(0, ID2P(LANG_WAIT)); + font_load_remoteui(file); + set_file(file, (char *)global_settings.remote_font_file, MAX_FILENAME); + break; + } +#else + splash(0, ID2P(LANG_WAIT)); + font_load(NULL, file); + set_file(file, (char *)global_settings.font_file, MAX_FILENAME); +#endif +} +#endif int ft_enter(struct tree_context* c) { @@ -547,9 +573,7 @@ int ft_enter(struct tree_context* c) #ifdef HAVE_LCD_BITMAP case FILE_ATTR_FONT: - splash(0, ID2P(LANG_WAIT)); - font_load(buf); - set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); + ft_load_font(buf); break; case FILE_ATTR_KBD: |