diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2003-01-15 14:16:21 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2003-01-15 14:16:21 +0000 |
| commit | 093e3b2b7f6241c12f6b981cbacf163b0887af2c (patch) | |
| tree | f1ff1d435775e970149b0a7de5f8e8cd07b328e8 /apps | |
| parent | 0e84a50ea7f02a60c4097f36ff1c6b680d6ec2d9 (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 28 | ||||
| -rw-r--r-- | apps/sleeptimer.c | 6 |
2 files changed, 11 insertions, 23 deletions
diff --git a/apps/settings.c b/apps/settings.c index 5357a950c4..2cdf14397e 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -984,11 +984,6 @@ bool set_int(char* string, case BUTTON_PLAY: #endif done = true; - if (*variable != org_value) { - lcd_stop_scroll(); - lcd_puts(0, 0, str(LANG_MENU_SETTING_OK)); - sleep(HZ/2); - } break; #ifdef HAVE_RECORDER_KEYPAD @@ -998,10 +993,11 @@ bool set_int(char* string, case BUTTON_MENU: #endif if (*variable != org_value) { - *variable=org_value; - lcd_stop_scroll(); - lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); - sleep(HZ/2); + *variable=org_value; + lcd_stop_scroll(); + lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); + lcd_update(); + sleep(HZ/2); } done = true; break; @@ -1084,11 +1080,6 @@ bool set_option(char* string, int* variable, char* options[], case BUTTON_PLAY: #endif done = true; - if (*variable != org_value) { - lcd_stop_scroll(); - lcd_puts(0, 0, str(LANG_MENU_SETTING_OK)); - sleep(HZ/2); - } break; #ifdef HAVE_RECORDER_KEYPAD @@ -1098,10 +1089,11 @@ bool set_option(char* string, int* variable, char* options[], case BUTTON_MENU: #endif if (*variable != org_value) { - *variable=org_value; - lcd_stop_scroll(); - lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); - sleep(HZ/2); + *variable=org_value; + lcd_stop_scroll(); + lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); + lcd_update(); + sleep(HZ/2); } done = true; break; diff --git a/apps/sleeptimer.c b/apps/sleeptimer.c index b47d93698a..bd9ccc359b 100644 --- a/apps/sleeptimer.c +++ b/apps/sleeptimer.c @@ -74,11 +74,6 @@ bool sleeptimer_screen(void) case BUTTON_PLAY: #endif done = true; - if (changed) { - lcd_stop_scroll(); - lcd_puts(0, 0, str(LANG_MENU_SETTING_OK)); - sleep(HZ/2); - } break; #ifdef HAVE_RECORDER_KEYPAD @@ -90,6 +85,7 @@ bool sleeptimer_screen(void) if (changed) { lcd_stop_scroll(); lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL)); + lcd_update(); set_sleep_timer(org_timer); sleep(HZ/2); } |