diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-24 05:30:48 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-24 05:30:48 (GMT) |
| commit | 64ebdb2816d5e70873e717ce028689a100635daa (patch) | |
| tree | b89da0c28d36fedb6e83cb8edc69f313c2c15ffc /TamTamEdit.activity/Edit/MainWindow.py | |
| parent | 1a3140d1dd8df2db367fd5142c8a586583268835 (diff) | |
| parent | 9d40d71e089f6db35c8aee0aa51f3f3b1e4ce87f (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamEdit.activity/Edit/MainWindow.py')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 4ccb7d5..520c50f 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())) |