From df75dd3b08c5ae87cc0c9d43870a5a73467eeb0f Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 19 Dec 2008 00:24:50 +0000
Subject: add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing

---
(limited to 'TamTamEdit.activity')

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")
--
cgit v0.9.1