diff options
Diffstat (limited to 'TamTamJam.activity/Jam')
| -rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 7 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Picker.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index 76c3b65..2798d4c 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -30,6 +30,7 @@ from common.Util.NoteDB import Note, Page from common.Util import ControlStream from common.Util import OS +from common.Tooltips import Tooltips import xdrlib import time @@ -240,14 +241,14 @@ class JamMain(gtk.EventBox): self.pickers[type] = type( self ) def prepareLabel( name ): - label = gtk.Label( _(name.capitalize()) ) + label = gtk.Label(Tooltips.categories.get(name) or name) 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"] ) return label - self.GUI["notebook"].append_page( self.pickers[Picker.Drum], prepareLabel("Drum Kits") ) - self.GUI["notebook"].append_page( self.pickers[Picker.Loop], prepareLabel("Loops") ) + self.GUI["notebook"].append_page( self.pickers[Picker.Drum], prepareLabel(_("Drum Kits")) ) + self.GUI["notebook"].append_page( self.pickers[Picker.Loop], prepareLabel(_("Loops")) ) sets = self.instrumentDB.getLabels()[:] sets.sort() diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py index ea10175..f1030bf 100644 --- a/TamTamJam.activity/Jam/Picker.py +++ b/TamTamJam.activity/Jam/Picker.py @@ -142,7 +142,7 @@ class Instrument( Picker ): def addBlock( self, id ): # match data structure of Block.Instrument - data = { "name": _(self.instrumentDB.instId[id].name), + data = { "name": self.instrumentDB.instId[id].nameTooltip, "id": id } win = gtk.gdk.get_default_root_window() @@ -210,7 +210,7 @@ class Drum( Picker ): def addBlock( self, id ): # match data structure of Block.Drum - data = { "name": _(self.instrumentDB.instId[id].name), + data = { "name": self.instrumentDB.instId[id].nameTooltip, "id": id } win = gtk.gdk.get_default_root_window() @@ -302,7 +302,7 @@ class Loop( Picker ): def addBlock( self, id, name ): # match data structure of Block.Loop - data = { "name": _(name), + data = { "name": _('Loop'), "id": id } self.owner.updateLoopImage( data["id"] ) |