Disable many options that are not available under libevview 2.30.

2 files changed, 6 insertions, 96 deletions

diff --git a/readactivity.py b/readactivity.py
index d17d6cd..550599b 100644
--- a/readactivity.py
+++ b/readactivity.py
@@ -767,7 +767,6 @@ class ReadActivity(activity.Activity):
 
     def _setup_evince_viewer(self):
         self._view = evince.View()
-        #self._view.set_screen_dpi(_get_screen_dpi())
         self._view.connect('notify::has-selection',
                             self._view_notify_has_selection_cb)
 
@@ -817,7 +816,7 @@ class ReadActivity(activity.Activity):
         except AttributeError: #must be on libevview >=2.30
             self._model = evince.DocumentModel()
             self._model.set_document(self._document)
-            selv._view.set_model(self._model)
+            self._view.set_model(self._model)
 
         self._edit_toolbar.set_document(self._document)
         self._topbar.set_document(self._document)
diff --git a/readtoolbar.py b/readtoolbar.py
index 53a756f..9d11171 100644
--- a/readtoolbar.py
+++ b/readtoolbar.py
@@ -194,43 +194,11 @@ class ViewToolbar(gtk.Toolbar):
         self._zoom_in.connect('clicked', self._zoom_in_cb)
         self.insert(self._zoom_in, -1)
         self._zoom_in.show()
-            
-        self._zoom_to_width = ToolButton('zoom-best-fit')
-        self._zoom_to_width.set_tooltip(_('Zoom to width'))
-        self._zoom_to_width.connect('clicked', self._zoom_to_width_cb)
-        self.insert(self._zoom_to_width, -1)
-        self._zoom_to_width.show()
-
-        palette = self._zoom_to_width.get_palette()
-        menu_item = MenuItem(_('Zoom to fit'))
-        menu_item.connect('activate', self._zoom_to_fit_menu_item_activate_cb)
-        palette.menu.append(menu_item)
-        menu_item.show()
-
-        menu_item = MenuItem(_('Actual size'))
-        menu_item.connect('activate', self._actual_size_menu_item_activate_cb)
-        palette.menu.append(menu_item)
-        menu_item.show()
 
         tool_item = gtk.ToolItem()
         self.insert(tool_item, -1)
         tool_item.show()
 
-        self._zoom_spin = gtk.SpinButton()
-        self._zoom_spin.set_range(5.409, 400)
-        self._zoom_spin.set_increments(1, 10)
-        self._zoom_spin_notify_value_handler = self._zoom_spin.connect(
-                'notify::value', self._zoom_spin_notify_value_cb)
-        tool_item.add(self._zoom_spin)
-        self._zoom_spin.show()
-
-        zoom_perc_label = gtk.Label(_("%"))
-        zoom_perc_label.show()
-        tool_item_zoom_perc_label = gtk.ToolItem()
-        tool_item_zoom_perc_label.add(zoom_perc_label)
-        self.insert(tool_item_zoom_perc_label, -1)
-        tool_item_zoom_perc_label.show()
-
         spacer = gtk.SeparatorToolItem()
         spacer.props.draw = False
         self.insert(spacer, -1)
@@ -242,79 +210,22 @@ class ViewToolbar(gtk.Toolbar):
         self.insert(self._fullscreen, -1)
         self._fullscreen.show()
 
-        self._view_notify_zoom_handler = None
-
     def set_view(self, view):
         self._evince_view = view
-        self._zoom_spin.props.value = self._evince_view.props.zoom * 100
-        self._view_notify_zoom_handler = self._evince_view.connect(
-            'notify::zoom', self._view_notify_zoom_cb)
-
-        self._update_zoom_buttons() 
-
-
-    def _zoom_spin_notify_value_cb(self, zoom_spin, pspec):
-        if not self._view_notify_zoom_handler:
-            return
-        self._evince_view.disconnect(self._view_notify_zoom_handler)
-        try:
-            if hasattr(self._evince_view.props, 'sizing_mode'):
-                self._evince_view.props.sizing_mode = evince.SIZING_FREE
-            self._evince_view.props.zoom = zoom_spin.props.value / 100.0
-        finally:
-            self._view_notify_zoom_handler = self._evince_view.connect(
-                    'notify::zoom', self._view_notify_zoom_cb)
-
-    def _view_notify_zoom_cb(self, evince_view, pspec):
-        self._zoom_spin.disconnect(self._zoom_spin_notify_value_handler)
-        try:
-            self._zoom_spin.props.value = round(evince_view.props.zoom * 100.0)
-        finally:
-            self._zoom_spin_notify_value_handler = self._zoom_spin.connect(
-                    'notify::value', self._zoom_spin_notify_value_cb)
-
-    def zoom_in(self):
-        if hasattr(self._evince_view.props, 'sizing_mode'):
-            self._evince_view.props.sizing_mode = evince.SIZING_FREE
-        self._evince_view.zoom_in()
         self._update_zoom_buttons()
 
     def _zoom_in_cb(self, button):
-        self.zoom_in()
+        self._evince_view.zoom_in()
 
-    def zoom_out(self):
-        if hasattr(self._evince_view.props, 'sizing_mode'):
-            self._evince_view.props.sizing_mode = evince.SIZING_FREE
-        self._evince_view.zoom_out()
-        self._update_zoom_buttons()
-        
     def _zoom_out_cb(self, button):
-        self.zoom_out()
-
-    def zoom_to_width(self):
-        if hasattr(self._evince_view.props, 'sizing_mode'):
-            self._evince_view.props.sizing_mode = evince.SIZING_FIT_WIDTH
-        self.emit('needs-update-size')
-        self._update_zoom_buttons()
-
-    def _zoom_to_width_cb(self, button):
-        self.zoom_to_width()
+        self._evince_view.zoom_out()
 
     def _update_zoom_buttons(self):
+        logging.debug('Can zoom in: %s, Can zoom out: %s' %
+                      (self._evince_view.can_zoom_in(),
+                       self._evince_view.can_zoom_out()))
         self._zoom_in.props.sensitive = self._evince_view.can_zoom_in()
         self._zoom_out.props.sensitive = self._evince_view.can_zoom_out()
 
-    def _zoom_to_fit_menu_item_activate_cb(self, menu_item):
-        if hasattr(self._evince_view.props, 'sizing_mode'): #XXX
-            self._evince_view.props.sizing_mode = evince.SIZING_BEST_FIT
-        self.emit('needs-update-size')
-        self._update_zoom_buttons()
-
-    def _actual_size_menu_item_activate_cb(self, menu_item):
-        if hasattr(self._evince_view.props, 'sizing_mode'):
-            self._evince_view.props.sizing_mode = evince.SIZING_FREE
-        self._evince_view.props.zoom = 1.0
-        self._update_zoom_buttons()
-
     def _fullscreen_cb(self, button):
         self.emit('go-fullscreen')