From 5e91ec14011656d8952007aceb99189cd28786ba Mon Sep 17 00:00:00 2001
From: Sebastian Leonhardt <sebastian.leonhardt@web.de>
Date: Sun, 27 Dec 2015 18:14:41 +0100
Subject: Samsung YH820/92x keymap bugfixes

This patch fixes some (mostly small) plugin issues with the "big"
YH-keymap patch (a507b). Only one fix affects the main keymaps
(virtual keyboard "DONE" now exits after long key /release/ instead
of long button /press/).

Change-Id: Id34f925ebfa97ae4974cd9405fbe1fee4f597833
---
 apps/plugins/calendar.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'apps/plugins/calendar.c')

diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index d2744ea9f6..2ce0bed707 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -191,6 +191,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
+#define CALENDAR_EVENT_MENU_NAME "menu"
 
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 #define CALENDAR_QUIT       BUTTON_BACK
@@ -211,6 +212,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_BACK
 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
 #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
+#define CALENDAR_EVENT_MENU_NAME "play"
 
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -251,6 +253,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
+#define CALENDAR_EVENT_MENU_NAME "menu"
 
 #elif (CONFIG_KEYPAD == ONDAVX777_PAD)
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -287,6 +290,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_PREV
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
 #define CALENDAR_PREV_MONTH BUTTON_MENU
+#define CALENDAR_EVENT_MENU_NAME "FFWD"
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define CALENDAR_QUIT       (BUTTON_REC|BUTTON_PLAY)
@@ -297,6 +301,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_VOL_DOWN
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
 #define CALENDAR_PREV_MONTH BUTTON_REC
+#define CALENDAR_EVENT_MENU_NAME "func"
 
 #elif CONFIG_KEYPAD == MPIO_HD300_PAD
 #define CALENDAR_QUIT       (BUTTON_MENU|BUTTON_REPEAT)
@@ -307,6 +312,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_DOWN
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
 #define CALENDAR_PREV_MONTH BUTTON_REC
+#define CALENDAR_EVENT_MENU_NAME "enter"
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -317,6 +323,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_PLAYPAUSE
 #define CALENDAR_PREV_MONTH BUTTON_BACK
+#define CALENDAR_EVENT_MENU_NAME "select"
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -347,6 +354,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH (BUTTON_RIGHT|BUTTON_POWER)
 #define CALENDAR_PREV_MONTH (BUTTON_LEFT|BUTTON_POWER)
+#define CALENDAR_EVENT_MENU_NAME "select"
 
 #elif CONFIG_KEYPAD == HM801_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -357,6 +365,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_NEXT
 #define CALENDAR_PREV_MONTH BUTTON_PREV
+#define CALENDAR_EVENT_MENU_NAME "select"
 
 #elif CONFIG_KEYPAD == SONY_NWZ_PAD
 #define CALENDAR_QUIT        BUTTON_BACK
@@ -387,6 +396,7 @@
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
+#define CALENDAR_EVENT_MENU_NAME "play"
 
 #else
 #error "No keypad setting."
@@ -417,6 +427,13 @@
 #ifndef CALENDAR_PREV_MONTH
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT
 #endif
+#ifndef CALENDAR_EVENT_MENU_NAME
+#define CALENDAR_EVENT_MENU_NAME "select"
+#endif
+#endif
+
+#ifndef CALENDAR_EVENT_MENU_NAME
+#define CALENDAR_EVENT_MENU_NAME "right"
 #endif
 
 #define MEMO_FILE PLUGIN_APPS_DATA_DIR "/.memo"
@@ -910,7 +927,7 @@ static bool view_events(int selected, struct shown *shown)
     int button;
 
     rb->gui_synclist_init(&gui_memos, &get_event_text, shown, false, 1, NULL);
-    rb->gui_synclist_set_title(&gui_memos, "Events (play : menu)", NOICON);
+    rb->gui_synclist_set_title(&gui_memos, "Events (" CALENDAR_EVENT_MENU_NAME " : menu)", NOICON);
     rb->gui_synclist_set_nb_items(&gui_memos, memos_in_shown_memory);
     rb->gui_synclist_select_item(&gui_memos, selected);
     rb->gui_synclist_draw(&gui_memos);
-- 
cgit v1.2.3