remove the rockbox info line saying the AA size and replace it with skin RAM usage

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22364 a1c6a512-1295-4272-9138-f99709370657

31 files changed, 95 insertions, 189 deletions

diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index 4f719fbe87..03a679e8a0 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -4647,19 +4647,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "صورة الألبوم:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index a08bb3694b..6e191fa728 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -11950,19 +11950,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Caratula:"
   </dest>
   <voice>
     *: none
-    albumart: "Caratula"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index f14631f2e6..c2dfbd10f2 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -11981,19 +11981,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "专辑封面:"
   </dest>
   <voice>
     *: none
-    albumart: "专辑封面"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 75fd47669e..dfdbf4b748 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -11613,19 +11613,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "專輯封面"
   </dest>
   <voice>
     *: none
-    albumart: "專輯封面"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index fca480a47b..59bd91c0a8 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -12000,19 +12000,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Album cover:"
   </dest>
   <voice>
     *: none
-    albumart: "Album cover:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index b6034d1808..a009ee7e8e 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -11978,19 +11978,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Covergröße:"
   </dest>
   <voice>
     *: none
-    albumart: "Covergröße"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 2e4cb2d96f..e0fb2ee3e2 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12162,19 +12162,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Album Art:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
@@ -12660,3 +12657,17 @@
     pitchscreen: "Rate"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SKIN_RAM_USAGE
+  desc: how much RAM the skins are using
+  user: core
+  <source>
+    *: "Skin RAM usage:"
+  </source>
+  <dest>
+    *: "Skin RAM usage:"
+  </dest>
+  <voice>
+    *: "Skin RAM usage"
+  </voice>
+</phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index bb7c411334..4e4e80745f 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -11960,19 +11960,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Carátula:"
   </dest>
   <voice>
     *: none
-    albumart: "Carátula"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 327cd0199c..c3d36c4b42 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -11969,19 +11969,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Kansikuva:"
   </dest>
   <voice>
     *: none
-    albumart: "Kansikuva:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 1b28bd98e4..29d9caa29b 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -12016,19 +12016,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Illustration album:"
   </dest>
   <voice>
     *: none
-    albumart: "Illustration album"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 20871ffdfc..ffea2dd1fe 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -11958,19 +11958,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Εξώφυλλο άλμπουμ:"
   </dest>
   <voice>
     *: none
-    albumart: "Εξώφυλλο άλμπουμ:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index fd76989bf2..d6501b818f 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -11961,19 +11961,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "תמונת אלבום:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index f7ce0f5441..e2462101bb 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -12086,19 +12086,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Album Art:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 215b1248c1..475305e8c2 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -12084,19 +12084,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "アルバムアート:"
   </dest>
   <voice>
     *: none
-    albumart: "アルバムアート:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 89268d19c0..4d6baf5873 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -10293,19 +10293,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "앨범재킷:"
   </dest>
   <voice>
     *: none
-    albumart: "앨범재킷:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 9d37d9aa56..2874b332e8 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -12148,19 +12148,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Albumo viršelis:"
   </dest>
   <voice>
     *: none
-    albumart: "Albumo viršelis:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 95a32c8b26..bbfca3e9b5 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -11350,19 +11350,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Lemezborító:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index d2193918a2..7dd410da7c 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -11967,19 +11967,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Hoes afbeelding:"
   </dest>
   <voice>
     *: none
-    albumart: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 8faf0abda3..eb39fd45a7 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -12006,19 +12006,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Albumbilde:"
   </dest>
   <voice>
     *: none
-    albumart: "Albumbilde:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 9718e8ff52..dffc71a37e 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -12086,19 +12086,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Okładka albumu:"
   </dest>
   <voice>
     *: none
-    albumart: "Okładka albumu"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 8a588c6c26..924a918002 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -12076,19 +12076,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Capa:"
   </dest>
   <voice>
     *: none
-    albumart: "Capa:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 8418d937c1..4573d95831 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -10873,19 +10873,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Capa de Álbum:"
   </dest>
   <voice>
     *: none
-    albumart: "Capa de Álbum:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 117a97cf80..644c493d43 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -11994,19 +11994,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Coperta Album:"
   </dest>
   <voice>
     *: none
-    albumart: "Coperta Album:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index ac973434ba..beac83ec0d 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -11971,19 +11971,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Обложка альбома:"
   </dest>
   <voice>
     *: none
-    albumart: "Обложка альбома"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 0688496fb4..811d2d05e7 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -11974,19 +11974,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Омот албума:"
   </dest>
   <voice>
     *: none
