diff options
Diffstat (limited to 'apps/plugins/imageviewer/imageviewer_button.h')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer_button.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index e637a09ca9..4559a7b3a3 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -476,22 +476,7 @@ | |||
476 | #define IMGVIEW_MENU BUTTON_POWER | 476 | #define IMGVIEW_MENU BUTTON_POWER |
477 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_PWRALT) | 477 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_PWRALT) |
478 | 478 | ||
479 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | 479 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD |
480 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY | ||
481 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | ||
482 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | ||
483 | #define IMGVIEW_UP BUTTON_HOME | ||
484 | #define IMGVIEW_DOWN BUTTON_OPTION | ||
485 | #define IMGVIEW_LEFT BUTTON_PREV | ||
486 | #define IMGVIEW_RIGHT BUTTON_NEXT | ||
487 | #define IMGVIEW_NEXT BUTTON_VOL_UP | ||
488 | #define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT) | ||
489 | #define IMGVIEW_PREVIOUS BUTTON_VOL_DOWN | ||
490 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT) | ||
491 | #define IMGVIEW_MENU BUTTON_POWER | ||
492 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) | ||
493 | |||
494 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | ||
495 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY | 480 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY |
496 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | 481 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
497 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | 482 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) |
@@ -521,7 +506,7 @@ | |||
521 | #define IMGVIEW_MENU BUTTON_POWER | 506 | #define IMGVIEW_MENU BUTTON_POWER |
522 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) | 507 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) |
523 | 508 | ||
524 | #elif CONFIG_KEYPAD == IHIFI_770_PAD | 509 | #elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD |
525 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY | 510 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY |
526 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | 511 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
527 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | 512 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) |
@@ -536,20 +521,20 @@ | |||
536 | #define IMGVIEW_MENU BUTTON_POWER | 521 | #define IMGVIEW_MENU BUTTON_POWER |
537 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) | 522 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) |
538 | 523 | ||
539 | #elif CONFIG_KEYPAD == IHIFI_800_PAD | 524 | #elif CONFIG_KEYPAD == EROSQ_PAD |
540 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY | 525 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY |
541 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | 526 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
542 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | 527 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) |
543 | #define IMGVIEW_UP BUTTON_PREV | 528 | #define IMGVIEW_UP BUTTON_PREV |
544 | #define IMGVIEW_DOWN BUTTON_NEXT | 529 | #define IMGVIEW_DOWN BUTTON_NEXT |
545 | #define IMGVIEW_LEFT BUTTON_HOME | 530 | #define IMGVIEW_LEFT BUTTON_SCROLL_BACK |
546 | #define IMGVIEW_RIGHT (BUTTON_PLAY|BUTTON_POWER) | 531 | #define IMGVIEW_RIGHT BUTTON_SCROLL_FWD |
547 | #define IMGVIEW_NEXT BUTTON_VOL_UP | 532 | #define IMGVIEW_NEXT BUTTON_VOL_UP |
548 | #define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT) | 533 | #define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT) |
549 | #define IMGVIEW_PREVIOUS BUTTON_VOL_DOWN | 534 | #define IMGVIEW_PREVIOUS BUTTON_VOL_DOWN |
550 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT) | 535 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT) |
551 | #define IMGVIEW_MENU BUTTON_POWER | 536 | #define IMGVIEW_MENU BUTTON_MENU |
552 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) | 537 | #define IMGVIEW_SLIDE_SHOW BUTTON_BACK |
553 | 538 | ||
554 | #else | 539 | #else |
555 | #error No keymap defined! | 540 | #error No keymap defined! |