add support for new toolbars to TamTamMini

Adds support for new toolbars to TamTamMini. Note that TamTamMini has play and record toolbars that are currently commented out in this code. If we do decide to reinstate these toolbars, we will need to decide on toolbar icons (placeholders are used for the moment).

1 files changed, 33 insertions, 7 deletions

diff --git a/TamTamMini.py b/TamTamMini.py
index 275f46d..47e04fc 100644
--- a/TamTamMini.py
+++ b/TamTamMini.py
@@ -44,6 +44,15 @@ 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
+    HAVE_TOOLBOX = True
+except ImportError:
+    HAVE_TOOLBOX = False
+
+if HAVE_TOOLBOX:
+    from sugar.activity.widgets import ActivityToolbarButton
+    from sugar.activity.widgets import StopButton
 
 
 class TamTamMini(activity.Activity):
@@ -68,19 +77,23 @@ class TamTamMini(activity.Activity):
         self.connect('destroy', self.onDestroy)
 
         #load the sugar toolbar
-        toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(toolbox)
-        self.activity_toolbar = toolbox.get_activity_toolbar()
-        toolbox.show()
+        self.have_toolbox = HAVE_TOOLBOX
+        if self.have_toolbox:
+            self.toolbox = ToolbarBox()
+            activity_button = ActivityToolbarButton(self)
+            self.toolbox.toolbar.insert(activity_button, 0)
+            activity_button.show()
+        else:
+            self.toolbox = activity.ActivityToolbox(self)
+            self.set_toolbox(self.toolbox)
+
+        self.toolbox.show()
 
         self.mini = miniTamTamMain(self)
         self.mini.onActivate(arg=None)
         self.mini.updateInstrumentPanel()
         #self.modeList[mode].regenerate()
 
-        self.activity_toolbar.share.hide()
-        self.activity_toolbar.keep.hide()
-
         self.set_canvas(self.mini)
         self.show()
 
@@ -125,3 +138,16 @@ class TamTamMini(activity.Activity):
     def write_file(self, file_path):
         f = open(file_path, 'w')
         f.close()
+
+    def add_stop_button(self):
+        ''' Add a stop button if using the new toolbars '''
+        if self.have_toolbox:
+            separator = gtk.SeparatorToolItem()
+            separator.props.draw = False
+            separator.set_expand(True)
+            self.toolbox.toolbar.insert(separator, -1)
+            separator.show()
+            stop_button = StopButton(self)
+            stop_button.props.accelerator = '<Ctrl>q'
+            self.toolbox.toolbar.insert(stop_button, -1)
+            stop_button.show()