diff options
Diffstat (limited to 'apps/plugins/imageviewer')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 12 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer_button.h | 25 |
2 files changed, 32 insertions, 5 deletions
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index 39507a1fcf..05d2770863 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -553,7 +553,8 @@ static int scroll_bmp(struct image_info *info) | |||
553 | static long ss_timeout = 0; | 553 | static long ss_timeout = 0; |
554 | 554 | ||
555 | int button; | 555 | int button; |
556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) \ |
557 | || defined(IMGVIEW_SLIDE_SHOW_PRE) | ||
557 | int lastbutton = BUTTON_NONE; | 558 | int lastbutton = BUTTON_NONE; |
558 | #endif | 559 | #endif |
559 | 560 | ||
@@ -642,6 +643,13 @@ static int scroll_bmp(struct image_info *info) | |||
642 | 643 | ||
643 | #ifdef IMGVIEW_SLIDE_SHOW | 644 | #ifdef IMGVIEW_SLIDE_SHOW |
644 | case IMGVIEW_SLIDE_SHOW: | 645 | case IMGVIEW_SLIDE_SHOW: |
646 | #ifdef IMGVIEW_SLIDE_SHOW_PRE | ||
647 | if (lastbutton != IMGVIEW_SLIDE_SHOW_PRE) | ||
648 | break; | ||
649 | #endif | ||
650 | #ifdef IMGVIEW_SLIDE_SHOW2 | ||
651 | case IMGVIEW_SLIDE_SHOW2: | ||
652 | #endif | ||
645 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; | 653 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; |
646 | break; | 654 | break; |
647 | #endif | 655 | #endif |
@@ -714,7 +722,7 @@ static int scroll_bmp(struct image_info *info) | |||
714 | break; | 722 | break; |
715 | 723 | ||
716 | } /* switch */ | 724 | } /* switch */ |
717 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 725 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) || defined(IMGVIEW_SLIDE_SHOW_PRE) |
718 | if (button != BUTTON_NONE) | 726 | if (button != BUTTON_NONE) |
719 | lastbutton = button; | 727 | lastbutton = button; |
720 | #endif | 728 | #endif |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index c5fb9730c1..5c16ad28d8 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -314,8 +314,7 @@ | |||
314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
316 | 316 | ||
317 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 317 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
318 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
319 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | 318 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) |
320 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | 319 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) |
321 | #define IMGVIEW_UP BUTTON_UP | 320 | #define IMGVIEW_UP BUTTON_UP |
@@ -324,9 +323,29 @@ | |||
324 | #define IMGVIEW_RIGHT BUTTON_RIGHT | 323 | #define IMGVIEW_RIGHT BUTTON_RIGHT |
325 | #define IMGVIEW_NEXT BUTTON_FFWD | 324 | #define IMGVIEW_NEXT BUTTON_FFWD |
326 | #define IMGVIEW_PREVIOUS BUTTON_REW | 325 | #define IMGVIEW_PREVIOUS BUTTON_REW |
326 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | 328 | #define IMGVIEW_MENU_PRE BUTTON_PLAY |
328 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | 329 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) |
329 | #define IMGVIEW_QUIT BUTTON_REC | 330 | #define IMGVIEW_SLIDE_SHOW BUTTON_REC_SW_ON |
331 | #define IMGVIEW_SLIDE_SHOW2 BUTTON_REC_SW_OFF | ||
332 | |||
333 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
334 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_UP) | ||
335 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_DOWN) | ||
336 | #define IMGVIEW_UP BUTTON_UP | ||
337 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
338 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
339 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
340 | #define IMGVIEW_NEXT BUTTON_FFWD | ||
341 | #define IMGVIEW_PREVIOUS BUTTON_REW | ||
342 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
343 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
344 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | ||
345 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | ||
346 | #define IMGVIEW_SLIDE_SHOW (BUTTON_PLAY|BUTTON_REPEAT) | ||
347 | #define IMGVIEW_SLIDE_SHOW_PRE BUTTON_PLAY | ||
348 | #define IMGVIEW_QUIT (BUTTON_REC|BUTTON_PLAY) | ||
330 | 349 | ||
331 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 350 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
332 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) | 351 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) |