diff options
Diffstat (limited to 'apps/plugins/calendar.c')
-rw-r--r-- | apps/plugins/calendar.c | 19 |
1 files changed, 18 insertions, 1 deletions
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 @@ | |||
191 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 191 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
192 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT | 192 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT |
193 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT | 193 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT |
194 | #define CALENDAR_EVENT_MENU_NAME "menu" | ||
194 | 195 | ||
195 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 196 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
196 | #define CALENDAR_QUIT BUTTON_BACK | 197 | #define CALENDAR_QUIT BUTTON_BACK |
@@ -211,6 +212,7 @@ | |||
211 | #define CALENDAR_PREV_DAY BUTTON_BACK | 212 | #define CALENDAR_PREV_DAY BUTTON_BACK |
212 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP | 213 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP |
213 | #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN | 214 | #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN |
215 | #define CALENDAR_EVENT_MENU_NAME "play" | ||
214 | 216 | ||
215 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 217 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
216 | #define CALENDAR_QUIT BUTTON_POWER | 218 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -251,6 +253,7 @@ | |||
251 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 253 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
252 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT | 254 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT |
253 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT | 255 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT |
256 | #define CALENDAR_EVENT_MENU_NAME "menu" | ||
254 | 257 | ||
255 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) | 258 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) |
256 | #define CALENDAR_QUIT BUTTON_POWER | 259 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -287,6 +290,7 @@ | |||
287 | #define CALENDAR_PREV_DAY BUTTON_PREV | 290 | #define CALENDAR_PREV_DAY BUTTON_PREV |
288 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 291 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
289 | #define CALENDAR_PREV_MONTH BUTTON_MENU | 292 | #define CALENDAR_PREV_MONTH BUTTON_MENU |
293 | #define CALENDAR_EVENT_MENU_NAME "FFWD" | ||
290 | 294 | ||
291 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 295 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
292 | #define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY) | 296 | #define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY) |
@@ -297,6 +301,7 @@ | |||
297 | #define CALENDAR_PREV_DAY BUTTON_VOL_DOWN | 301 | #define CALENDAR_PREV_DAY BUTTON_VOL_DOWN |
298 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 302 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
299 | #define CALENDAR_PREV_MONTH BUTTON_REC | 303 | #define CALENDAR_PREV_MONTH BUTTON_REC |
304 | #define CALENDAR_EVENT_MENU_NAME "func" | ||
300 | 305 | ||
301 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 306 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
302 | #define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REPEAT) | 307 | #define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
@@ -307,6 +312,7 @@ | |||
307 | #define CALENDAR_PREV_DAY BUTTON_DOWN | 312 | #define CALENDAR_PREV_DAY BUTTON_DOWN |
308 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 313 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
309 | #define CALENDAR_PREV_MONTH BUTTON_REC | 314 | #define CALENDAR_PREV_MONTH BUTTON_REC |
315 | #define CALENDAR_EVENT_MENU_NAME "enter" | ||
310 | 316 | ||
311 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 317 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
312 | #define CALENDAR_QUIT BUTTON_POWER | 318 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -317,6 +323,7 @@ | |||
317 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 323 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
318 | #define CALENDAR_NEXT_MONTH BUTTON_PLAYPAUSE | 324 | #define CALENDAR_NEXT_MONTH BUTTON_PLAYPAUSE |
319 | #define CALENDAR_PREV_MONTH BUTTON_BACK | 325 | #define CALENDAR_PREV_MONTH BUTTON_BACK |
326 | #define CALENDAR_EVENT_MENU_NAME "select" | ||
320 | 327 | ||
321 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 328 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
322 | #define CALENDAR_QUIT BUTTON_POWER | 329 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -347,6 +354,7 @@ | |||
347 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 354 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
348 | #define CALENDAR_NEXT_MONTH (BUTTON_RIGHT|BUTTON_POWER) | 355 | #define CALENDAR_NEXT_MONTH (BUTTON_RIGHT|BUTTON_POWER) |
349 | #define CALENDAR_PREV_MONTH (BUTTON_LEFT|BUTTON_POWER) | 356 | #define CALENDAR_PREV_MONTH (BUTTON_LEFT|BUTTON_POWER) |
357 | #define CALENDAR_EVENT_MENU_NAME "select" | ||
350 | 358 | ||
351 | #elif CONFIG_KEYPAD == HM801_PAD | 359 | #elif CONFIG_KEYPAD == HM801_PAD |
352 | #define CALENDAR_QUIT BUTTON_POWER | 360 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -357,6 +365,7 @@ | |||
357 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 365 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
358 | #define CALENDAR_NEXT_MONTH BUTTON_NEXT | 366 | #define CALENDAR_NEXT_MONTH BUTTON_NEXT |
359 | #define CALENDAR_PREV_MONTH BUTTON_PREV | 367 | #define CALENDAR_PREV_MONTH BUTTON_PREV |
368 | #define CALENDAR_EVENT_MENU_NAME "select" | ||
360 | 369 | ||
361 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | 370 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD |
362 | #define CALENDAR_QUIT BUTTON_BACK | 371 | #define CALENDAR_QUIT BUTTON_BACK |
@@ -387,6 +396,7 @@ | |||
387 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 396 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
388 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT | 397 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT |
389 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT | 398 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT |
399 | #define CALENDAR_EVENT_MENU_NAME "play" | ||
390 | 400 | ||
391 | #else | 401 | #else |
392 | #error "No keypad setting." | 402 | #error "No keypad setting." |
@@ -417,6 +427,13 @@ | |||
417 | #ifndef CALENDAR_PREV_MONTH | 427 | #ifndef CALENDAR_PREV_MONTH |
418 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT | 428 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT |
419 | #endif | 429 | #endif |
430 | #ifndef CALENDAR_EVENT_MENU_NAME | ||
431 | #define CALENDAR_EVENT_MENU_NAME "select" | ||
432 | #endif | ||
433 | #endif | ||
434 | |||
435 | #ifndef CALENDAR_EVENT_MENU_NAME | ||
436 | #define CALENDAR_EVENT_MENU_NAME "right" | ||
420 | #endif | 437 | #endif |
421 | 438 | ||
422 | #define MEMO_FILE PLUGIN_APPS_DATA_DIR "/.memo" | 439 | #define MEMO_FILE PLUGIN_APPS_DATA_DIR "/.memo" |
@@ -910,7 +927,7 @@ static bool view_events(int selected, struct shown *shown) | |||
910 | int button; | 927 | int button; |
911 | 928 | ||
912 | rb->gui_synclist_init(&gui_memos, &get_event_text, shown, false, 1, NULL); | 929 | rb->gui_synclist_init(&gui_memos, &get_event_text, shown, false, 1, NULL); |
913 | rb->gui_synclist_set_title(&gui_memos, "Events (play : menu)", NOICON); | 930 | rb->gui_synclist_set_title(&gui_memos, "Events (" CALENDAR_EVENT_MENU_NAME " : menu)", NOICON); |
914 | rb->gui_synclist_set_nb_items(&gui_memos, memos_in_shown_memory); | 931 | rb->gui_synclist_set_nb_items(&gui_memos, memos_in_shown_memory); |
915 | rb->gui_synclist_select_item(&gui_memos, selected); | 932 | rb->gui_synclist_select_item(&gui_memos, selected); |
916 | rb->gui_synclist_draw(&gui_memos); | 933 | rb->gui_synclist_draw(&gui_memos); |