diff options
| author | Nat <natcl@hotmail.com> | 2007-09-21 17:20:35 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-09-21 17:20:35 (GMT) |
| commit | 22e0bd27a21ed209598a95adcc8e0431e2af5137 (patch) | |
| tree | 1d32aea44aa13b23d2b22b365c12ec70f4f63afc /TamTamEdit.activity/Edit/MainWindow.py | |
| parent | 55e7449505a05638d88365101b7a8c92f3be8883 (diff) | |
More categories stuff
Diffstat (limited to 'TamTamEdit.activity/Edit/MainWindow.py')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index ad05a16..6921d30 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -111,7 +111,7 @@ class MainWindow( gtk.EventBox ): self.GUI["2main"] = gtk.VBox() def draw_inst_icons(): - instrumentNames = [ k for k in Config.INSTRUMENTS.keys() if (k[0:4] != 'drum' and k[0:4] != 'guid') or Config.INSTRUMENTS[k].category == "kit" ] + instrumentNames = [ k for k in Config.INSTRUMENTS.keys() if (k[0:4] != 'drum' and k[0:4] != 'guid') or Config.INSTRUMENTS[k].kit ] self.GUI["2instrumentIcons"] = {} for instrument in instrumentNames: try: @@ -2112,12 +2112,12 @@ class instrumentPalette( Popup ): self.volumeSlider.set_inverted(False) self.volumeSlider.set_draw_value(False) - self.categories = Config.CATEGORIES + self.categories = [cat.capitalize() for cat in Config.CATEGORIES] self.instruments = self.getInstruments() self.categoryBox = BigComboBox() for category in self.categories: - image = Config.IMAGE_ROOT + category + '.png' + image = Config.IMAGE_ROOT + category.lower() + '.png' if not os.path.isfile(image): image = Config.IMAGE_ROOT + 'generic.png' self.categoryBox.append_item(category, category, icon_name = image, size = instrumentPalette.ICON_SIZE) @@ -2145,7 +2145,7 @@ class instrumentPalette( Popup ): self.popdown(True) def handleCategoryChange(self, widget): - category = widget.props.value + category = widget.props.value.lower() instruments = self.getInstruments(category) self.loadInstrumentMenu(instruments) self.skip = True @@ -2153,7 +2153,7 @@ class instrumentPalette( Popup ): self.skip = False def setCategory(self, category): - self.categoryBox.set_active(self.categories.index(category)) + self.categoryBox.set_active(self.categories.index(category.capitalize())) def setInstrument(self, instrument): self.skip = True @@ -2244,6 +2244,6 @@ class drumPalette( Popup ): self.drumBox.append_item(instrument, text = None, icon_name = image, size = instrumentPalette.ICON_SIZE) def getDrums(self): - return sorted([instrument for instrument in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[instrument].category == 'kit']) + return sorted([instrument for instrument in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[instrument].kit]) |