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

File 0001-Revert-zoom-with-the-original-value-SL-3540.patch, 3.1 KB (added by humitos, 12 years ago)

  • browser.py 

    From 41a7f16b8dc4d580d6a276026924d39f6b7c0e85 Mon Sep 17 00:00:00 2001
Message-Id: <41a7f16b8dc4d580d6a276026924d39f6b7c0e85.1335714441.git.humitos@gmail.com>
From: Manuel Kaufmann <humitos@gmail.com>
Date: Sun, 29 Apr 2012 12:45:22 -0300
Subject: [PATCH Browse v3] Revert zoom with the original value SL #3540

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(+), 0 deletions(-)

diff --git a/browser.py b/browser.py
index 259d888..796915e 100644
    a b import globalhistory 
    3838import downloadmanager
    3939from pdfviewer import PDFTabPage
    4040
     41ZOOM_ORIGINAL = 1.0
    4142_ZOOM_AMOUNT = 0.1
    4243_LIBRARY_PATH = '/usr/share/library-common/index.html'
    4344

  • viewtoolbar.py 

    diff --git a/viewtoolbar.py b/viewtoolbar.py
index 0226df8..57baf81 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.zoomequal = ToolButton('zoom-original')
     52        self.zoomequal.set_tooltip(_('Zoom equal'))
     53        self.zoomequal.connect('clicked', self.__zoomequal_clicked_cb)
     54        self.insert(self.zoomequal, -1)
     55        self.zoomequal.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 __zoomequal_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 156ea3c..9345a45 100644
    a b def _set_char_preference(name, value): 
    128128
    129129
    130130from browser import TabbedView
     131from browser import ZOOM_ORIGINAL
    131132from webtoolbar import PrimaryToolbar
    132133from edittoolbar import EditToolbar
    133134from viewtoolbar import ViewToolbar
    … … class WebActivity(activity.Activity): 
    448449            elif key_name in ['plus', 'equal']:
    449450                _logger.debug('keyboard: Zoom in')
    450451                browser.zoom_in()
     452            elif key_name == '0':
     453                _logger.debug('keyboard: Zoom equal')
     454                browser.set_zoom_level(ZOOM_ORIGINAL)
    451455            elif key_name == 'Left':
    452456                _logger.debug('keyboard: Go back')
    453457                browser.go_back()