diff options
author | Oli <olivier.belanger@umontreal.ca> | 2008-05-23 15:15:58 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2008-05-23 15:15:58 (GMT) |
commit | 1f827299ad820c1ca6f7ea6cde29cb702f89ad7e (patch) | |
tree | ce8a1663a5a099d3598ca78d1f370eff0facffa3 /TamTamJam.activity | |
parent | 4fddb1ff0ada13fd31ddad5e2ae61dcd192664fc (diff) |
security model, cleanup, SynthLab to OGG
Diffstat (limited to 'TamTamJam.activity')
-rw-r--r-- | TamTamJam.activity/Jam/Picker.py | 5 | ||||
-rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 11 | ||||
-rw-r--r-- | TamTamJam.activity/NEWS | 4 | ||||
-rw-r--r-- | TamTamJam.activity/TamTamJam.py | 2 |
4 files changed, 19 insertions, 3 deletions
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/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 + ' &') |