Wakeup alarm screen is unusuable with large fonts or small screens

Split the description and the time on 2 lines

Flyspray: FS#11274
Authors: Clément Pit--Claudel (CFP) and myself

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26244 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-05-22 00:28:10 +00:00
parent 172fc967b0
commit 8302c5fe17
41 changed files with 85 additions and 84 deletions

View File

@ -83,7 +83,7 @@ bool alarm_screen(void)
{
screens[i].set_viewport(&vp[i]);
screens[i].clear_viewport();
screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
screens[i].puts(0, 4, str(LANG_ALARM_MOD_KEYS));
}
/* Talk when entering the wakeup screen */
speak_time(h, m, true, true);
@ -93,7 +93,8 @@ bool alarm_screen(void)
FOR_NB_SCREENS(i)
{
screens[i].set_viewport(&vp[i]);
screens[i].putsf(0, 1, str(LANG_ALARM_MOD_TIME), h, m);
screens[i].putsf(0, 1, str(LANG_ALARM_MOD_TIME));
screens[i].putsf(0, 2, "%02d:%02d", h, m);
screens[i].update_viewport();
screens[i].set_viewport(NULL);
}

View File

@ -9712,11 +9712,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Време на алармата: %02d:%02d"
alarm: "Време на алармата:"
</dest>
<voice>
*: ""

View File

@ -4621,11 +4621,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Hora d'Alarma: %02d:%02d"
alarm: "Hora d'Alarma:"
</dest>
<voice>
*: none

View File

@ -4797,11 +4797,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "闹铃时间:%02d:%02d"
alarm: "闹铃时间:"
</dest>
<voice>
*: none

View File

@ -4807,11 +4807,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "鬧鈴時間: %02d:%02d"
alarm: "鬧鈴時間:"
</dest>
<voice>
*: none

View File

@ -4661,11 +4661,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Čas buzení: %02d:%02d"
alarm: "Čas buzení:"
</dest>
<voice>
*: none

View File

@ -4102,11 +4102,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarm tid: %02d:%02d"
alarm: "Alarm tid:"
</dest>
<voice>
*: none

View File

@ -4661,11 +4661,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Weckzeit: %02d:%02d"
alarm: "Weckzeit:"
</dest>
<voice>
*: none

View File

@ -5275,10 +5275,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</dest>
<voice>
*: ""

View File

@ -4733,11 +4733,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</dest>
<voice>
*: none

View File

@ -3092,11 +3092,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Hora de alarma: %02d:%02d"
alarm: "Hora de alarma:"
</dest>
<voice>
*: none

View File

@ -4821,10 +4821,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Alarmo Tempo: %02d:%02d"
*: "Alarmo Tempo:"
</dest>
<voice>
*: ""

View File

@ -4801,11 +4801,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Herätysaika: %02d:%02d"
alarm: "Herätysaika:"
</dest>
<voice>
*: none

View File

@ -4689,11 +4689,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Heure de réveil : %02d:%02d"
alarm: "Heure de réveil :"
</dest>
<voice>
*: none

View File

@ -3935,10 +3935,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Hora da Alarma: %02d:%02d"
*: "Hora da Alarma:"
</dest>
<voice>
*: ""

View File

@ -4628,11 +4628,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Ώρα αφύπνισης: %02d:%02d"
alarm: "Ώρα αφύπνισης:"
</dest>
<voice>
*: none

View File

@ -4665,11 +4665,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "זמן השכמה: %02d:%02d"
alarm: "זמן השכמה:"
</dest>
<voice>
*: none

View File

@ -4132,10 +4132,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Viðvörunartími: %02d:%02d"
*: "Viðvörunartími:"
</dest>
<voice>
*: ""

View File

@ -4658,11 +4658,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Orario sveglia: %02d:%02d"
alarm: "Orario sveglia:"
</dest>
<voice>
*: none

View File

