diff options
Diffstat (limited to 'webactivity.py')
| -rw-r--r-- | webactivity.py | 66 |
1 files changed, 14 insertions, 52 deletions
diff --git a/webactivity.py b/webactivity.py index eefb169..707b602 100644 --- a/webactivity.py +++ b/webactivity.py @@ -50,13 +50,7 @@ from sugar.graphics.alert import Alert from sugar.graphics.icon import Icon from sugar import mime -# Attempt to import the new toolbar classes. If the import fails, -# fall back to the old toolbar style. -try: - from sugar.graphics.toolbarbox import ToolbarButton - NEW_TOOLBARS = True -except ImportError: - NEW_TOOLBARS = False +from sugar.graphics.toolbarbox import ToolbarButton PROFILE_VERSION = 2 @@ -64,10 +58,6 @@ _profile_version = 0 _profile_path = os.path.join(activity.get_activity_root(), 'data/gecko') _version_file = os.path.join(_profile_path, 'version') -if not NEW_TOOLBARS: - _TOOLBAR_EDIT = 1 - _TOOLBAR_BROWSE = 2 - if os.path.exists(_version_file): f = open(_version_file) _profile_version = int(f.read()) @@ -242,41 +232,20 @@ class WebActivity(activity.Activity): self._primary_toolbar.connect('go-home', self._go_home_button_cb) - if NEW_TOOLBARS: - logging.debug('Using new toolbars') - - self._edit_toolbar_button = ToolbarButton( - page=self._edit_toolbar, - icon_name='toolbar-edit') - self._primary_toolbar.toolbar.insert( - self._edit_toolbar_button, 1) - - view_toolbar_button = ToolbarButton( - page=self._view_toolbar, - icon_name='toolbar-view') - self._primary_toolbar.toolbar.insert( - view_toolbar_button, 2) - - self._primary_toolbar.show_all() - self.set_toolbar_box(self._primary_toolbar) - else: - _logger.debug('Using old toolbars') - - toolbox = activity.ActivityToolbox(self) - - toolbox.add_toolbar(_('Edit'), self._edit_toolbar) - self._edit_toolbar.show() - - toolbox.add_toolbar(_('Browse'), self._primary_toolbar) - self._primary_toolbar.show() + self._edit_toolbar_button = ToolbarButton( + page=self._edit_toolbar, + icon_name='toolbar-edit') + self._primary_toolbar.toolbar.insert( + self._edit_toolbar_button, 1) - toolbox.add_toolbar(_('View'), self._view_toolbar) - self._view_toolbar.show() + view_toolbar_button = ToolbarButton( + page=self._view_toolbar, + icon_name='toolbar-view') + self._primary_toolbar.toolbar.insert( + view_toolbar_button, 2) - self.set_toolbox(toolbox) - toolbox.show() - - self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE) + self._primary_toolbar.show_all() + self.set_toolbar_box(self._primary_toolbar) self.set_canvas(self._tabbed_view) self._tabbed_view.show() @@ -321,8 +290,6 @@ class WebActivity(activity.Activity): _logger.debug('Created activity') def _on_focus_url_entry(self, gobject): - if not NEW_TOOLBARS: - self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE) self._primary_toolbar.entry.grab_focus() def _shared_cb(self, activity_): @@ -518,15 +485,10 @@ class WebActivity(activity.Activity): self._add_link() elif key_name == 'f': _logger.debug('keyboard: Find') - if NEW_TOOLBARS: - self._edit_toolbar_button.set_expanded(True) - else: - self.toolbox.set_current_toolbar(_TOOLBAR_EDIT) + self._edit_toolbar_button.set_expanded(True) self._edit_toolbar.search_entry.grab_focus() elif key_name == 'l': _logger.debug('keyboard: Focus url entry') - if not NEW_TOOLBARS: - self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE) self._primary_toolbar.entry.grab_focus() elif key_name == 'minus': _logger.debug('keyboard: Zoom out') |