diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-19 00:24:50 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-19 23:50:57 (GMT) |
| commit | df75dd3b08c5ae87cc0c9d43870a5a73467eeb0f (patch) | |
| tree | 877c8d81c47c71a38b824ca3f73c69edc7b5e783 /TamTamEdit.activity | |
| parent | 9bb74bd2bb85cb5fc51f81b6f28e4291c3cdf286 (diff) | |
add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing
Diffstat (limited to 'TamTamEdit.activity')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 356a4bc..b120f99 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -123,13 +123,13 @@ class MainWindow( gtk.EventBox ): self.GUI["2instrumentPalette"] = instrumentPalette(_('Track 1 Volume'), self) def draw_inst_icons(): - instrumentNames = [ k for k in self.instrumentDB.instNamed.keys() if (k[0:4] != 'drum' and k[0:4] != 'guid') or self.instrumentDB.instNamed[k].kit ] + instruments = [ k for k in self.instrumentDB.inst if not k.kitStage ] self.GUI["2instrumentIcons"] = {} - for instrument in instrumentNames: + for i in instruments: try: - self.GUI["2instrumentIcons"][instrument] = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + instrument + '.png') + self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(i.img) except: - self.GUI["2instrumentIcons"][instrument] = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + 'generic.png') + self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + 'generic.png') TP.ProfileBegin("init_GUI::instrument icons") draw_inst_icons() TP.ProfileEnd("init_GUI::instrument icons") |