devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22364 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2009-08-16 22:00:38 +00:00
parent b395f89a31
commit c0897a8002
31 changed files with 95 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/lang/arabic.lang
View file

@ -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>

7
apps/lang/catala.lang
View file

@ -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>

7
apps/lang/chinese-simp.lang
View file

@ -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>

7
apps/lang/chinese-trad.lang
View file

@ -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>

7
apps/lang/dansk.lang
View file

@ -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>

7
apps/lang/deutsch.lang
View file

@ -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>

21
apps/lang/english.lang
View file

@ -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>

7
apps/lang/espanol.lang
View file

@ -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>

7
apps/lang/finnish.lang
View file

@ -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>

7
apps/lang/francais.lang
View file

@ -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>

7
apps/lang/greek.lang
View file

@ -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>

7
apps/lang/hebrew.lang
View file

@ -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>

7
apps/lang/italiano.lang
View file

@ -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>

7
apps/lang/japanese.lang
View file

@ -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>

7
apps/lang/korean.lang
View file

@ -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>

7
apps/lang/lietuviu.lang
View file

@ -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>

7
apps/lang/magyar.lang
View file

@ -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>

7
apps/lang/nederlands.lang
View file

@ -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>

7
apps/lang/norsk.lang
View file

@ -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>

7
apps/lang/polski.lang
View file

@ -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>

7
apps/lang/portugues-brasileiro.lang
View file

@ -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>

7
apps/lang/portugues.lang
View file

@ -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>

7
apps/lang/romaneste.lang
View file

@ -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>

7
apps/lang/russian.lang
View file

@ -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>

7
apps/lang/srpski.lang
View file

@ -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>

7
apps/lang/svenska.lang
View file

@ -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>

7
apps/lang/tagalog.lang
View file

@ -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>

7
apps/lang/thai.lang
View file

@ -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>

13
apps/lang/ukrainian.lang
View file

@ -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>

7
apps/lang/walon.lang
View file

@ -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>

54
apps/menus/main_menu.c
View file

@ -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;
}