summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2006-09-21 10:34:30 +0000
committerSteve Bavin <pondlife@pondlife.me>2006-09-21 10:34:30 +0000
commit6d12042459765185f41821f488924fd51fd3256c (patch)
treeb714ff6a6c2b7f938190c0e95bab0e6d53fdfae4
parent84d64e16c42bad71c8c671731e0c34d5b5dd09bd (diff)
downloadrockbox-6d12042459765185f41821f488924fd51fd3256c.zip
rockbox-6d12042459765185f41821f488924fd51fd3256c.tar.gz
rockbox-6d12042459765185f41821f488924fd51fd3256c.tar.bz2
rockbox-6d12042459765185f41821f488924fd51fd3256c.tar.xz
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
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/main_menu.c8
2 files changed, 11 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 320d4d0..9e6a809 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -4472,7 +4472,7 @@
*: "Battery: Charging"
</dest>
<voice>
- *: ""
+ *: "Charging"
</voice>
</phrase>
<phrase>
@@ -4486,7 +4486,7 @@
*: "Battery: Top-Off Chg"
</dest>
<voice>
- *: ""
+ *: "Top off charge"
</voice>
</phrase>
<phrase>
@@ -4500,7 +4500,7 @@
*: "Battery: Trickle Chg"
</dest>
<voice>
- *: ""
+ *: "Trickle charge"
</voice>
</phrase>
<phrase>
diff --git a/apps/main_menu.c b/apps/main_menu.c
index 4348d52..e800b13 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -117,6 +117,14 @@ bool show_info(void)
talk_id(LANG_BATTERY_TIME, enqueue);
enqueue = true;
talk_value(battery_level(), UNIT_PERCENT, true);
+#if CONFIG_CHARGING >= CHARGING_MONITOR
+ if (charge_state == CHARGING)
+ talk_id(LANG_BATTERY_CHARGE, true);
+ else if (charge_state == TOPOFF)
+ talk_id(LANG_BATTERY_TOPOFF_CHARGE, true);
+ else if (charge_state == TRICKLE)
+ talk_id(LANG_BATTERY_TRICKLE_CHARGE, true);
+#endif
}
talk_id(LANG_DISK_FREE_INFO, enqueue);