diff options
Diffstat (limited to 'webactivity.py')
| -rw-r--r-- | webactivity.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/webactivity.py b/webactivity.py index 3c0d337..3211f2f 100644 --- a/webactivity.py +++ b/webactivity.py @@ -212,7 +212,7 @@ class WebActivity(activity.Activity): self.connect('key-press-event', self._key_press_cb) if handle.uri: - self._tabbed_view.current_browser.load_uri(handle.uri) + self._tabbed_view.current_browser.open(handle.uri) elif not self._jobject.file_path: # TODO: we need this hack until we extend the activity API for # opening URIs and default docs. @@ -414,17 +414,20 @@ class WebActivity(activity.Activity): tab_page.browser.grab_focus() self._tabbed_view.set_current_page(self.model.data['current_tab']) + + self._tabbed_view.props.current_browser.set_zoom_level(self.model.data['current_zoom_level']) + elif self.metadata['mime_type'] == 'text/uri-list': data = self._get_data_from_file_path(file_path) uris = mime.split_uri_list(data) if len(uris) == 1: - self._tabbed_view.props.current_browser.load_uri(uris[0]) + self._tabbed_view.props.current_browser.open(uris[0]) else: _logger.error('Open uri-list: Does not support' 'list of multiple uris by now.') else: - file_uri = 'file://' + file_path - self._tabbed_view.props.current_browser.load_uri(file_uri) + file_uri = file_path + self._tabbed_view.props.current_browser.open(file_uri) self._tabbed_view.props.current_browser.grab_focus() def write_file(self, file_path): @@ -434,6 +437,8 @@ class WebActivity(activity.Activity): if self.metadata['mime_type'] == 'text/plain': browser = self._tabbed_view.current_browser + + 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: @@ -588,7 +593,7 @@ class WebActivity(activity.Activity): def _link_clicked_cb(self, button, url): ''' an item of the link tray has been clicked ''' - self._tabbed_view.props.current_browser.load_uri(url) + self._tabbed_view.props.current_browser.open(url) def _get_screenshot(self): browser = self._tabbed_view.props.current_browser |