@ -4663,11 +4663,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "アラーム時刻: %02d:%02d"
alarm: "アラーム時刻:"
</dest>
<voice>
*: none

View File

@ -4821,11 +4821,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "알람 시간: %02d:%02d"
alarm: "알람 시간:"
</dest>
<voice>
*: none

View File

@ -4715,11 +4715,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Aliarmo laiaks: %02d:%02d"
alarm: "Aliarmo laiaks:"
</dest>
<voice>
*: none

View File

@ -4634,11 +4634,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Ébresztés: %02d:%02d"
alarm: "Ébresztés:"
</dest>
<voice>
*: none

View File

@ -4800,15 +4800,15 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Inschakel tijd: %02d:%02d"
alarm: "Inschakel tijd:"
</dest>
<voice>
*: none
alarm: "Inschakel tijd: %02d:%02d"
alarm: "Inschakel tijd:"
</voice>
</phrase>
<phrase>

View File

@ -4733,11 +4733,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarmklokkeslett: %02d:%02d"
alarm: "Alarmklokkeslett:"
</dest>
<voice>
*: none

View File

@ -4104,11 +4104,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarmtid: %02d:%02d"
alarm: "Alarmtid:"
</dest>
<voice>
*: none
@ -12352,4 +12352,4 @@
*: none
serial_port: "Unngå sporhopping"
</voice>
</phrase>
</phrase>

View File

@ -4664,11 +4664,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Godzina budzenia: %02d:%02d"
alarm: "Godzina budzenia:"
</dest>
<voice>
*: none

View File

@ -4653,11 +4653,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Hora do Alarme: %02d:%02d"
alarm: "Hora do Alarme:"
</dest>
<voice>
*: none

View File

@ -4502,11 +4502,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Hora do Alarme: %02d:%02d"
alarm: "Hora do Alarme:"
</dest>
<voice>
*: none

View File

@ -1598,11 +1598,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Timp de alarma: %02d:%02d"
alarm: "Timp de alarma:"
</dest>
<voice>
*: none

View File

@ -4374,11 +4374,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Будильник на: %02d:%02d"
alarm: "Будильник на:"
</dest>
<voice>
*: none

View File

@ -4657,11 +4657,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Čas Budenia: %02d:%02d"
alarm: "Čas Budenia:"
</dest>
<voice>
*: none

View File

@ -2324,10 +2324,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Cas bujenja: %02d:%02d"
*: "Cas bujenja:"
</dest>
<voice>
*: ""

View File

@ -4640,11 +4640,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Време аларма: %02d:%02d"
alarm: "Време аларма:"
</dest>
<voice>
*: none

View File

@ -4663,11 +4663,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarm: %02d:%02d"
alarm: "Alarm:"
</dest>
<voice>
*: none

View File

@ -4636,11 +4636,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarma oras: %02d:%02d"
alarm: "Alarma oras:"
</dest>
<voice>
*: none

View File

@ -4622,11 +4622,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "เวลาปลุก: %02d:%02d"
alarm: "เวลาปลุก:"
</dest>
<voice>
*: none

View File

@ -11494,11 +11494,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</dest>
<voice>
*: none

View File

@ -4650,11 +4650,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Час Будильнику: %02d:%02d"
alarm: "Час Будильнику:"
</dest>
<voice>
*: none

View File

@ -3446,10 +3446,10 @@
desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
user: core
<source>
*: "Alarm Time: %02d:%02d"
*: "Alarm Time:"
</source>
<dest>
*: "Weckzit: %02d:%02d"
*: "Weckzit:"
</dest>
<voice>
*: ""

View File

@ -4661,11 +4661,11 @@
user: core
<source>
*: none
alarm: "Alarm Time: %02d:%02d"
alarm: "Alarm Time:"
</source>
<dest>
*: none
alarm: "Eure do xhuflet: %02d:%02d"
alarm: "Eure do xhuflet:"
</dest>
<voice>
*: none