diff --git a/apps/screens.c b/apps/screens.c index 934b2663f1..5c5d96fd44 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -879,22 +879,22 @@ bool set_time_screen(const char* string, struct tm *tm) button = button_get_w_tmo(HZ/2); switch ( button ) { - case BUTTON_LEFT: + case SETTINGS_PREV: cursorpos = (cursorpos + 6 - 1) % 6; break; - case BUTTON_RIGHT: + case SETTINGS_NEXT: cursorpos = (cursorpos + 6 + 1) % 6; break; - case BUTTON_UP: - case BUTTON_UP | BUTTON_REPEAT: + case SETTINGS_INC: + case SETTINGS_INC | BUTTON_REPEAT: *valptr = (*valptr + steps - min + 1) % steps + min; if(*valptr == 0) *valptr = min; say_time(cursorpos, tm); break; - case BUTTON_DOWN: - case BUTTON_DOWN | BUTTON_REPEAT: + case SETTINGS_DEC: + case SETTINGS_DEC | BUTTON_REPEAT: *valptr = (*valptr + steps - min - 1) % steps + min; if(*valptr == 0) @@ -902,15 +902,11 @@ bool set_time_screen(const char* string, struct tm *tm) say_time(cursorpos, tm); break; -#ifdef BUTTON_ON - case BUTTON_ON: -#elif defined BUTTON_MENU - case BUTTON_MENU: -#endif + case SETTINGS_ACCEPT: done = true; break; - case BUTTON_OFF: + case SETTINGS_CANCEL: done = true; tm->tm_year = -1; break; diff --git a/apps/settings.h b/apps/settings.h index b1e8c9e2e8..7f463c01fe 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -47,6 +47,9 @@ #define SETTINGS_OK2 BUTTON_LEFT #define SETTINGS_CANCEL BUTTON_OFF #define SETTINGS_CANCEL2 BUTTON_MODE +#define SETTINGS_PREV BUTTON_LEFT +#define SETTINGS_NEXT BUTTON_RIGHT +#define SETTINGS_ACCEPT BUTTON_MODE #elif CONFIG_KEYPAD == RECORDER_PAD #define SETTINGS_INC BUTTON_UP @@ -55,6 +58,9 @@ #define SETTINGS_OK2 BUTTON_LEFT #define SETTINGS_CANCEL BUTTON_OFF #define SETTINGS_CANCEL2 BUTTON_F1 +#define SETTINGS_PREV BUTTON_LEFT +#define SETTINGS_NEXT BUTTON_RIGHT +#define SETTINGS_ACCEPT BUTTON_ON #elif CONFIG_KEYPAD == PLAYER_PAD #define SETTINGS_INC BUTTON_RIGHT @@ -78,6 +84,9 @@ #define SETTINGS_OK2 BUTTON_LEFT #define SETTINGS_CANCEL BUTTON_OFF #define SETTINGS_CANCEL2 BUTTON_MENU +#define SETTINGS_PREV BUTTON_LEFT +#define SETTINGS_NEXT BUTTON_RIGHT +#define SETTINGS_ACCEPT BUTTON_MENU #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_NANO_PAD) @@ -85,6 +94,9 @@ #define SETTINGS_DEC BUTTON_SCROLL_BACK #define SETTINGS_OK BUTTON_SELECT #define SETTINGS_CANCEL BUTTON_MENU +#define SETTINGS_PREV BUTTON_LEFT +#define SETTINGS_NEXT BUTTON_RIGHT +#define SETTINGS_ACCEPT BUTTON_PLAY #endif