diff options
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/apps/screens.c b/apps/screens.c index 04870d1f1a..29888ff358 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -62,24 +62,24 @@ int on_screen(void) | |||
62 | lcd_clear_display(); | 62 | lcd_clear_display(); |
63 | 63 | ||
64 | ptr = str(LANG_PITCH_UP); | 64 | ptr = str(LANG_PITCH_UP); |
65 | lcd_getstringsize(ptr,FONT_UI,&w,&h); | 65 | lcd_getstringsize(ptr,&w,&h); |
66 | lcd_putsxy((LCD_WIDTH-w)/2, 0, ptr, FONT_UI); | 66 | lcd_putsxy((LCD_WIDTH-w)/2, 0, ptr); |
67 | lcd_bitmap(bitmap_icons_7x8[Icon_UpArrow], | 67 | lcd_bitmap(bitmap_icons_7x8[Icon_UpArrow], |
68 | LCD_WIDTH/2 - 3, h*2, 7, 8, true); | 68 | LCD_WIDTH/2 - 3, h*2, 7, 8, true); |
69 | 69 | ||
70 | snprintf(buf, sizeof buf, "%d%%", pitch); | 70 | snprintf(buf, sizeof buf, "%d%%", pitch); |
71 | lcd_getstringsize(buf,FONT_UI,&w,&h); | 71 | lcd_getstringsize(buf,&w,&h); |
72 | lcd_putsxy((LCD_WIDTH-w)/2, h, buf, FONT_UI); | 72 | lcd_putsxy((LCD_WIDTH-w)/2, h, buf); |
73 | 73 | ||
74 | ptr = str(LANG_PITCH_DOWN); | 74 | ptr = str(LANG_PITCH_DOWN); |
75 | lcd_getstringsize(ptr,FONT_UI,&w,&h); | 75 | lcd_getstringsize(ptr,&w,&h); |
76 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr, FONT_UI); | 76 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); |
77 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 77 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
78 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 78 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); |
79 | 79 | ||
80 | ptr = str(LANG_PAUSE); | 80 | ptr = str(LANG_PAUSE); |
81 | lcd_getstringsize(ptr,FONT_UI,&w,&h); | 81 | lcd_getstringsize(ptr,&w,&h); |
82 | lcd_putsxy((LCD_WIDTH-(w/2))/2, LCD_HEIGHT/2 - h/2, ptr, FONT_UI); | 82 | lcd_putsxy((LCD_WIDTH-(w/2))/2, LCD_HEIGHT/2 - h/2, ptr); |
83 | lcd_bitmap(bitmap_icons_7x8[Icon_Pause], | 83 | lcd_bitmap(bitmap_icons_7x8[Icon_Pause], |
84 | (LCD_WIDTH-(w/2))/2-10, LCD_HEIGHT/2 - h/2, 7, 8, true); | 84 | (LCD_WIDTH-(w/2))/2-10, LCD_HEIGHT/2 - h/2, 7, 8, true); |
85 | 85 | ||
@@ -162,18 +162,18 @@ bool f2_screen(void) | |||
162 | char buf[32]; | 162 | char buf[32]; |
163 | 163 | ||
164 | /* Get the font height */ | 164 | /* Get the font height */ |
165 | lcd_getstringsize("A",FONT_UI,&w,&h); | 165 | lcd_getstringsize("A",&w,&h); |
166 | 166 | ||
167 | lcd_stop_scroll(); | 167 | lcd_stop_scroll(); |
168 | 168 | ||
169 | while (!exit) { | 169 | while (!exit) { |
170 | lcd_clear_display(); | 170 | lcd_clear_display(); |
171 | 171 | ||
172 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE), FONT_UI); | 172 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE)); |
173 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F2_MODE), FONT_UI); | 173 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); |
174 | lcd_putsxy(0, LCD_HEIGHT/2, | 174 | lcd_putsxy(0, LCD_HEIGHT/2, |
175 | global_settings.playlist_shuffle ? | 175 | global_settings.playlist_shuffle ? |
176 | str(LANG_ON) : str(LANG_OFF), FONT_UI); | 176 | str(LANG_ON) : str(LANG_OFF)); |
177 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 177 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
178 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 178 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); |
179 | 179 | ||
@@ -181,8 +181,8 @@ bool f2_screen(void) | |||
181 | global_settings.mp3filter ? str(LANG_ON) : str(LANG_OFF)); | 181 | global_settings.mp3filter ? str(LANG_ON) : str(LANG_OFF)); |
182 | 182 | ||
183 | /* Get the string width and height */ | 183 | /* Get the string width and height */ |
184 | lcd_getstringsize(buf,FONT_UI,&w,&h); | 184 | lcd_getstringsize(buf,&w,&h); |
185 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, buf, FONT_UI); | 185 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, buf); |
186 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 186 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
187 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 187 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); |
188 | 188 | ||
@@ -236,20 +236,20 @@ bool f3_screen(void) | |||
236 | char* ptr; | 236 | char* ptr; |
237 | 237 | ||
238 | ptr = str(LANG_F3_STATUS); | 238 | ptr = str(LANG_F3_STATUS); |
239 | lcd_getstringsize(ptr,FONT_UI,&w,&h); | 239 | lcd_getstringsize(ptr,&w,&h); |
240 | lcd_clear_display(); | 240 | lcd_clear_display(); |
241 | 241 | ||
242 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL), FONT_UI); | 242 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL)); |
243 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR), FONT_UI); | 243 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); |
244 | lcd_putsxy(0, LCD_HEIGHT/2, | 244 | lcd_putsxy(0, LCD_HEIGHT/2, |
245 | global_settings.scrollbar ? str(LANG_ON) : str(LANG_OFF), FONT_UI); | 245 | global_settings.scrollbar ? str(LANG_ON) : str(LANG_OFF)); |
246 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 246 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
247 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 247 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); |
248 | 248 | ||
249 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, ptr, FONT_UI); | 249 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, ptr); |
250 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F3_BAR), FONT_UI); | 250 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); |
251 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, | 251 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, |
252 | global_settings.statusbar ? str(LANG_ON) : str(LANG_OFF), FONT_UI); | 252 | global_settings.statusbar ? str(LANG_ON) : str(LANG_OFF)); |
253 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], | 253 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], |
254 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); | 254 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); |
255 | lcd_update(); | 255 | lcd_update(); |
@@ -288,5 +288,3 @@ bool f3_screen(void) | |||
288 | return false; | 288 | return false; |
289 | } | 289 | } |
290 | #endif | 290 | #endif |
291 | |||
292 | |||