diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 2 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index c4a96d0e9b..ef365720b4 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -467,7 +467,7 @@ static int parse_font_load(struct skin_element *element, | |||
467 | if(element->params_count > 2) | 467 | if(element->params_count > 2) |
468 | glyphs = get_param(element, 2)->data.number; | 468 | glyphs = get_param(element, 2)->data.number; |
469 | else | 469 | else |
470 | glyphs = global_settings.glyphs; | 470 | glyphs = global_settings.glyphs_to_cache; |
471 | if (id < 2) | 471 | if (id < 2) |
472 | { | 472 | { |
473 | DEBUGF("font id must be >= 2\n"); | 473 | DEBUGF("font id must be >= 2\n"); |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 4ea98efd95..bcb182ebca 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -222,7 +222,7 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | |||
222 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 222 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
223 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 223 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
224 | #ifdef HAVE_LCD_BITMAP | 224 | #ifdef HAVE_LCD_BITMAP |
225 | MENUITEM_SETTING(default_glyphs, &global_settings.glyphs, NULL); | 225 | MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL); |
226 | #endif | 226 | #endif |
227 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, | 227 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, |
228 | &max_files_in_dir, &max_files_in_playlist | 228 | &max_files_in_dir, &max_files_in_playlist |
diff --git a/apps/settings.c b/apps/settings.c index c22fa50f17..3c28d316b5 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -886,7 +886,7 @@ void settings_apply(bool read_disk) | |||
886 | CHART2(">font_load ", global_settings.font_file); | 886 | CHART2(">font_load ", global_settings.font_file); |
887 | if (font_ui >= 0) | 887 | if (font_ui >= 0) |
888 | font_unload(font_ui); | 888 | font_unload(font_ui); |
889 | rc = font_load_ex(buf, 0, global_settings.glyphs); | 889 | rc = font_load_ex(buf, 0, global_settings.glyphs_to_cache); |
890 | CHART2("<font_load ", global_settings.font_file); | 890 | CHART2("<font_load ", global_settings.font_file); |
891 | screens[SCREEN_MAIN].setuifont(rc); | 891 | screens[SCREEN_MAIN].setuifont(rc); |
892 | screens[SCREEN_MAIN].setfont(rc); | 892 | screens[SCREEN_MAIN].setfont(rc); |
diff --git a/apps/settings.h b/apps/settings.h index 6608df6111..34d65416dd 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -672,7 +672,7 @@ struct user_settings | |||
672 | unsigned char icon_file[MAX_FILENAME+1]; | 672 | unsigned char icon_file[MAX_FILENAME+1]; |
673 | unsigned char viewers_icon_file[MAX_FILENAME+1]; | 673 | unsigned char viewers_icon_file[MAX_FILENAME+1]; |
674 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ | 674 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ |
675 | int glyphs; | 675 | int glyphs_to_cache; /* default font allocation size in glyphs */ |
676 | #ifdef HAVE_REMOTE_LCD | 676 | #ifdef HAVE_REMOTE_LCD |
677 | unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */ | 677 | unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */ |
678 | #endif | 678 | #endif |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 305edd93ba..dbf0f41952 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1625,7 +1625,7 @@ const struct settings_list settings[] = { | |||
1625 | #ifdef HAVE_LCD_BITMAP | 1625 | #ifdef HAVE_LCD_BITMAP |
1626 | TEXT_SETTING(F_THEMESETTING, font_file, "font", | 1626 | TEXT_SETTING(F_THEMESETTING, font_file, "font", |
1627 | DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"), | 1627 | DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"), |
1628 | INT_SETTING(0, glyphs, LANG_GLYPHS, DEFAULT_GLYPHS, | 1628 | INT_SETTING(0, glyphs_to_cache, LANG_GLYPHS, DEFAULT_GLYPHS, |
1629 | "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10, | 1629 | "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10, |
1630 | NULL, NULL, NULL), | 1630 | NULL, NULL, NULL), |
1631 | #endif | 1631 | #endif |