diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 23:58:32 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 23:58:32 (GMT) |
| commit | cde4bf13ada67edfd70058898cc32e909f53f629 (patch) | |
| tree | 76f8267693fe96cca993581f12ffbf688e1be6dd /TamTamJam.activity/Jam | |
| parent | 1302c742f38b5f1325b669afe1abe0393101dc17 (diff) | |
| parent | 83d9ad95af8b9e2106d8ccde1c7b03b8a1239f0e (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamJam.activity/Jam')
| -rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 2 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Picker.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index b5a4211..efe9ae6 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -231,7 +231,7 @@ class JamMain(gtk.EventBox): self.pickers[type] = type( self ) def prepareLabel( name ): - label = gtk.Label( _(name) ) + label = gtk.Label( _(name.capitalize()) ) label.set_alignment( 0.0, 0.5 ) label.modify_fg( gtk.STATE_NORMAL, self.colors["Picker_Fg"] ) label.modify_fg( gtk.STATE_ACTIVE, self.colors["Picker_Fg"] ) diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py index 33cdb86..167904c 100644 --- a/TamTamJam.activity/Jam/Picker.py +++ b/TamTamJam.activity/Jam/Picker.py @@ -227,8 +227,9 @@ class Drum( Picker ): self.instrumentDB = InstrumentDB.getRef() - for inst in self.instrumentDB.getSet( "kit" ): - self.addBlock( inst.id ) + for inst in self.instrumentDB.getSet( "percussions" ): + if Config.INSTRUMENTS[inst.name].kit: + self.addBlock( inst.id ) def addBlock( self, id ): # match data structure of Block.Drum |