Add buttons to "zoom to fit" and "actual size" - SL #3752

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>

1 files changed, 14 insertions, 18 deletions

diff --git a/readtoolbar.py b/readtoolbar.py
index 55ffd2b..2e01be2 100644
--- a/readtoolbar.py
+++ b/readtoolbar.py
@@ -25,7 +25,6 @@ from sugar3.graphics.toolbutton import ToolButton
 from sugar3.graphics.menuitem import MenuItem
 from sugar3.graphics import iconentry
 from sugar3.activity.widgets import EditToolbar as BaseEditToolbar
-from sugarmenuitem import SugarMenuItem
 
 
 class EditToolbar(BaseEditToolbar):
@@ -185,26 +184,23 @@ class ViewToolbar(Gtk.Toolbar):
         self.insert(self._zoom_in, -1)
         self._zoom_in.show()
 
-        self._zoom_to_width = ToolButton('zoom-best-fit')
+        self._zoom_to_width = ToolButton('zoom-to-width')
         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()
 
-        vbox_menu = Gtk.VBox()
-        fit_menu = SugarMenuItem(text_label=_('Zoom to fit'))
-        fit_menu.connect('clicked', self._zoom_to_fit_menu_item_activate_cb)
-        vbox_menu.add(fit_menu)
-        actual_size_menu = SugarMenuItem(text_label=_('Actual size'))
-        actual_size_menu.connect('clicked',
-                self._actual_size_menu_item_activate_cb)
-        vbox_menu.add(actual_size_menu)
-        vbox_menu.show_all()
-
-        palette = self._zoom_to_width.get_palette()
-        palette.set_content(vbox_menu)
-        # HACK
-        palette._content.set_border_width(1)
+        self._zoom_to_fit = ToolButton('zoom-best-fit')
+        self._zoom_to_fit.set_tooltip(_('Zoom to fit'))
+        self._zoom_to_fit.connect('clicked', self._zoom_to_fit_cb)
+        self.insert(self._zoom_to_fit, -1)
+        self._zoom_to_fit.show()
+
+        self._zoom_to_original = ToolButton('zoom-original')
+        self._zoom_to_original.set_tooltip(_('Actual size'))
+        self._zoom_to_original.connect('clicked', self._actual_size_cb)
+        self.insert(self._zoom_to_original, -1)
+        self._zoom_to_original.show()
 
         tool_item = Gtk.ToolItem()
         self.insert(tool_item, -1)
@@ -285,11 +281,11 @@ class ViewToolbar(Gtk.Toolbar):
         self._zoom_out.props.sensitive = self._view.can_zoom_out()
         self._zoom_to_width.props.sensitive = self._view.can_zoom_to_width()
 
-    def _zoom_to_fit_menu_item_activate_cb(self, menu_item):
+    def _zoom_to_fit_cb(self, menu_item):
         self._view.zoom_to_best_fit()
         self._update_zoom_buttons()
 
-    def _actual_size_menu_item_activate_cb(self, menu_item):
+    def _actual_size_cb(self, menu_item):
         self._view.zoom_to_actual_size()
         self._update_zoom_buttons()