Removed annoying OK delay from settings. Made cancel text visible.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3094 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2003-01-15 14:16:21 +00:00
parent 0e84a50ea7
commit 093e3b2b7f
2 changed files with 11 additions and 23 deletions

View file

@ -984,11 +984,6 @@ bool set_int(char* string,
case BUTTON_PLAY: case BUTTON_PLAY:
#endif #endif
done = true; done = true;
if (*variable != org_value) {
lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
sleep(HZ/2);
}
break; break;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
@ -998,10 +993,11 @@ bool set_int(char* string,
case BUTTON_MENU: case BUTTON_MENU:
#endif #endif
if (*variable != org_value) { if (*variable != org_value) {
*variable=org_value; *variable=org_value;
lcd_stop_scroll(); lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
sleep(HZ/2); lcd_update();
sleep(HZ/2);
} }
done = true; done = true;
break; break;
@ -1084,11 +1080,6 @@ bool set_option(char* string, int* variable, char* options[],
case BUTTON_PLAY: case BUTTON_PLAY:
#endif #endif
done = true; done = true;
if (*variable != org_value) {
lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
sleep(HZ/2);
}
break; break;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
@ -1098,10 +1089,11 @@ bool set_option(char* string, int* variable, char* options[],
case BUTTON_MENU: case BUTTON_MENU:
#endif #endif
if (*variable != org_value) { if (*variable != org_value) {
*variable=org_value; *variable=org_value;
lcd_stop_scroll(); lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
sleep(HZ/2); lcd_update();
sleep(HZ/2);
} }
done = true; done = true;
break; break;

View file

@ -74,11 +74,6 @@ bool sleeptimer_screen(void)
case BUTTON_PLAY: case BUTTON_PLAY:
#endif #endif
done = true; done = true;
if (changed) {
lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
sleep(HZ/2);
}
break; break;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
@ -90,6 +85,7 @@ bool sleeptimer_screen(void)
if (changed) { if (changed) {
lcd_stop_scroll(); lcd_stop_scroll();
lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
lcd_update();
set_sleep_timer(org_timer); set_sleep_timer(org_timer);
sleep(HZ/2); sleep(HZ/2);
} }