Read should setup dpad left/right to move document left/right - OLPC #10501

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Gonzalo Odiard <gonzalo@laptop.org>

2 files changed, 18 insertions, 8 deletions

diff --git a/evinceadapter.py b/evinceadapter.py
index 863dbd5..723b174 100644
--- a/evinceadapter.py
+++ b/evinceadapter.py
@@ -233,9 +233,9 @@ class EvinceViewer():
         elif scrolltype == gtk.SCROLL_PAGE_FORWARD:
             self._view.scroll(gtk.SCROLL_PAGE_FORWARD, 1)
         elif scrolltype == gtk.SCROLL_STEP_BACKWARD:
-            self._scroll_step(False)
+            self._scroll_step(False, horizontal)
         elif scrolltype == gtk.SCROLL_STEP_FORWARD:
-            self._scroll_step(True)
+            self._scroll_step(True, horizontal)
         elif scrolltype == gtk.SCROLL_START:
             self.set_current_page(0)
         elif scrolltype == gtk.SCROLL_END:
@@ -243,14 +243,17 @@ class EvinceViewer():
         else:
             print ('Got unsupported scrolltype %s' % str(scrolltype))
 
-    def _scroll_step(self, forward):
-        v_adj = self._activity._scrolled.get_vadjustment()
-        v_value = v_adj.get_value()
-        step = v_adj.get_step_increment()
+    def _scroll_step(self, forward, horizontal):
+        if horizontal:
+            adj = self._activity._scrolled.get_hadjustment()
+        else:
+            adj = self._activity._scrolled.get_vadjustment()
+        value = adj.get_value()
+        step = adj.get_step_increment()
         if forward:
-            v_adj.set_value(v_value + step)
+            adj.set_value(value + step)
         else:
-            v_adj.set_value(v_value - step)
+            adj.set_value(value - step)
 
     def copy(self):
         self._view.copy()
diff --git a/readactivity.py b/readactivity.py
index 38021e4..73797b7 100644
--- a/readactivity.py
+++ b/readactivity.py
@@ -85,6 +85,7 @@ def get_md5(filename):
     fh.close()
     return digest.hexdigest()
 
+
 class ReadHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     """HTTP Request Handler for transferring document while collaborating.
 
@@ -962,6 +963,12 @@ class ReadActivity(activity.Activity):
         elif keyname == 'Down' or keyname == 'KP_Down':
             self._view.scroll(gtk.SCROLL_STEP_FORWARD, False)
             return True
+        elif keyname == 'Left' or keyname == 'KP_Left':
+            self._view.scroll(gtk.SCROLL_STEP_BACKWARD, True)
+            return True
+        elif keyname == 'Right' or keyname == 'KP_Right':
+            self._view.scroll(gtk.SCROLL_STEP_FORWARD, True)
+            return True
         else:
             return False