diff options
author | Steve Bavin <pondlife@pondlife.me> | 2006-09-21 10:34:30 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2006-09-21 10:34:30 +0000 |
commit | 6d12042459765185f41821f488924fd51fd3256c (patch) | |
tree | b714ff6a6c2b7f938190c0e95bab0e6d53fdfae4 /apps | |
parent | 84d64e16c42bad71c8c671731e0c34d5b5dd09bd (diff) | |
download | rockbox-6d12042459765185f41821f488924fd51fd3256c.tar.gz rockbox-6d12042459765185f41821f488924fd51fd3256c.zip |
Voice charging status in info screen; you'll need a new .voice file to hear it though
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11017 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 6 | ||||
-rw-r--r-- | apps/main_menu.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 320d4d0f2b..9e6a809dac 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -4472,7 +4472,7 @@ | |||
4472 | *: "Battery: Charging" | 4472 | *: "Battery: Charging" |
4473 | </dest> | 4473 | </dest> |
4474 | <voice> | 4474 | <voice> |
4475 | *: "" | 4475 | *: "Charging" |
4476 | </voice> | 4476 | </voice> |
4477 | </phrase> | 4477 | </phrase> |
4478 | <phrase> | 4478 | <phrase> |
@@ -4486,7 +4486,7 @@ | |||
4486 | *: "Battery: Top-Off Chg" | 4486 | *: "Battery: Top-Off Chg" |
4487 | </dest> | 4487 | </dest> |
4488 | <voice> | 4488 | <voice> |
4489 | *: "" | 4489 | *: "Top off charge" |
4490 | </voice> | 4490 | </voice> |
4491 | </phrase> | 4491 | </phrase> |
4492 | <phrase> | 4492 | <phrase> |
@@ -4500,7 +4500,7 @@ | |||
4500 | *: "Battery: Trickle Chg" | 4500 | *: "Battery: Trickle Chg" |
4501 | </dest> | 4501 | </dest> |
4502 | <voice> | 4502 | <voice> |
4503 | *: "" | 4503 | *: "Trickle charge" |
4504 | </voice> | 4504 | </voice> |
4505 | </phrase> | 4505 | </phrase> |
4506 | <phrase> | 4506 | <phrase> |
diff --git a/apps/main_menu.c b/apps/main_menu.c index 4348d52f9e..e800b13d5b 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -117,6 +117,14 @@ bool show_info(void) | |||
117 | talk_id(LANG_BATTERY_TIME, enqueue); | 117 | talk_id(LANG_BATTERY_TIME, enqueue); |
118 | enqueue = true; | 118 | enqueue = true; |
119 | talk_value(battery_level(), UNIT_PERCENT, true); | 119 | talk_value(battery_level(), UNIT_PERCENT, true); |
120 | #if CONFIG_CHARGING >= CHARGING_MONITOR | ||
121 | if (charge_state == CHARGING) | ||
122 | talk_id(LANG_BATTERY_CHARGE, true); | ||
123 | else if (charge_state == TOPOFF) | ||
124 | talk_id(LANG_BATTERY_TOPOFF_CHARGE, true); | ||
125 | else if (charge_state == TRICKLE) | ||
126 | talk_id(LANG_BATTERY_TRICKLE_CHARGE, true); | ||
127 | #endif | ||
120 | } | 128 | } |
121 | 129 | ||
122 | talk_id(LANG_DISK_FREE_INFO, enqueue); | 130 | talk_id(LANG_DISK_FREE_INFO, enqueue); |