diff options
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 10 | ||||
| -rw-r--r-- | TamTamEdit.activity/NEWS | 7 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Picker.py | 12 | ||||
| -rw-r--r-- | TamTamJam.activity/NEWS | 7 | ||||
| -rw-r--r-- | TamTamMini.activity/NEWS | 4 | ||||
| -rw-r--r-- | TamTamSynthLab.activity/NEWS | 4 | ||||
| -rw-r--r-- | common/Util/CSoundClient.py | 1 |
7 files changed, 38 insertions, 7 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 diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py index 167904c..5609e56 100644 --- a/TamTamJam.activity/Jam/Picker.py +++ b/TamTamJam.activity/Jam/Picker.py @@ -34,7 +34,11 @@ class Picker( gtk.HBox ): self.desktop = owner.getDesktop() - self.scrollLeft = gtk.Button( "<" ) + self.scrollLeftImg = gtk.Image() + self.scrollLeftImg.set_from_icon_name('go-left', gtk.ICON_SIZE_BUTTON) + self.scrollLeft = gtk.Button( label = None ) + self.scrollLeft.set_relief(gtk.RELIEF_NONE) + self.scrollLeft.set_image(self.scrollLeftImg) self.scrollLeft.connect( "clicked", self.doScroll, "left" ) self.pack_start( self.scrollLeft, False, False ) @@ -45,7 +49,11 @@ class Picker( gtk.HBox ): self.hadjustment.connect( "changed", self.scrollChanged ) self.hadjustment.connect( "value-changed", self.scrollChanged ) - self.scrollRight = gtk.Button( ">" ) + self.scrollRightImg = gtk.Image() + self.scrollRightImg.set_from_icon_name('go-right', gtk.ICON_SIZE_BUTTON) + self.scrollRight = gtk.Button( label = None ) + self.scrollRight.set_relief(gtk.RELIEF_NONE) + self.scrollRight.set_image(self.scrollRightImg) self.scrollRight.connect( "clicked", self.doScroll, "right" ) self.pack_start( self.scrollRight, False, False ) diff --git a/TamTamJam.activity/NEWS b/TamTamJam.activity/NEWS index 8120a07..4eef95f 100644 --- a/TamTamJam.activity/NEWS +++ b/TamTamJam.activity/NEWS @@ -1,3 +1,10 @@ +40 + +* Proper activity split (Flipo, Olipet) +* Numerous bug fixes (lync) +* Removed extra categories (Olipet, Flipo) +* Added more loops (JM, Olipet) + 39 * New activity : TamTamJam (lync) diff --git a/TamTamMini.activity/NEWS b/TamTamMini.activity/NEWS index 8120a07..21bf4bc 100644 --- a/TamTamMini.activity/NEWS +++ b/TamTamMini.activity/NEWS @@ -1,3 +1,7 @@ +40 + +* Proper activity split (Flipo, Olipet) + 39 * New activity : TamTamJam (lync) diff --git a/TamTamSynthLab.activity/NEWS b/TamTamSynthLab.activity/NEWS index 8120a07..21bf4bc 100644 --- a/TamTamSynthLab.activity/NEWS +++ b/TamTamSynthLab.activity/NEWS @@ -1,3 +1,7 @@ +40 + +* Proper activity split (Flipo, Olipet) + 39 * New activity : TamTamJam (lync) diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py index 5f2e9bf..bdd6e97 100644 --- a/common/Util/CSoundClient.py +++ b/common/Util/CSoundClient.py @@ -140,7 +140,6 @@ class _CSoundClientPlugin: global _loop_default sc_loop_delete(_loop_default) _loop_default = sc_loop_new() - print 'loop cleared' # this is function deletes an Event from a loop # TODO: rename this function |