From b517c69c46be6eaafbf200c8f513b1395f84e694 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Sun, 30 Oct 2011 16:36:25 +0000
Subject: Remove old toolbars support

Reviewed-by: Manuel Quinones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
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')
diff --git a/webtoolbar.py b/webtoolbar.py
index a4623be..97bdcd6 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -26,14 +26,9 @@ from xpcom.components import interfaces
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar.graphics import iconentry
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox as ToolbarBase
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    NEW_TOOLBARS = True
-except ImportError:
-    from gtk import Toolbar as ToolbarBase
-    NEW_TOOLBARS = False
+from sugar.graphics.toolbarbox import ToolbarBox as ToolbarBase
+from sugar.activity.widgets import ActivityToolbarButton
+from sugar.activity.widgets import StopButton
 
 import filepicker
 import places
@@ -242,12 +237,9 @@ class PrimaryToolbar(ToolbarBase):
 
         self._loading = False
 
-        if NEW_TOOLBARS:
-            toolbar = self.toolbar
-            activity_button = ActivityToolbarButton(self._activity)
-            toolbar.insert(activity_button, 0)
-        else:
-            toolbar = self
+        toolbar = self.toolbar
+        activity_button = ActivityToolbarButton(self._activity)
+        toolbar.insert(activity_button, 0)
 
         self._go_home = ToolButton('go-home')
         self._go_home.set_tooltip(_('Home page'))
@@ -289,9 +281,8 @@ class PrimaryToolbar(ToolbarBase):
         toolbar.insert(self._link_add, -1)
         self._link_add.show()
 
-        if NEW_TOOLBARS:
-            stop_button = StopButton(self._activity)
-            toolbar.insert(stop_button, -1)
+        stop_button = StopButton(self._activity)
+        toolbar.insert(stop_button, -1)
 
         self._progress_listener = None
         self._history = None
--
cgit v0.9.1