diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2005-11-20 01:02:14 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2005-11-20 01:02:14 +0000 |
commit | 1a1abf25f43e33dfa7d421d6c43f283763226dbd (patch) | |
tree | 71e57b7c1f5d3c2521fbf2215e938b55fe77bb99 /apps/screens.c | |
parent | e3367212bd8a25cfe6468aa20adaacf4c5b0b2d4 (diff) | |
download | rockbox-1a1abf25f43e33dfa7d421d6c43f283763226dbd.tar.gz rockbox-1a1abf25f43e33dfa7d421d6c43f283763226dbd.zip |
removed old statusbar and buttonbar code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8004 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/screens.c b/apps/screens.c index f861bb76c9..acfcd01dbe 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -48,6 +48,8 @@ | |||
48 | #include "abrepeat.h" | 48 | #include "abrepeat.h" |
49 | #include "gwps-common.h" | 49 | #include "gwps-common.h" |
50 | #include "splash.h" | 50 | #include "splash.h" |
51 | #include "statusbar.h" | ||
52 | |||
51 | #if defined(HAVE_LCD_BITMAP) | 53 | #if defined(HAVE_LCD_BITMAP) |
52 | #include "widgets.h" | 54 | #include "widgets.h" |
53 | #endif | 55 | #endif |
@@ -108,7 +110,7 @@ void usb_display_info(void) | |||
108 | lcd_mono_bitmap(usb_logo, LCD_WIDTH/2-BMPWIDTH_usb_logo/2, | 110 | lcd_mono_bitmap(usb_logo, LCD_WIDTH/2-BMPWIDTH_usb_logo/2, |
109 | LCD_HEIGHT/2-BMPHEIGHT_usb_logo/2, BMPWIDTH_usb_logo, | 111 | LCD_HEIGHT/2-BMPHEIGHT_usb_logo/2, BMPWIDTH_usb_logo, |
110 | BMPHEIGHT_usb_logo); | 112 | BMPHEIGHT_usb_logo); |
111 | status_draw(true); | 113 | gui_syncstatusbar_draw(&statusbars, true); |
112 | lcd_update(); | 114 | lcd_update(); |
113 | #else | 115 | #else |
114 | lcd_double_height(false); | 116 | lcd_double_height(false); |
@@ -116,7 +118,7 @@ void usb_display_info(void) | |||
116 | status_set_param(false); | 118 | status_set_param(false); |
117 | status_set_audio(false); | 119 | status_set_audio(false); |
118 | status_set_usb(true); | 120 | status_set_usb(true); |
119 | status_draw(false); | 121 | gui_syncstatusbar_draw(&statusbars, false); |
120 | #endif | 122 | #endif |
121 | } | 123 | } |
122 | 124 | ||
@@ -138,7 +140,7 @@ void usb_screen(void) | |||
138 | 140 | ||
139 | #endif | 141 | #endif |
140 | 142 | ||
141 | status_draw(false); | 143 | gui_syncstatusbar_draw(&statusbars, false); |
142 | } | 144 | } |
143 | } | 145 | } |
144 | #ifdef HAVE_LCD_CHARCELLS | 146 | #ifdef HAVE_LCD_CHARCELLS |
@@ -358,7 +360,7 @@ int charging_screen(void) | |||
358 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); | 360 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); |
359 | #endif | 361 | #endif |
360 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); | 362 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); |
361 | status_draw(true); | 363 | gui_syncstatusbar_draw(&statusbars, true); |
362 | 364 | ||
363 | #ifdef HAVE_LCD_CHARCELLS | 365 | #ifdef HAVE_LCD_CHARCELLS |
364 | logo_lock_patterns(true); | 366 | logo_lock_patterns(true); |
@@ -367,7 +369,7 @@ int charging_screen(void) | |||
367 | 369 | ||
368 | do | 370 | do |
369 | { | 371 | { |
370 | status_draw(false); | 372 | gui_syncstatusbar_draw(&statusbars, false); |
371 | charging_display_info(true); | 373 | charging_display_info(true); |
372 | button = button_get_w_tmo(HZ/3); | 374 | button = button_get_w_tmo(HZ/3); |
373 | if (button == BUTTON_ON) | 375 | if (button == BUTTON_ON) |
@@ -990,7 +992,7 @@ bool set_time_screen(const char* string, struct tm *tm) | |||
990 | lcd_puts(0, 4, str(LANG_TIME_SET)); | 992 | lcd_puts(0, 4, str(LANG_TIME_SET)); |
991 | lcd_puts(0, 5, str(LANG_TIME_REVERT)); | 993 | lcd_puts(0, 5, str(LANG_TIME_REVERT)); |
992 | #ifdef HAVE_LCD_BITMAP | 994 | #ifdef HAVE_LCD_BITMAP |
993 | status_draw(true); | 995 | gui_syncstatusbar_draw(&statusbars, true); |
994 | #endif | 996 | #endif |
995 | lcd_update(); | 997 | lcd_update(); |
996 | 998 | ||
@@ -1186,7 +1188,7 @@ bool browse_id3(void) | |||
1186 | char* body; | 1188 | char* body; |
1187 | 1189 | ||
1188 | lcd_clear_display(); | 1190 | lcd_clear_display(); |
1189 | status_draw(true); | 1191 | gui_syncstatusbar_draw(&statusbars, true); |
1190 | line = draw_id3_item(line, top, LANG_ID3_TITLE, id3->title); | 1192 | line = draw_id3_item(line, top, LANG_ID3_TITLE, id3->title); |
1191 | line = draw_id3_item(line, top, LANG_ID3_ARTIST, id3->artist); | 1193 | line = draw_id3_item(line, top, LANG_ID3_ARTIST, id3->artist); |
1192 | line = draw_id3_item(line, top, LANG_ID3_ALBUM, id3->album); | 1194 | line = draw_id3_item(line, top, LANG_ID3_ALBUM, id3->album); |
@@ -1260,7 +1262,7 @@ bool browse_id3(void) | |||
1260 | 1262 | ||
1261 | while (!exit && (top == old_top)) | 1263 | while (!exit && (top == old_top)) |
1262 | { | 1264 | { |
1263 | status_draw(false); | 1265 | gui_syncstatusbar_draw(&statusbars, false); |
1264 | lcd_update(); | 1266 | lcd_update(); |
1265 | button = button_get_w_tmo(HZ / 2); | 1267 | button = button_get_w_tmo(HZ / 2); |
1266 | 1268 | ||