1 files changed, 9 insertions, 1 deletions

diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h
index 694056ed8a..2f63792726 100644
--- a/apps/plugins/imageviewer/imageviewer.h
+++ b/apps/plugins/imageviewer/imageviewer.h
@@ -88,6 +88,7 @@
 #define IMGVIEW_NEXT        (BUTTON_SELECT | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_SELECT | BUTTON_LEFT)
 #define IMGVIEW_MENU        (BUTTON_SELECT | BUTTON_MENU)
+#define IMGVIEW_QUIT        (BUTTON_SELECT | BUTTON_PLAY)
 
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_SELECT
@@ -111,6 +112,7 @@
 #define IMGVIEW_NEXT        (BUTTON_A | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_A | BUTTON_LEFT)
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == SANSA_E200_PAD
 #define IMGVIEW_ZOOM_PRE        BUTTON_SELECT
@@ -211,6 +213,7 @@
 #define IMGVIEW_NEXT        BUTTON_NEXT
 #define IMGVIEW_PREVIOUS    BUTTON_PREV
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_BACK
 
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define IMGVIEW_ZOOM_IN     BUTTON_SELECT
@@ -222,6 +225,7 @@
 #define IMGVIEW_NEXT        (BUTTON_DISPLAY | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_DISPLAY | BUTTON_LEFT)
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_RC_PLAY
@@ -270,6 +274,7 @@
 #define IMGVIEW_NEXT        BUTTON_VIEW
 #define IMGVIEW_PREVIOUS    BUTTON_PLAYLIST
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define IMGVIEW_ZOOM_IN     BUTTON_VOL_UP
@@ -281,6 +286,7 @@
 #define IMGVIEW_NEXT        BUTTON_RIGHT
 #define IMGVIEW_PREVIOUS    BUTTON_LEFT
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
@@ -294,7 +300,9 @@
 #define IMGVIEW_RIGHT       BUTTON_RIGHT
 #define IMGVIEW_NEXT        BUTTON_FFWD
 #define IMGVIEW_PREVIOUS    BUTTON_REW
-#define IMGVIEW_MENU        BUTTON_PLAY
+#define IMGVIEW_MENU_PRE    BUTTON_PLAY
+#define IMGVIEW_MENU        (BUTTON_PLAY|BUTTON_REL)
+#define IMGVIEW_QUIT        BUTTON_REC
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define IMGVIEW_ZOOM_IN     (BUTTON_REC | BUTTON_UP)