From cbcedfac523a0b416f422139a7bb60e16930c634 Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Mon, 01 Aug 2011 00:27:49 +0000 Subject: Move HAVE_TOOLABAR definition to Config.py --- (limited to 'TamTamJam.py') diff --git a/TamTamJam.py b/TamTamJam.py index be2443e..f727414 100644 --- a/TamTamJam.py +++ b/TamTamJam.py @@ -42,15 +42,10 @@ from common.Util.Trackpad import Trackpad from gettext import gettext as _ import commands from sugar.activity import activity -try: - from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton - HAVE_TOOLBOX = True -except ImportError: - HAVE_TOOLBOX = False -if HAVE_TOOLBOX: - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton +if Config.HAVE_TOOLBOX: + from sugar.graphics.toolbarbox import ToolbarBox + from sugar.activity.widgets import ActivityToolbarButton, StopButton class TamTamJam(activity.Activity): @@ -81,8 +76,7 @@ class TamTamJam(activity.Activity): self.connect('destroy', self.onDestroy) #load the sugar toolbar - self.have_toolbox = HAVE_TOOLBOX - if HAVE_TOOLBOX: + if Config.HAVE_TOOLBOX: self.toolbox = ToolbarBox() activity_button = ActivityToolbarButton(self) self.toolbox.toolbar.insert(activity_button, 0) @@ -172,7 +166,7 @@ class TamTamJam(activity.Activity): def add_stop_button(self): ''' Add a stop button if using the new toolbars ''' - if self.have_toolbox: + if Config.HAVE_TOOLBOX: separator = gtk.SeparatorToolItem() separator.props.draw = False separator.set_expand(True) -- cgit v0.9.1