diff options
| author | Ariel Calzada <ariel@acivitycentral.com> | 2012-12-27 17:12:05 (GMT) |
|---|---|---|
| committer | Ariel Calzada <ariel@acivitycentral.com> | 2012-12-27 17:12:05 (GMT) |
| commit | dcee669f0982fad6b54cacab2aa2e80bdde5db28 (patch) | |
| tree | 79ad84132e1c6c769fb11f844beee33b93b5e559 | |
| parent | 1f21c1c21bb1d2c1c466ebf72452c343f99334a2 (diff) | |
Added zoom improvements from flavio's patch
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | olpc@192.168.1.4 | bin | 404642 -> 0 bytes | |||
| -rw-r--r-- | webactivity.py | 19 |
3 files changed, 9 insertions, 12 deletions
diff --git a/activity/activity.info b/activity/activity.info index 40bb592..8cfa6f7 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Browse -activity_version = 149.1 +activity_version = 149.2 bundle_id = org.laptop.WebActivity icon = activity-web exec = sugar-activity webactivity.WebActivity -s diff --git a/olpc@192.168.1.4 b/olpc@192.168.1.4 Binary files differdeleted file mode 100644 index ac58328..0000000 --- a/olpc@192.168.1.4 +++ /dev/null diff --git a/webactivity.py b/webactivity.py index a25cd04..7db51bc 100644 --- a/webactivity.py +++ b/webactivity.py @@ -414,6 +414,13 @@ class WebActivity(activity.Activity): tab_page.browser.grab_focus() self._tabbed_view.set_current_page(self.model.data['current_tab']) + + # zoom level + if 'current_zoom_level' in self.model.data: + self._tabbed_view.props.current_browser.set_zoom_level(self.model.data['current_zoom_level']) + else: + self._tabbed_view.props.current_browser.set_zoom_level(ZOOM_ORIGINAL) + elif self.metadata['mime_type'] == 'text/uri-list': data = self._get_data_from_file_path(file_path) uris = mime.split_uri_list(data) @@ -427,11 +434,6 @@ class WebActivity(activity.Activity): self._tabbed_view.props.current_browser.load_uri(file_uri) self._tabbed_view.props.current_browser.grab_focus() - try: - self._tabbed_view.props.current_browser.set_zoom_level(self.model.data['current_zoom_level']) - except: - self._tabbed_view.props.current_browser.set_zoom_level(ZOOM_ORIGINAL) - def write_file(self, file_path): if not self.metadata['mime_type']: self.metadata['mime_type'] = 'text/plain' @@ -439,12 +441,7 @@ class WebActivity(activity.Activity): if self.metadata['mime_type'] == 'text/plain': browser = self._tabbed_view.current_browser - - try: - self.model.data['current_zoom_level'] = browser.get_zoom_level() - except: - self.model.data['current_zoom_level'] = ZOOM_ORIGINAL - + self.model.data['current_zoom_level'] = browser.get_zoom_level() if not self._jobject.metadata['title_set_by_user'] == '1': if browser.props.title is None: |