diff options
| author | amartin <olpc@xo-05-28-21.localdomain> | 2007-08-08 07:04:37 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-05-28-21.localdomain> | 2007-08-08 07:04:37 (GMT) |
| commit | a088e2833750e1b37e839c693ca723e775c3aa29 (patch) | |
| tree | a9b44910319fc9348ddcb3df4ece8287c1adeb78 /SynthLab | |
| parent | fbd47da49acd5d08f6a44e457f1e648769f06d7a (diff) | |
| parent | 1837544663ab6d6b82ae0607b0a1ed503f2fee95 (diff) | |
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'SynthLab')
| -rw-r--r-- | SynthLab/SynthLabToolbars.py | 2 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/SynthLab/SynthLabToolbars.py b/SynthLab/SynthLabToolbars.py index b504795..a040230 100644 --- a/SynthLab/SynthLabToolbars.py +++ b/SynthLab/SynthLabToolbars.py @@ -89,7 +89,7 @@ class mainToolbar(gtk.Toolbar): _insertSeparator(6) - self.resetButton = ToolButton('reset') + self.resetButton = ToolButton('sl-reset') self.resetButton.connect('clicked',self.synthLab.handleReset) self.insert(self.resetButton, -1) self.resetButton.show() diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index 0bf823e..79a4b32 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -123,7 +123,7 @@ class SynthLabWindow(SubActivity): menuBox = gtk.HBox() self.objComboBox = BigComboBox() - self.objComboBox.append_item(0, 'Envelope', Config.TAM_TAM_ROOT + '/icons/adsr-menu.svg') + self.objComboBox.append_item(0, 'Envelope', Config.TAM_TAM_ROOT + '/icons/sl-adsr-menu.svg') self.objComboBox.set_active(0) self.objComboBox.connect('changed', self.changeObject) comboMenu = ToolComboBox(self.objComboBox) @@ -307,7 +307,7 @@ class SynthLabWindow(SubActivity): self.objectType = self.instanceID / 4 self.objComboBox.remove_all() for i in range(len(SynthLabConstants.CHOOSE_TYPE[self.objectType])): - self.objComboBox.append_item(i, SynthLabConstants.SYNTHTYPES[self.objectType][i], Config.TAM_TAM_ROOT + '/icons/' + SynthLabConstants.CHOOSE_TYPE[self.objectType][i] + '-menu.svg') + self.objComboBox.append_item(i, SynthLabConstants.SYNTHTYPES[self.objectType][i], Config.TAM_TAM_ROOT + '/icons/sl-' + SynthLabConstants.CHOOSE_TYPE[self.objectType][i] + '-menu.svg') oldChoosen = self.choosenType if self.instanceID != 12: @@ -446,10 +446,6 @@ class SynthLabWindow(SubActivity): def onKeyPress(self,widget,event): key = event.hardware_keycode - #temporary binding for saving preset - if key == 50: - self.handleSave(None, None) - if key not in Config.KEY_MAP: return midiPitch = Config.KEY_MAP[key] @@ -1190,7 +1186,7 @@ class SynthLabWindow(SubActivity): self.pixmap = [ [], [], [], [] ] def loadImg( type, img ): - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.svg') + pix = gtk.gdk.pixbuf_new_from_file(Config.TAM_TAM_ROOT + '/icons/sl-' + img + '.svg') map = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) map.draw_rectangle( gc, True, 0, 0, pix.get_width(), pix.get_height() ) map.draw_pixbuf( gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) |