From faa2cb99429214de745bbc3e64e48a7432db51ae Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Sun, 18 Dec 2022 21:13:15 +0100 Subject: plugins: Improve usability of iPod keymaps - Reduce need to press multiple buttons at the same time to quit a plugin - Have "Menu" be default way to quit plugins or to access plugin menu - Fall back to (Long) "Select" or Long "Menu" in cases where Menu button isn't available (e.g. in ImageViewer and many games) out of scope: boomshine, lua_scripts, Rockpaint, Doom, Duke3D, Pacbox, Quake, Sgt-Puzzles, Wolf3D, XWorld, Minesweeper, Pixel Painter, Spacerocks Change-Id: I6d4dc7174695fe4b8ee9cbaccb21bdbfe6af5c48 --- apps/plugins/calendar.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'apps/plugins/calendar.c') diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index a70f47c34b..765b42ef59 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -39,14 +39,12 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define CALENDAR_QUIT (BUTTON_SELECT|BUTTON_MENU) +#define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REL) #define CALENDAR_SELECT (BUTTON_SELECT|BUTTON_REL) #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD #define CALENDAR_PREV_WEEK BUTTON_SCROLL_BACK #define CALENDAR_NEXT_DAY BUTTON_RIGHT #define CALENDAR_PREV_DAY BUTTON_LEFT -#define CALENDAR_NEXT_MONTH BUTTON_PLAY -#define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_REL) #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define CALENDAR_QUIT BUTTON_POWER @@ -1095,17 +1093,18 @@ enum plugin_status plugin_start(const void* parameter) case CALENDAR_QUIT: exit = true; break; - +#ifdef CALENDAR_NEXT_MONTH case CALENDAR_NEXT_MONTH: case CALENDAR_NEXT_MONTH | BUTTON_REPEAT: next_month(&shown, 0); break; - +#endif +#ifdef CALENDAR_PREV_MONTH case CALENDAR_PREV_MONTH: case CALENDAR_PREV_MONTH | BUTTON_REPEAT: prev_month(&shown, 0); break; - +#endif case CALENDAR_NEXT_WEEK: case CALENDAR_NEXT_WEEK | BUTTON_REPEAT: next_day(&shown, 7); -- cgit v1.2.3