1 files changed, 30 insertions, 0 deletions

diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 5bcb6afc4b..72b572e7eb 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -192,10 +192,40 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
 
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define CALENDAR_QUIT       BUTTON_POWER
+
 #else
 #error "No keypad setting."
 #endif
 
+#ifdef HAVE_TOUCHSCREEN
+#ifndef CALENDAR_QUIT
+#define CALENDAR_QUIT       BUTTON_MIDLEFT
+#endif
+#ifndef CALENDAR_SELECT
+#define CALENDAR_SELECT     BUTTON_CENTER
+#endif
+#ifndef CALENDAR_NEXT_DAY
+#define CALENDAR_NEXT_DAY   BUTTON_TOPLEFT
+#endif
+#ifndef CALENDAR_PREV_DAY
+#define CALENDAR_PREV_DAY   BUTTON_BOTTOMLEFT
+#endif
+#ifndef CALENDAR_NEXT_WEEK
+#define CALENDAR_NEXT_WEEK  BUTTON_TOPMIDDLE
+#endif
+#ifndef CALENDAR_PREV_WEEK
+#define CALENDAR_PREV_WEEK  BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef CALENDAR_NEXT_MONTH
+#define CALENDAR_NEXT_MONTH BUTTON_TOPRIGHT
+#endif
+#ifndef CALENDAR_PREV_MONTH
+#define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT
+#endif
+#endif
+
 #define X_OFFSET ((LCD_WIDTH%7)/2)
 #if LCD_HEIGHT <= 80
 #define Y_OFFSET 1