1 files changed, 26 insertions, 7 deletions

diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 7c0cfab519..f476316ef9 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -380,17 +380,36 @@
 #define TV_QUIT BUTTON_POWER
 #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER)
 
-/* SAMSUNG YH-820 / YH-920 / YH-925 keys */
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define TV_QUIT         BUTTON_REC
+/* SAMSUNG YH-920 / YH-925 keys */
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#define TV_QUIT         (BUTTON_REW|BUTTON_REPEAT)
 #define TV_SCROLL_UP    BUTTON_UP
 #define TV_SCROLL_DOWN  BUTTON_DOWN
 #define TV_SCREEN_LEFT  BUTTON_LEFT
 #define TV_SCREEN_RIGHT BUTTON_RIGHT
-#define TV_MENU         BUTTON_PLAY
-#define TV_AUTOSCROLL   BUTTON_REW
-#define TV_BOOKMARK     BUTTON_FFWD
+#define TV_MENU         BUTTON_REW
+#define TV_AUTOSCROLL   BUTTON_REC_SW_ON
+#define TV_AUTOSCROLL2  BUTTON_REC_SW_OFF
+#define TV_BOOKMARK     BUTTON_PLAY
+#define TV_LINE_UP      (BUTTON_FFWD|BUTTON_UP)
+#define TV_LINE_DOWN    (BUTTON_FFWD|BUTTON_DOWN)
+#define TV_COLUMN_LEFT  (BUTTON_FFWD|BUTTON_LEFT)
+#define TV_COLUMN_RIGHT (BUTTON_FFWD|BUTTON_RIGHT)
+
+/* SAMSUNG YH-820 keys */
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+#define TV_QUIT         (BUTTON_REW|BUTTON_REPEAT)
+#define TV_SCROLL_UP    BUTTON_UP
+#define TV_SCROLL_DOWN  BUTTON_DOWN
+#define TV_SCREEN_LEFT  BUTTON_LEFT
+#define TV_SCREEN_RIGHT BUTTON_RIGHT
+#define TV_MENU         BUTTON_REW
+#define TV_AUTOSCROLL   BUTTON_FFWD
+#define TV_BOOKMARK     BUTTON_PLAY
+#define TV_LINE_UP      (BUTTON_REC|BUTTON_UP)
+#define TV_LINE_DOWN    (BUTTON_REC|BUTTON_DOWN)
+#define TV_COLUMN_LEFT  (BUTTON_REC|BUTTON_LEFT)
+#define TV_COLUMN_RIGHT (BUTTON_REC|BUTTON_RIGHT)
 
 /* Packard Bell Vibe 500 keys */
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD