diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-10-16 07:52:16 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-10-16 07:52:16 +0000 |
commit | 7c2496d35a1046d6383a7df8a78a1e9ba5cf7607 (patch) | |
tree | c47352d5c7377b6fb6fcbfecab472870e40c4569 | |
parent | dcd488307281e8d24f97281036412480b923aae4 (diff) | |
download | rockbox-7c2496d35a1046d6383a7df8a78a1e9ba5cf7607.tar.gz rockbox-7c2496d35a1046d6383a7df8a78a1e9ba5cf7607.zip |
Fixes: (1) Use correct margins (2) Don't voice the 'Off' setting if voice UI is disabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5294 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/sleeptimer.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apps/sleeptimer.c b/apps/sleeptimer.c index c8a2726e76..4e6ca5313e 100644 --- a/apps/sleeptimer.c +++ b/apps/sleeptimer.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "status.h" | 31 | #include "status.h" |
32 | #include "debug.h" | 32 | #include "debug.h" |
33 | #include "talk.h" | 33 | #include "talk.h" |
34 | #include "icons.h" | ||
34 | 35 | ||
35 | #include "lang.h" | 36 | #include "lang.h" |
36 | 37 | ||
@@ -41,9 +42,6 @@ | |||
41 | 42 | ||
42 | bool sleeptimer_screen(void) | 43 | bool sleeptimer_screen(void) |
43 | { | 44 | { |
44 | #ifdef HAVE_LCD_BITMAP | ||
45 | int w, h; | ||
46 | #endif | ||
47 | unsigned long seconds; | 45 | unsigned long seconds; |
48 | int hours, minutes; | 46 | int hours, minutes; |
49 | int button; | 47 | int button; |
@@ -56,9 +54,10 @@ bool sleeptimer_screen(void) | |||
56 | bool sayit = true; | 54 | bool sayit = true; |
57 | 55 | ||
58 | #ifdef HAVE_LCD_BITMAP | 56 | #ifdef HAVE_LCD_BITMAP |
59 | lcd_setfont(FONT_UI); | 57 | if (global_settings.statusbar) |
60 | lcd_getstringsize("M", &w, &h); | 58 | lcd_setmargins(0, STATUSBAR_HEIGHT); |
61 | lcd_setmargins(w, 8); | 59 | else |
60 | lcd_setmargins(0, 0); | ||
62 | #endif | 61 | #endif |
63 | 62 | ||
64 | lcd_clear_display(); | 63 | lcd_clear_display(); |
@@ -149,7 +148,7 @@ bool sleeptimer_screen(void) | |||
149 | else | 148 | else |
150 | { | 149 | { |
151 | lcd_puts(0, 1, str(LANG_OFF)); | 150 | lcd_puts(0, 1, str(LANG_OFF)); |
152 | if (sayit) | 151 | if (sayit && global_settings.talk_menu) |
153 | { | 152 | { |
154 | talk_id(LANG_OFF, false); | 153 | talk_id(LANG_OFF, false); |
155 | sayit = false; | 154 | sayit = false; |