-    albumart: "Омот албума:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index a09e1a2701..ff6a0db176 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -12082,19 +12082,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Skivomslag:"
   </dest>
   <voice>
     *: none
-    albumart: "Skivomslag:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 720d4dcbc0..08ddf8ee2c 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -11975,19 +11975,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Album Arte:"
   </dest>
   <voice>
     *: none
-    albumart: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 82787e531b..8055e17723 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -11536,19 +11536,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "ภาพประกอบอัลบัม:"
   </dest>
   <voice>
     *: none
-    albumart: "Album Art:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 44ab18b48c..641870e122 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -12085,19 +12085,16 @@
 </phrase>

 <phrase>

   id: LANG_ALBUMART

-  desc: Display the expected AA size

-  user: core

+  desc: deprecated
+  user:
   <source>

-    *: none

-    albumart: "Album Art:"

+    *: none
   </source>

   <dest>

-    *: none

-    albumart: "Обкладинка Альбому:"

+    *: none
   </dest>

   <voice>

-    *: none

-    albumart: "Обкладинка Альбому:"

+    *: none
   </voice>

 </phrase>

 <phrase>

diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 60fee71ba8..fda6c361c0 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -12081,19 +12081,16 @@
 </phrase>
 <phrase>
   id: LANG_ALBUMART
-  desc: Display the expected AA size
-  user: core
+  desc: deprecated
+  user:
   <source>
     *: none
-    albumart: "Album Art:"
   </source>
   <dest>
     *: none
-    albumart: "Imådje albom:"
   </dest>
   <voice>
     *: none
-    albumart: "imådje albom"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 033f7e2675..132eab9960 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -50,6 +50,7 @@
 #include "version.h"
 #include "time.h"
 #include "wps.h"
+#include "skin_engine/skin_buffer.h"
 
 static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG};
 
@@ -144,9 +145,7 @@ enum infoscreenorder
     INFO_DISK1, /* capacity or internal capacity/free on hotswap */
     INFO_DISK2, /* free space or external capacity/free on hotswap */
     INFO_BUFFER,
-#ifdef HAVE_ALBUMART
-    INFO_ALBUMART,
-#endif
+    INFO_SKIN_USAGE, /* ram usage of the skins */
     INFO_VERSION,
     INFO_COUNT
 };
@@ -158,6 +157,13 @@ static const unsigned char *kbyte_units[] =
     ID2P(LANG_GIGABYTE)
 };
 
+static const unsigned char *byte_units[] =
+{
+    ID2P(LANG_BYTE),
+    ID2P(LANG_KILOBYTE),
+    ID2P(LANG_MEGABYTE)
+};
+
 static char* info_getname(int selected_item, void *data,
                           char *buffer, size_t buffer_len)
 {
@@ -250,22 +256,10 @@ static char* info_getname(int selected_item, void *data,
             snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1);
 #endif
             break;
-#ifdef HAVE_ALBUMART
-        case INFO_ALBUMART: /* album art dimenstions */
-        {
-            int width = 0, height = 0;
-            if (wps_uses_albumart(&width, &height))
-            {
-                snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART),
-                         width, height);
-            }
-            else
-            {
-                snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART),
-                         str(LANG_SET_BOOL_NO));
-            }
-        } break;
-#endif
+        case INFO_SKIN_USAGE:
+            output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true);
+            snprintf(buffer, buffer_len, "%s %s", str(LANG_SKIN_RAM_USAGE), s1);
+            break;
     }
     return buffer;
 }
@@ -347,23 +341,11 @@ static int info_speak_item(int selected_item, void * data)
             output_dyn_value(NULL, 0, info->size, kbyte_units, true);
 #endif
             break;
-#ifdef HAVE_ALBUMART
-            case INFO_ALBUMART: /* album art dimenstions */
-            {
-                int width = 0, height = 0;
-                if (wps_uses_albumart(&width, &height))
-                {
-                    talk_id(LANG_ALBUMART, false);
-                    talk_value(width, UNIT_PIXEL, true);
-                    talk_value(height, UNIT_PIXEL, true);
-                }
-                else
-                {
-                    talk_id(LANG_ALBUMART, false);
-                    talk_id(LANG_SET_BOOL_NO, true);
-                }
-            } break;
-#endif
+        case INFO_SKIN_USAGE:
+            talk_id(LANG_SKIN_RAM_USAGE, false);
+            output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true);
+            break;
+            
     }
     return 0;
 }