From cbcedfac523a0b416f422139a7bb60e16930c634 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Mon, 01 Aug 2011 00:27:49 +0000
Subject: Move HAVE_TOOLABAR definition to Config.py

---
(limited to 'TamTamEdit.py')

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)
--
cgit v0.9.1