diff options
| author | Nat <natcl@hotmail.com> | 2007-09-22 16:13:35 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-09-22 16:13:35 (GMT) |
| commit | de3b12336b5a7ed8fe183fe76dccc240b62e6c9e (patch) | |
| tree | 9994fcada581c1d2fb67e9b6f6fbeabcfbbf0c72 /TamTamEdit.activity | |
| parent | 4754a96b660213b785a09023b4c305fbb24a590d (diff) | |
Instrument palette fix, NEWS files
Diffstat (limited to 'TamTamEdit.activity')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 10 | ||||
| -rw-r--r-- | TamTamEdit.activity/NEWS | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 6921d30..bff9e4d 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -848,7 +848,9 @@ class MainWindow( gtk.EventBox ): def pickInstrument( self, widget, num, primary = True ): self.last_clicked_instTrackID = num self.last_clicked_instPrimary = primary + exec 'self.GUI["2instrument%sPalette"].skip = True' % str(num+1) exec 'self.GUI["2instrument%sPalette"].setCategory("all")' % str(num+1) # Select the first category + exec 'self.GUI["2instrument%sPalette"].skip = False' % str(num+1) if primary or self.trackInstrument2[num] == None: exec 'self.GUI["2instrument%sPalette"].setInstrument(self.trackInstrument[num].name)' % str(num+1) else: @@ -2148,9 +2150,11 @@ class instrumentPalette( Popup ): category = widget.props.value.lower() instruments = self.getInstruments(category) self.loadInstrumentMenu(instruments) - self.skip = True - self.instrumentBox1.set_active(0) - self.skip = False + #self.skip = True + #self.instrumentBox1.set_active(0) + if not self.skip: + self.instrumentBox1.popup() + #self.skip = False def setCategory(self, category): self.categoryBox.set_active(self.categories.index(category.capitalize())) diff --git a/TamTamEdit.activity/NEWS b/TamTamEdit.activity/NEWS index 8120a07..c54561a 100644 --- a/TamTamEdit.activity/NEWS +++ b/TamTamEdit.activity/NEWS @@ -1,8 +1,13 @@ +40 + +* Proper activity split (Flipo, Olipet) +* New instrument picker (Flipo) + 39 * New activity : TamTamJam (lync) * Activities are now separate (TamTamJam, TamTamEdit, TamTamSynthLab) -* No sound when set to language other than english fixed (#3165) (J5, marcopg, tomeu, Flipo) +* No sound when set to language other than english fixed (#3165) (J5, marcopg, tomeu, Flipo, ethrop) 38 |