Ticket #3540: 0001-Revert-zoom-with-the-original-value-SL-3540.2.patch

File 0001-Revert-zoom-with-the-original-value-SL-3540.2.patch, 3.0 KB (added by manuq, 11 years ago)

Changed the tooltip string to "Actual size" as discussed in the design thread. Renamed zoomequal variable to zoom_original so we don't add another word for it (use the same as the constant and the icon name).

  • browser.py 

    From ea0f06d1bb7e2eb59590143fa233b79e7813e5d8 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Sun, 29 Apr 2012 12:45:22 -0300
Subject: [PATCH Browse] Revert zoom with the original value SL #3540
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>

New functionality to go back to the original zoom value. Added
an icon next to zoom properties in View Toolbar. This function
can be used with the hotkey "Control + 0" as well.

Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
---
 browser.py     |  1 +
 viewtoolbar.py | 11 +++++++++++
 webactivity.py |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/browser.py b/browser.py
index 7379d2b..de546f2 100644
    a b import globalhistory 
    3939import downloadmanager
    4040from pdfviewer import PDFTabPage
    4141
     42ZOOM_ORIGINAL = 1.0
    4243_ZOOM_AMOUNT = 0.1
    4344_LIBRARY_PATH = '/usr/share/library-common/index.html'
    4445

  • viewtoolbar.py 

    diff --git a/viewtoolbar.py b/viewtoolbar.py
index 0226df8..e7ad13e 100644
    a b from gi.repository import GObject 
    2323from sugar3.graphics.toolbutton import ToolButton
    2424
    2525from browser import Browser
     26from browser import ZOOM_ORIGINAL
    2627
    2728
    2829class ViewToolbar(Gtk.Toolbar):
    … … class ViewToolbar(Gtk.Toolbar): 
    4748        self.insert(self.zoomin, -1)
    4849        self.zoomin.show()
    4950
     51        self.zoom_original = ToolButton('zoom-original')
     52        self.zoom_original.set_tooltip(_('Actual size'))
     53        self.zoom_original.connect('clicked', self.__zoom_original_clicked_cb)
     54        self.insert(self.zoom_original, -1)
     55        self.zoom_original.show()
     56
    5057        self.separator = Gtk.SeparatorToolItem()
    5158        self.separator.set_draw(True)
    5259        self.insert(self.separator, -1)
    … … class ViewToolbar(Gtk.Toolbar): 
    8390        self.zoomin.set_sensitive(is_webkit_browser)
    8491        self.zoomout.set_sensitive(is_webkit_browser)
    8592
     93    def __zoom_original_clicked_cb(self, button):
     94        tabbed_view = self._activity.get_canvas()
     95        tabbed_view.props.current_browser.set_zoom_level(ZOOM_ORIGINAL)
     96
    8697    def __zoomin_clicked_cb(self, button):
    8798        tabbed_view = self._activity.get_canvas()
    8899        tabbed_view.props.current_browser.zoom_in()

  • webactivity.py 

    diff --git a/webactivity.py b/webactivity.py
index fb1a451..24f3b44 100644
    a b def _set_char_preference(name, value): 
    125125
    126126
    127127from browser import TabbedView
     128from browser import ZOOM_ORIGINAL
    128129from webtoolbar import PrimaryToolbar
    129130from edittoolbar import EditToolbar
    130131from viewtoolbar import ViewToolbar
    … … class WebActivity(activity.Activity): 
    445446            elif key_name in ['plus', 'equal']:
    446447                _logger.debug('keyboard: Zoom in')
    447448                browser.zoom_in()
     449            elif key_name == '0':
     450                _logger.debug('keyboard: Actual size')
     451                browser.set_zoom_level(ZOOM_ORIGINAL)
    448452            elif key_name == 'Left':
    449453                _logger.debug('keyboard: Go back')
    450454                browser.go_back()