From fdfc88f38ba4bf318eb09669c95bb2b7947e06da Mon Sep 17 00:00:00 2001
From: Fred Bauer <fred.w.bauer@gmail.com>
Date: Sun, 20 Nov 2011 15:41:17 +0000
Subject: Rename global_settings member glyphs to glyphs_to_cache and add
 descriptive comment.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31032 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/skin_engine/skin_parser.c | 2 +-
 apps/menus/settings_menu.c         | 2 +-
 apps/settings.c                    | 2 +-
 apps/settings.h                    | 2 +-
 apps/settings_list.c               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'apps')

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,
     if(element->params_count > 2)
         glyphs = get_param(element, 2)->data.number;
     else
-        glyphs = global_settings.glyphs;
+        glyphs = global_settings.glyphs_to_cache;
     if (id < 2)
     {
         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);
 MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL);
 MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL);
 #ifdef HAVE_LCD_BITMAP
-MENUITEM_SETTING(default_glyphs, &global_settings.glyphs, NULL);
+MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL);
 #endif
 MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON,
            &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)
                 CHART2(">font_load ", global_settings.font_file);
                 if (font_ui >= 0)
                     font_unload(font_ui);
-                rc = font_load_ex(buf, 0, global_settings.glyphs);
+                rc = font_load_ex(buf, 0, global_settings.glyphs_to_cache);
                 CHART2("<font_load ", global_settings.font_file);
                 screens[SCREEN_MAIN].setuifont(rc);
                 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
     unsigned char icon_file[MAX_FILENAME+1];
     unsigned char viewers_icon_file[MAX_FILENAME+1];
     unsigned char font_file[MAX_FILENAME+1]; /* last font */
-    int glyphs;
+    int glyphs_to_cache; /* default font allocation size in glyphs */
 #ifdef HAVE_REMOTE_LCD
     unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */
 #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[] = {
 #ifdef HAVE_LCD_BITMAP
     TEXT_SETTING(F_THEMESETTING, font_file, "font",
                      DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"),
-    INT_SETTING(0, glyphs, LANG_GLYPHS, DEFAULT_GLYPHS,
+    INT_SETTING(0, glyphs_to_cache, LANG_GLYPHS, DEFAULT_GLYPHS,
                 "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10,
                 NULL, NULL, NULL),
 #endif
-- 
cgit v1.2.3