Make kbd_input() show a cancel splash to indicate user abort better and for better consistency all over the place. Change checking for its return value (style-wise) at some places too.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-12 14:38:25 +00:00
parent 345920fe7e
commit 18e40e0f4c
11 changed files with 26 additions and 21 deletions

View file

@ -297,6 +297,7 @@ int kbd_input(char* text, int buflen)
unsigned short ch;
unsigned char *utf8;
bool cur_blink = true; /* Cursor on/off flag */
int ret;
#ifdef KBD_MORSE_INPUT
bool morse_reading = false;
unsigned char morse_code = 0;
@ -779,7 +780,7 @@ int kbd_input(char* text, int buflen)
global_settings.buttonbar=buttonbar_config;
#endif
viewportmanager_set_statusbar(oldbars);
return -1;
ret = -1; done = true;
break;
case ACTION_KBD_PAGE_FLIP:
@ -1000,6 +1001,7 @@ int kbd_input(char* text, int buflen)
case ACTION_KBD_DONE:
/* accepts what was entered and continues */
ret = 0;
done = true;
break;
@ -1249,5 +1251,7 @@ int kbd_input(char* text, int buflen)
screens[l].setfont(FONT_UI);
viewportmanager_set_statusbar(oldbars);
return 0;
if (ret < 0)
splash(HZ/2, ID2P(LANG_CANCEL));
return ret;
}