Move HAVE_TOOLABAR definition to Config.py

7 files changed, 27 insertions, 40 deletions

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 6214f4b..b029bfb 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -384,7 +384,7 @@ class MainWindow(gtk.EventBox):
             self.createNewTune(None)
 
         # Toolbar
-        if self.activity.have_toolbox:
+        if Config.HAVE_TOOLBOX:
             from sugar.graphics.toolbarbox import ToolbarButton
 
             self._mainToolbar = mainToolbar(self)
diff --git a/Jam/JamMain.py b/Jam/JamMain.py
index 053fda3..3b6bec4 100644
--- a/Jam/JamMain.py
+++ b/Jam/JamMain.py
@@ -245,7 +245,7 @@ class JamMain(gtk.EventBox):
             self.prepareKeyImage(key)
 
         #-- Toolbars ------------------------------------------
-        if self.activity.have_toolbox:
+        if Config.HAVE_TOOLBOX:
             from sugar.graphics.toolbarbox import ToolbarButton
 
             self.jamToolbar = JamToolbar(self)
@@ -452,7 +452,7 @@ class JamMain(gtk.EventBox):
         #-- Final Set Up --------------------------------------
         self.setVolume(self.volume)
         self.setTempo(self.tempo)
-        if not self.activity.have_toolbox:
+        if not Config.HAVE_TOOLBOX:
             self.activity.toolbox.set_current_toolbar(1)  # JamToolbar
         self.setDesktop(0, True)
 
@@ -750,7 +750,7 @@ class JamMain(gtk.EventBox):
             self._setMuted(False)
 
     def setMuted(self, muted):
-        if self.activity.have_toolbox:
+        if Config.HAVE_TOOLBOX:
             toolbar = self.activity.toolbox.toolbar
         else:
             toolbar = self.playbackToolbar
diff --git a/SynthLab/SynthLabMain.py b/SynthLab/SynthLabMain.py
index 1b75fcf..3cdeedf 100644
--- a/SynthLab/SynthLabMain.py
+++ b/SynthLab/SynthLabMain.py
@@ -72,7 +72,7 @@ class SynthLabMain(gtk.EventBox):
         self.journalCalled = True
 
         #Toolbars
-        if self.activity.have_toolbox:
+        if Config.HAVE_TOOLBOX:
             from sugar.graphics.toolbarbox import ToolbarButton
 
             self.durationSliderAdj = main_toolbar_common(
diff --git a/TamTamEdit.py b/TamTamEdit.py
index 0a5c913..6466b8a 100644
--- a/TamTamEdit.py
+++ b/TamTamEdit.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 TamTamEdit(activity.Activity):
@@ -75,9 +70,7 @@ class TamTamEdit(activity.Activity):
         self.connect('destroy', self.onDestroy)
 
         #load the sugar toolbar
-        #load the sugar toolbar
-        self.have_toolbox = HAVE_TOOLBOX
-        if self.have_toolbox:
+        if Config.HAVE_TOOLBOX:
             # no sharing
             self.max_participants = 1
 
@@ -104,7 +97,7 @@ class TamTamEdit(activity.Activity):
         self.edit.onActivate(arg=None)
         self.show()
 
-        if not self.have_toolbox:
+        if not Config.HAVE_TOOLBOX:
             self.activity_toolbar.share.hide()
 
     def onPreloadTimeout(self):
@@ -169,7 +162,7 @@ class TamTamEdit(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)
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)
diff --git a/TamTamSynthLab.py b/TamTamSynthLab.py
index 287ad35..7f82388 100644
--- a/TamTamSynthLab.py
+++ b/TamTamSynthLab.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 TamTamSynthLab(activity.Activity):
@@ -71,8 +66,7 @@ class TamTamSynthLab(activity.Activity):
         self.connect('destroy', self.onDestroy)
 
         #load the sugar toolbar
-        self.have_toolbox = HAVE_TOOLBOX
-        if HAVE_TOOLBOX:
+        if Config.HAVE_TOOLBOX:
             # no sharing
             self.max_participants = 1
 
@@ -172,7 +166,7 @@ class TamTamSynthLab(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)
diff --git a/common/Config.py b/common/Config.py
index ed6777f..7f4d736 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -56,6 +56,12 @@ PLUGIN_RATE = 16000
 PLUGIN_PERIOD = 256  # 512
 PLUGIN_NPERIODS = 2
 
+try:
+    from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
+    HAVE_TOOLBOX = True
+except ImportError:
+    HAVE_TOOLBOX = False
+
 ##############
 ## SOUNDS
 ##############