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/recorder/keyboard.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/recorder/keyboard.c')
-rw-r--r-- | apps/recorder/keyboard.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 5ff340b596..31c0643e3c 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -26,10 +26,11 @@ | |||
26 | #include <string.h> | 26 | #include <string.h> |
27 | #include "font.h" | 27 | #include "font.h" |
28 | #include "screens.h" | 28 | #include "screens.h" |
29 | #include "status.h" | 29 | #include "statusbar.h" |
30 | #include "talk.h" | 30 | #include "talk.h" |
31 | #include "settings.h" | 31 | #include "settings.h" |
32 | #include "misc.h" | 32 | #include "misc.h" |
33 | #include "buttonbar.h" | ||
33 | 34 | ||
34 | #define KEYBOARD_MARGIN 3 | 35 | #define KEYBOARD_MARGIN 3 |
35 | 36 | ||
@@ -177,7 +178,11 @@ int kbd_input(char* text, int buflen) | |||
177 | char outline[256]; | 178 | char outline[256]; |
178 | struct font* font = font_get(FONT_SYSFIXED); | 179 | struct font* font = font_get(FONT_SYSFIXED); |
179 | int button, lastbutton = 0; | 180 | int button, lastbutton = 0; |
180 | 181 | #ifdef HAS_BUTTONBAR | |
182 | struct gui_buttonbar buttonbar; | ||
183 | gui_buttonbar_init(&buttonbar); | ||
184 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | ||
185 | #endif | ||
181 | lcd_setfont(FONT_SYSFIXED); | 186 | lcd_setfont(FONT_SYSFIXED); |
182 | font_w = font->maxwidth; | 187 | font_w = font->maxwidth; |
183 | font_h = font->height; | 188 | font_h = font->height; |
@@ -229,10 +234,10 @@ int kbd_input(char* text, int buflen) | |||
229 | i = (curpos + 1) * font_w; | 234 | i = (curpos + 1) * font_w; |
230 | lcd_vline(i, main_y, main_y + font_h); | 235 | lcd_vline(i, main_y, main_y + font_h); |
231 | 236 | ||
232 | #if CONFIG_KEYPAD == RECORDER_PAD | 237 | #ifdef HAS_BUTTONBAR |
233 | /* draw the status bar */ | 238 | /* draw the status bar */ |
234 | buttonbar_set("Shift", "OK", "Del"); | 239 | gui_buttonbar_set(&buttonbar, "Shift", "OK", "Del"); |
235 | buttonbar_draw(); | 240 | gui_buttonbar_draw(&buttonbar); |
236 | #endif | 241 | #endif |
237 | 242 | ||
238 | #ifdef KBD_MODES | 243 | #ifdef KBD_MODES |
@@ -245,8 +250,7 @@ int kbd_input(char* text, int buflen) | |||
245 | lcd_set_drawmode(DRMODE_SOLID); | 250 | lcd_set_drawmode(DRMODE_SOLID); |
246 | } | 251 | } |
247 | 252 | ||
248 | status_draw(true); | 253 | gui_syncstatusbar_draw(&statusbars, true); |
249 | |||
250 | lcd_update(); | 254 | lcd_update(); |
251 | } | 255 | } |
252 | 256 | ||
@@ -454,7 +458,7 @@ int kbd_input(char* text, int buflen) | |||
454 | #endif /* !KBD_MODES */ | 458 | #endif /* !KBD_MODES */ |
455 | 459 | ||
456 | case BUTTON_NONE: | 460 | case BUTTON_NONE: |
457 | status_draw(false); | 461 | gui_syncstatusbar_draw(&statusbars, false); |
458 | redraw = false; | 462 | redraw = false; |
459 | break; | 463 | break; |
460 | 464 | ||