From 8900ef5f0fcf5005234f25023acdced1a37387de Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Tue, 27 May 2008 04:30:07 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/tamtam

---
(limited to 'TamTamJam.activity')

diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py
index 0d280b2..6c70556 100644
--- a/TamTamJam.activity/Jam/Picker.py
+++ b/TamTamJam.activity/Jam/Picker.py
@@ -168,15 +168,16 @@ class Instrument( Picker ):
         self.type = Instrument
 
         self.instrumentDB = InstrumentDB.getRef()
+        list = [inst for inst in self.instrumentDB.getSet( "All" ) if not inst.name.startswith('lab')]
 
-        for inst in self.instrumentDB.getSet( "All" ):
+        for inst in list:
             self.addBlock( inst.instrumentId )
 
     def addBlock( self, id ):
         # match data structure of Block.Instrument
         data = { "name": _(self.instrumentDB.instId[id].name),
                  "id":   id }
-        
+
         self.csnd.load_instrument(self.instrumentDB.instId[id].name)
 
         win = gtk.gdk.get_default_root_window()
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 5e4ab6c..80598c0 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -412,6 +412,8 @@ class LoopSettingsPalette( Palette ):
         self.GUI['startSlider'].set_inverted(True)
         self.GUI['startSlider'].set_size_request(50, 200)
         self.GUI['startSlider'].set_digits(3)
+        # tooltip closes loop settings palette!!!
+        #self._add_tooltip( self.GUI['startSlider'], _("Loop start position") )
         self.handleStart( self.startAdjust )
         startBox.pack_start(self.GUI['startSlider'], True, True, 5)
         self.controlsBox.pack_start(startBox)
@@ -466,6 +468,15 @@ class LoopSettingsPalette( Palette ):
         self.mainBox.show_all()
         self.set_content(self.mainBox)
 
+    def _add_palette( self, widget, palette ):
+        widget._palette = palette
+        widget._palette.props.invoker = WidgetInvoker( widget )
+        #widget._palette.set_property( "position", position )
+
+    def _add_tooltip( self, widget, tooltip ):
+        #self._add_palette( widget, Palette( tooltip ), Palette.DEFAULT )
+        self._add_palette( widget, Palette( tooltip ) )
+
     def handlePopup(self, widget, data=None):
         self.setButtonState()
         self.soundMenuBox.remove_all()
diff --git a/TamTamJam.activity/MANIFEST b/TamTamJam.activity/MANIFEST
index cc3aafe..35fc76d 100644
--- a/TamTamJam.activity/MANIFEST
+++ b/TamTamJam.activity/MANIFEST
@@ -4,47 +4,58 @@ setup.py
 TamTamJam.py
 activity/activity-tamtamjam.svg
 activity/activity.info
-po/ne.po
+po/TamTamJam.pot
 po/am.po
-po/fa.po
-po/en.po
-po/ca.po
 po/ar.po
-po/ig.po
-po/yo.po
+po/ay.po
+po/bg.po
 po/bn.po
-po/qu.po
-po/pseudo.po
+po/bn_IN.po
+po/ca.po
+po/de.po
+po/dz.po
 po/el.po
-po/ur.po
-po/bg.po
-po/hi.po
-po/fa_AF.po
-po/pt_BR.po
-po/nl.po
-po/te.po
+po/en.po
 po/es.po
-po/mk.po
-po/pl.po
-po/ro.po
-po/bn_IN.po
+po/fa.po
+po/fa_AF.po
+po/ff.po
+po/fr.po
+po/gu.po
+po/ha.po
+po/hi.po
+po/ht.po
+po/ig.po
+po/is.po
+po/it.po
 po/ja.po
-po/dz.po
+po/km.po
+po/ko.po
+po/mk.po
+po/ml.po
+po/mn.po
+po/mr.po
+po/ne.po
+po/nl.po
 po/pa.po
-po/ay.po
-po/TamTamJam.pot
+po/pl.po
 po/ps.po
-po/de.po
-po/ml.po
-po/th.po
-po/rw.po
-po/fr.po
+po/pseudo.po
 po/pt.po
-po/is.po
-po/ff.po
+po/pt_BR.po
+po/qu.po
+po/ro.po
 po/ru.po
-po/ha.po
-po/mn.po
+po/rw.po
+po/si.po
+po/te.po
+po/th.po
+po/tr.po
+po/ur.po
+po/vi.po
+po/yo.po
+po/zh_CN.po
+po/zh_TW.po
 icons/XYBut.svg
 icons/XYButDown.svg
 icons/XYButDownClick.svg
diff --git a/TamTamJam.activity/NEWS b/TamTamJam.activity/NEWS
index ebd096b..fcfb796 100644
--- a/TamTamJam.activity/NEWS
+++ b/TamTamJam.activity/NEWS
@@ -1,5 +1,9 @@
 49
 
+* Removed lab sounds (Olipet)
+* Mic recording and loop settings clean up (Olipet)
+* Jam follows security model (Olipet)
+
 48
 
 * Updated po files (Flipo)
diff --git a/TamTamJam.activity/TamTamJam.py b/TamTamJam.activity/TamTamJam.py
index b52cb10..e0f7381 100644
--- a/TamTamJam.activity/TamTamJam.py
+++ b/TamTamJam.activity/TamTamJam.py
@@ -27,7 +27,7 @@ class TamTamJam(activity.Activity):
 
         activity.Activity.__init__(self, handle)
 
-        for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4', 'lab5', 'lab6']:
+        for snd in ['mic1','mic2','mic3','mic4']:
             if not os.path.isfile(os.path.join(Config.DATA_DIR, snd)):
                 shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , Config.DATA_DIR + '/' + snd)
                 os.system('chmod 0777 ' + Config.DATA_DIR + '/' + snd + ' &')
--
cgit v0.9.1