Revise EAF PDF keybindings

app/pdf-viewer/buffer.py

@@ -45,7 +45,7 @@ class AppBuffer(Buffer):
                             "scroll_down_page", "scroll_to_home", "scroll_to_end",
                             "zoom_reset", "zoom_in", "zoom_out",
                             "save_current_pos", "jump_to_saved_pos",
-                            "scroll_left", "scroll_right",
+                            "scroll_right", "scroll_left",
                             "toggle_read_mode", "toggle_inverted_mode", "toggle_mark_link"]:
             self.build_widget_method(method_name)
 
@@ -442,9 +442,9 @@ class PdfViewerWidget(QWidget):
             if event.angleDelta().y():
                 self.update_scroll_offset(max(min(self.scroll_offset - self.scale * event.angleDelta().y() / 120 * self.mouse_scroll_offset, self.max_scroll_offset()), 0))
             elif event.angleDelta().x() >= 0:
-                self.scroll_right()
-            elif event.angleDelta().x() < 0:
                 self.scroll_left()
+            elif event.angleDelta().x() < 0:
+                self.scroll_right()
 
     def get_start_page_index(self):
         return int(self.scroll_offset * 1.0 / self.scale / self.page_height)
@@ -499,10 +499,10 @@ class PdfViewerWidget(QWidget):
     def scroll_down(self):
         self.update_scroll_offset(max(self.scroll_offset - self.scale * self.scroll_step, 0))
 
-    def scroll_left(self):
+    def scroll_right(self):
         self.update_horizontal_offset(max(self.horizontal_offset - self.scale * 30, (self.rect().width() - self.page_width * self.scale) / 2))
 
-    def scroll_right(self):
+    def scroll_left(self):
         self.update_horizontal_offset(min(self.horizontal_offset + (self.scale * 30), (self.page_width * self.scale - self.rect().width()) / 2))
 
     def scroll_up_page(self):

eaf.el

@@ -7,7 +7,7 @@
 ;; Copyright (C) 2018, Andy Stewart, all rights reserved.
 ;; Created: 2018-06-15 14:10:12
 ;; Version: 0.5
-;; Last-Updated: Sat Apr 11 20:17:28 2020 (-0400)
+;; Last-Updated: Sat Apr 11 23:01:05 2020 (-0400)
 ;;           By: Mingde (Matthew) Zeng
 ;; URL: http://www.emacswiki.org/emacs/download/eaf.el
 ;; Keywords:
@@ -347,13 +347,17 @@ Try not to modify this alist directly.  Use `eaf-setq' to modify instead."
 
 (defcustom eaf-pdf-viewer-keybinding
   '(("j" . "scroll_up")
-    ("k" . "scroll_down")
     ("<down>" . "scroll_up")
-    ("<up>" . "scroll_down")
     ("C-n" . "scroll_up")
+    ("k" . "scroll_down")
+    ("<up>" . "scroll_down")
     ("C-p" . "scroll_down")
-    ("C-b" . "scroll_right")
-    ("C-f" . "scroll_left")
+    ("h" . "scroll_left")
+    ("<left>" . "scroll_left")
+    ("C-b" . "scroll_left")
+    ("l" . "scroll_right")
+    ("<right>" . "scroll_right")
+    ("C-f" . "scroll_right")
     ("SPC" . "scroll_up_page")
     ("b" . "scroll_down_page")
     ("C-v" . "scroll_up_page")
@@ -375,11 +379,11 @@ Try not to modify this alist directly.  Use `eaf-setq' to modify instead."
     ("C-s" . "search_text_forward")
     ("C-r" . "search_text_backward")
     ("x" . "close_buffer")
-    ("h" . "add_annot_highlight")
-    ("u" . "add_annot_underline")
-    ("s" . "add_annot_squiggly")
-    ("d" . "add_annot_strikeout_or_delete_annot")
-    ("e" . "add_annot_text_or_edit_annot")
+    ("M-h" . "add_annot_highlight")
+    ("M-u" . "add_annot_underline")
+    ("M-s" . "add_annot_squiggly")
+    ("M-d" . "add_annot_strikeout_or_delete_annot")
+    ("M-e" . "add_annot_text_or_edit_annot")
     ("J" . "select_left_tab")
     ("K" . "select_right_tab"))
   "The keybinding of EAF PDF Viewer."