remove old toolbar supportHEADmaster

1 files changed, 18 insertions, 37 deletions

diff --git a/FlipActivity.py b/FlipActivity.py
index 72df44f..eb5c497 100644
--- a/FlipActivity.py
+++ b/FlipActivity.py
@@ -15,15 +15,9 @@
 from gi.repository import Gtk, Gdk
 from sugar3.activity import activity
 from sugar3 import profile
-try:
-    from sugar3.graphics.toolbarbox import ToolbarBox
-    _have_toolbox = True
-except ImportError:
-    _have_toolbox = False
-
-if _have_toolbox:
-    from sugar3.activity.widgets import ActivityToolbarButton
-    from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
 
 from toolbar_utils import button_factory, label_factory, separator_factory
 from utils import json_load, json_dump
@@ -64,7 +58,7 @@ class FlipActivity(activity.Activity):
         else:
             self.colors = ['#A0FFA0', '#FF8080']
 
-        self._setup_toolbars(_have_toolbox)
+        self._setup_toolbars()
         self._setup_dispatch_table()
 
         # Create a canvas
@@ -83,33 +77,22 @@ class FlipActivity(activity.Activity):
         else:
             self._game.new_game()
 
-    def _setup_toolbars(self, have_toolbox):
+    def _setup_toolbars(self):
         """ Setup the toolbars. """
 
         self.max_participants = 4
 
-        if have_toolbox:
-            toolbox = ToolbarBox()
-
-            # Activity toolbar
-            activity_button = ActivityToolbarButton(self)
+        toolbox = ToolbarBox()
 
-            toolbox.toolbar.insert(activity_button, 0)
-            activity_button.show()
+        # Activity toolbar
+        activity_button = ActivityToolbarButton(self)
 
-            self.set_toolbar_box(toolbox)
-            toolbox.show()
-            self.toolbar = toolbox.toolbar
+        toolbox.toolbar.insert(activity_button, 0)
+        activity_button.show()
 
-        else:
-            # Use pre-0.86 toolbar design
-            games_toolbar = Gtk.Toolbar()
-            toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(toolbox)
-            toolbox.add_toolbar(_('Game'), games_toolbar)
-            toolbox.show()
-            toolbox.set_current_toolbar(1)
-            self.toolbar = games_toolbar
+        self.set_toolbar_box(toolbox)
+        toolbox.show()
+        self.toolbar = toolbox.toolbar
 
         self._new_game_button_h = button_factory(
             'new-game', self.toolbar, self._new_game_cb,
@@ -117,19 +100,17 @@ class FlipActivity(activity.Activity):
 
         self.status = label_factory(self.toolbar, '')
 
-        if _have_toolbox:
-            separator_factory(toolbox.toolbar, True, False)
+        separator_factory(toolbox.toolbar, True, False)
 
         self.solver = button_factory(
             'help-toolbar', self.toolbar,
             self._solve_cb,
             tooltip=_('Solve the puzzle'))
 
-        if _have_toolbox:
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>q'
-            toolbox.toolbar.insert(stop_button, -1)
-            stop_button.show()
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl>q'
+        toolbox.toolbar.insert(stop_button, -1)
+        stop_button.show()
 
     def _new_game_cb(self, button=None):
         ''' Start a new game. '''