Merge branch 'master' of git.sugarlabs.org:tamtam/tamtam

9 files changed, 8 insertions, 14 deletions

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 237aae0..55fec79 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -309,8 +309,7 @@ class MainWindow(Gtk.EventBox):
             # set tooltips
             for key in self.GUI:
                 if Tooltips.Edit.has_key(key):
-                    pass
-                    #self.tooltips.set_tip(self.GUI[key],Tooltips.Edit[key])
+                    self.GUI[key].set_tooltip_text(Tooltips.Edit[key])
 
             self.add( self.GUI["2main"] )
 
@@ -2205,8 +2204,6 @@ class instrumentPalette(Popup):
         self.skipVolAdj = False
         self.lastClickedTrack = None
 
-        #self.tooltips = gtk.Tooltips()
-
         self.mainBox = Gtk.VBox()
         self.volumeBox = Gtk.HBox()
         self.instrumentMainBox = Gtk.HBox()
@@ -2216,13 +2213,12 @@ class instrumentPalette(Popup):
         self.muteButton = Gtk.CheckButton()
         self.muteButton.connect("toggled",self.handlemuteButton)
         self.muteButton.set_active(True)
-        #self.tooltips.set_tip(self.muteButton, _('Mute track'))
-
+        self.muteButton.set_tooltip_text(_('Mute track'))
         self.soloButtonLabel = Gtk.Label(_('S'))
         self.soloButton = Gtk.CheckButton()
         self.soloButton.connect("toggled",self.handlesoloButton)
         self.soloButton.set_active(True)
-        #self.tooltips.set_tip(self.soloButton, _('Solo track'))
+        self.soloButton.set_tooltip_text(_('Solo track'))
 
         self.volumeSliderAdj = Gtk.Adjustment( self.edit._data["track_volume"][0], 0, 100, 1, 1, 0 )
         self.volumeSliderAdj.connect( "value-changed", self.handleTrackVolume)
@@ -2344,7 +2340,7 @@ class drumPalette(Popup):
         self.muteButton.connect("toggled",self.edit.handlemuteButton, self.trackID)
         self.muteButton.connect("button-press-event",self.edit.handlemuteButtonRightClick, self.trackID)
         self.muteButton.set_active(True)
-        #self.tooltips.set_tip(self.muteButton, _('Left click to mute, right click to solo'))
+        self.muteButton.set_tooltip_text( _('Left click to mute, right click to solo'))
 
         if self.trackID < 4:
             exec "self.volumeSliderAdj = self.edit.GUI['2instrument%svolumeAdjustment']" % str(self.trackID+1)
diff --git a/Edit/Properties.py b/Edit/Properties.py
index b6baf9d..c018847 100644
--- a/Edit/Properties.py
+++ b/Edit/Properties.py
@@ -14,7 +14,6 @@ Tooltips = Config.Tooltips()
 class Properties( gtk.VBox ):
     def __init__( self, noteDB, doneHandler, popup ):
         gtk.VBox.__init__( self )
-        self.tooltips = gtk.Tooltips()
         self.noteDB = noteDB
         #self.doneHandler = doneHandler
         self.popup = popup
@@ -380,9 +379,8 @@ class Properties( gtk.VBox ):
         # set tooltips
         for key in self.GUI:
             if Tooltips.PROP.has_key(key):
-                self.tooltips.set_tip(self.GUI[key],Tooltips.PROP[key])
-        self.tooltips.set_tip(self.GUI['paraSlider'], 'Random')
-                
+                self.GUI[key].set_tooltip_text(Tooltips.PROP[key])
+        self.GUI['paraSlider'].set_tooltip_text('Random')
 
         self.show_all()
 
@@ -819,7 +817,7 @@ class Properties( gtk.VBox ):
     def handleAlgo( self, widget, data ):
         self.algorithm = self.algoTypes[data]
         paraTooltips = ['Random', 'Maximum step', 'Maximum step', 'Maximum step', 'Maximum step']
-        self.tooltips.set_tip(self.GUI['paraSlider'], paraTooltips[data])
+        self.GUI['paraSlider'].set_tooltip_text(paraTooltips[data])
         
     def handleMin( self, adjust ):
         self.minValue = adjust.value
diff --git a/activity/activity.info b/activity/activity.info
index 2a1903a..18a7d4f 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -12,7 +12,7 @@ description = TamTam is a suite of four music and sound related activities
 homepage  = http://wiki.sugarlabs.org/go/Activities/TamTam
 license   = GPLv2+
 
-version   = 67
+version   = 66
 stability = stable
 
 icon      = %(component_name)s
diff --git a/common/Util/Clooper/linux32_511_deb/__init__.py b/common/Util/Clooper/linux32_511_deb/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/common/Util/Clooper/linux32_511_deb/__init__.py
+++ /dev/null
diff --git a/common/Util/Clooper/linux32_511_deb/aclient.so b/common/Util/Clooper/linux32_511_deb/aclient.so
deleted file mode 100755
index e9d88c3..0000000
--- a/common/Util/Clooper/linux32_511_deb/aclient.so
+++ /dev/null
diff --git a/common/Util/Clooper/linux64_510/__init__.py b/common/Util/Clooper/linux64_510/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/common/Util/Clooper/linux64_510/__init__.py
+++ /dev/null
diff --git a/common/Util/Clooper/linux64_510/aclient.so b/common/Util/Clooper/linux64_510/aclient.so
deleted file mode 100755
index efc82c4..0000000
--- a/common/Util/Clooper/linux64_510/aclient.so
+++ /dev/null
diff --git a/common/Util/Clooper/linux64_511_deb/__init__.py b/common/Util/Clooper/linux64_511_deb/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/common/Util/Clooper/linux64_511_deb/__init__.py
+++ /dev/null
diff --git a/common/Util/Clooper/linux64_511_deb/aclient.so b/common/Util/Clooper/linux64_511_deb/aclient.so
deleted file mode 100755
index 0bfa7e4..0000000
--- a/common/Util/Clooper/linux64_511_deb/aclient.so
+++ /dev/null