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

Fixes: (1) Use correct margins (2) Don't voice the 'Off' setting if voice UI is disabled

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5294 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2004-10-16 07:52:16 +00:00
parent dcd4883072
commit 7c2496d35a
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/sleeptimer.c
View file

@ -31,6 +31,7 @@
#include "status.h" #include "status.h"
#include "debug.h" #include "debug.h"
#include "talk.h" #include "talk.h"
#include "icons.h"
#include "lang.h" #include "lang.h"
@ -41,9 +42,6 @@
bool sleeptimer_screen(void) bool sleeptimer_screen(void)
{ {
#ifdef HAVE_LCD_BITMAP
int w, h;
#endif
unsigned long seconds; unsigned long seconds;
int hours, minutes; int hours, minutes;
int button; int button;
@ -56,9 +54,10 @@ bool sleeptimer_screen(void)
bool sayit = true; bool sayit = true;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
lcd_setfont(FONT_UI); if (global_settings.statusbar)
lcd_getstringsize("M", &w, &h); lcd_setmargins(0, STATUSBAR_HEIGHT);
lcd_setmargins(w, 8); else
lcd_setmargins(0, 0);
#endif #endif
lcd_clear_display(); lcd_clear_display();
@ -149,7 +148,7 @@ bool sleeptimer_screen(void)
else else
{ {
lcd_puts(0, 1, str(LANG_OFF)); lcd_puts(0, 1, str(LANG_OFF));
if (sayit) if (sayit && global_settings.talk_menu)
{ {
talk_id(LANG_OFF, false); talk_id(LANG_OFF, false);
sayit = false; sayit = false;