From 20bf81d221e56080997d8cf60ee8d24b21ed127a Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Thu, 24 Jan 2013 21:08:16 +0000
Subject: Fix TamTamJam Toolbars

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/Jam/JamMain.py b/Jam/JamMain.py
index 57ab2a9..99b5059 100644
--- a/Jam/JamMain.py
+++ b/Jam/JamMain.py
@@ -246,7 +246,7 @@ class JamMain(Gtk.EventBox):
                                            icon_name='voltemp')
         self.jamToolbar.show()
         jam_toolbar_button.show()
-        self.activity.toolbox.toolbar.insert(jam_toolbar_button, -1)
+        self.activity.toolbar_box.toolbar.insert(jam_toolbar_button, -1)
 
         self.beatToolbar = BeatToolbar(self)
         beat_toolbar_button = ToolbarButton(label=_('Beat'),
@@ -254,7 +254,7 @@ class JamMain(Gtk.EventBox):
                                                 icon_name='heart')
         self.beatToolbar.show()
         beat_toolbar_button.show()
-        self.activity.toolbox.toolbar.insert(beat_toolbar_button, -1)
+        self.activity.toolbar_box.toolbar.insert(beat_toolbar_button, -1)
 
         self.desktopToolbar = DesktopToolbar(self)
         desktop_toolbar_button = ToolbarButton(label=_('Desktop'),
@@ -262,7 +262,7 @@ class JamMain(Gtk.EventBox):
                                               icon_name='jam-presets-list')
         self.desktopToolbar.show()
         desktop_toolbar_button.show()
-        self.activity.toolbox.toolbar.insert(desktop_toolbar_button, -1)
+        self.activity.toolbar_box.toolbar.insert(desktop_toolbar_button, -1)
 
         if Config.FEATURES_MIC or Config.FEATURES_NEWSOUNDS:
             self.recordToolbar = RecordToolbar(self)
@@ -271,15 +271,15 @@ class JamMain(Gtk.EventBox):
                                                   icon_name='microphone')
             self.recordToolbar.show()
             record_toolbar_button.show()
-            self.activity.toolbox.toolbar.insert(record_toolbar_button, -1)
+            self.activity.toolbar_box.toolbar.insert(record_toolbar_button, -1)
 
         separator = Gtk.SeparatorToolItem()
         separator.props.draw = True
         separator.set_expand(False)
-        self.activity.toolbox.toolbar.insert(separator, -1)
+        self.activity.toolbar_box.toolbar.insert(separator, -1)
         separator.show()
 
-        common_playback_buttons(self.activity.toolbox.toolbar, self)
+        common_playback_buttons(self.activity.toolbar_box.toolbar, self)
 
         #-- GUI -----------------------------------------------
         if True:  # GUI
@@ -421,8 +421,7 @@ class JamMain(Gtk.EventBox):
         #-- Final Set Up --------------------------------------
         self.setVolume(self.volume)
         self.setTempo(self.tempo)
-        if not Config.HAVE_TOOLBOX:
-            self.activity.toolbox.set_current_toolbar(1)  # JamToolbar
+        #self.activity.toolbar_box.set_current_toolbar(1)  # JamToolbar
         self.setDesktop(0, True)
 
     #==========================================================
diff --git a/Jam/Toolbars.py b/Jam/Toolbars.py
index 9889478..e3e900e 100644
--- a/Jam/Toolbars.py
+++ b/Jam/Toolbars.py
@@ -98,7 +98,8 @@ class JamToolbar(Gtk.Toolbar):
     def handleVolume(self, widget):
         self.owner._setVolume(widget.get_value())
 
-        img = self.mapRange(widget.value, widget.lower, widget.upper, 0, 3)
+        img = self.mapRange(widget.get_value(), widget.get_lower(),
+                widget.get_upper(), 0, 3)
         self.volumeImg.set_from_file(Config.TAM_TAM_ROOT + '/icons/volume' + \
                                          str(img) + '.svg')
 
@@ -122,8 +123,8 @@ class JamToolbar(Gtk.Toolbar):
     def _updateTempo(self, tempo):
         self.owner._setTempo(tempo)
 
-        img = self.mapRange(tempo, self.tempoAdjustment.lower,
-                            self.tempoAdjustment.upper, 1, 8)
+        img = self.mapRange(tempo, self.tempoAdjustment.get_lower(),
+                            self.tempoAdjustment.get_upper(), 1, 8)
         self.tempoImg.set_from_file(Config.TAM_TAM_ROOT + '/icons/tempo' + \
                                         str(img) + '.svg')
 
diff --git a/TamTamJam.py b/TamTamJam.py
index ab34bdc..7d53df6 100644
--- a/TamTamJam.py
+++ b/TamTamJam.py
@@ -70,36 +70,30 @@ class TamTamJam(activity.Activity):
         self.connect('notify::active', self.onActive)
         self.connect('destroy', self.onDestroy)
 
-        #load the sugar toolbar
-        if Config.HAVE_TOOLBOX:
-            self.toolbox = ToolbarBox()
-            self.toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1)
-            self.toolbox.toolbar.insert(Gtk.SeparatorToolItem(), -1)
-        else:
-            self.toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(self.toolbox)
-
-        self.toolbox.show()
+        toolbox = ToolbarBox()
+        toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1)
+        toolbox.toolbar.insert(Gtk.SeparatorToolItem(), -1)
 
         self.trackpad.setContext('jam')
+
+        self.set_toolbar_box(toolbox)
+
         self.jam = JamMain(self)
         self.connect('key-press-event', self.jam.onKeyPress)
         self.connect('key-release-event', self.jam.onKeyRelease)
         #self.modeList[mode].regenerate()
-
-        self.set_canvas(self.jam)
-
         self.jam.onActivate(arg=None)
 
-        if Config.HAVE_TOOLBOX:
-            separator = Gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            self.toolbox.toolbar.insert(separator, -1)
-            self.toolbox.toolbar.insert(widgets.StopButton(self), -1)
-            self.toolbox.toolbar.show_all()
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbox.toolbar.insert(separator, -1)
+        toolbox.toolbar.insert(widgets.StopButton(self), -1)
+
+        toolbox.toolbar.show_all()
+        self.set_canvas(self.jam)
 
-        self.show()
+        self.show_all()
 
     def onPreloadTimeout(self):
         if Config.DEBUG > 4: 
--
cgit v0.9.1