Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang (revision 14558)
+++ apps/lang/english.lang (working copy)
@@ -4694,7 +4694,7 @@
*: none
- alarm: ""
+ alarm: "Waking Up at: "
@@ -4711,7 +4711,7 @@
*: none
- alarm: ""
+ alarm: "Alarm set"
@@ -4728,7 +4728,7 @@
*: none
- alarm: ""
+ alarm: "Alarm Time Is Too Soon!"
@@ -4747,7 +4747,8 @@
*: none
- alarm,ipod*: ""
+ alarm: ""
+ ipod*: ""
@@ -4764,7 +4765,7 @@
*: none
- alarm: ""
+ alarm: "Alarm Disabled"
Index: apps/alarm_menu.c
===================================================================
--- apps/alarm_menu.c (revision 14558)
+++ apps/alarm_menu.c (working copy)
@@ -33,12 +33,11 @@
#include "rtc.h"
#include "misc.h"
#include "screens.h"
-
+#include"talk.h"
#include "lang.h"
#include "power.h"
#include "alarm_menu.h"
#include "backlight.h"
-
#include "splash.h"
#include "statusbar.h"
#include "textarea.h"
@@ -72,8 +71,10 @@
{
screens[i].setmargins(0, 0);
gui_textarea_clear(&screens[i]);
- screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
+ screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
}
+ talk_value(h, UNIT_HOUR, true);
+ talk_value(m, UNIT_MIN, true);
update = false;
}
@@ -95,11 +96,28 @@
rtc_init();
rtc_set_alarm(h,m);
rtc_enable_alarm(true);
- gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO),
+ if (talk_menus_enabled())
+ {
+ talk_id(LANG_ALARM_MOD_TIME_TO_GO, true);
+ int alarm_time_to_go;
+ alarm_time_to_go = togo / 60;
+ talk_value(alarm_time_to_go, UNIT_HOUR, true);
+ alarm_time_to_go =togo % 60;
+ talk_value(alarm_time_to_go, UNIT_MIN, true);
+ }
+ if (talk_menus_enabled())
+ {
+ gui_syncsplash(HZ*4, str(LANG_ALARM_MOD_TIME_TO_GO),
togo / 60, togo % 60);
+ }
+ else
+ {
+ gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO),
+ togo / 60, togo % 60);
+ }
done = true;
} else {
- gui_syncsplash(HZ, str(LANG_ALARM_MOD_ERROR));
+ gui_syncsplash(HZ, ID2P(LANG_ALARM_MOD_ERROR));
update = true;
}
break;
@@ -113,7 +131,13 @@
m = 0;
}
if (h == 24)
+ {
h = 0;
+ }
+ if (talk_menus_enabled())
+ {
+ talk_value(m, UNIT_MIN, false);
+ }
break;
/* dec(m) */
@@ -125,24 +149,38 @@
m = 55;
}
if (h == -1)
+ {
h = 23;
+ }
+ if (talk_menus_enabled())
+ {
+ talk_value(m, UNIT_MIN, false);
+ }
break;
/* inc(h) */
case ACTION_STD_NEXT:
case ACTION_STD_NEXTREPEAT:
h = (h+1) % 24;
+ if (talk_menus_enabled())
+ {
+ talk_value(h, UNIT_HOUR, false);
+ }
break;
/* dec(h) */
case ACTION_STD_PREV:
case ACTION_STD_PREVREPEAT:
h = (h+23) % 24;
+ if (talk_menus_enabled())
+ {
+ talk_value(h, UNIT_HOUR, false);
+ }
break;
case ACTION_STD_CANCEL:
rtc_enable_alarm(false);
- gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_DISABLE));
+ gui_syncsplash(HZ*2, ID2P(LANG_ALARM_MOD_DISABLE));
done = true;
break;