diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-08-02 22:22:57 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-08-02 22:22:57 (GMT) |
| commit | cf93d08779818c9ea09f2b83705c476df7a05edd (patch) | |
| tree | bde2283aa6a3e21b85abf7cc156658f699b4f401 /SynthLab | |
| parent | a2e02349ba76b2323a4acfd2caa1a872d66244be (diff) | |
synthlab modifs..
Diffstat (limited to 'SynthLab')
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index da2f8fa..f120fa9 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -314,8 +314,10 @@ class SynthLabWindow(SubActivity): self.choosenType = widget.props.value self.resize() self.synthObjectsParameters.setType(self.instanceID, self.choosenType) - self.writeTables( self.synthObjectsParameters.types, self.synthObjectsParameters.controlsParameters, - self.synthObjectsParameters.sourcesParameters, self.synthObjectsParameters.fxsParameters ) + self.writeTables( self.synthObjectsParameters.types, + self.synthObjectsParameters.controlsParameters, + self.synthObjectsParameters.sourcesParameters, + self.synthObjectsParameters.fxsParameters ) self.updateViewer() def updateViewer(self): @@ -529,7 +531,9 @@ class SynthLabWindow(SubActivity): if event.button == 1 or event.button == 3: for i in range(self.objectCount): if self.bounds[i][0] < event.x < self.bounds[i][2] and self.bounds[i][1] < event.y < self.bounds[i][3]: - self.select( i ) + gate = self.testGates( i, event.x-self.locations[i][0], event.y-self.locations[i][1] ) + if not gate: + self.select( i ) if self.action == "drag-object": self.doneAction() @@ -723,7 +727,7 @@ class SynthLabWindow(SubActivity): choosen = SynthLabConstants.CHOOSE_TYPE[obj/4][self.typesTable[obj]] _str = Tooltips.SYNTHTYPES[obj/4][self.typesTable[obj]] + ': ' + Tooltips.SYNTHPARA[choosen][gate[1]] if gate[0] == 1: - if True: + if self.overGateObj == self.instanceID: gateNum = self.overGate[1]+1 exec 'self.slider%s.grab_focus()' % str(gateNum) exec 'self.sendTables(self.slider%s, %d)' % (str(gateNum), gateNum) @@ -1152,7 +1156,10 @@ class SynthLabWindow(SubActivity): elif i < 8: img = SynthLabConstants.CHOOSE_TYPE_PLUS[1][typesList[i]] elif i < 12: img = SynthLabConstants.CHOOSE_TYPE_PLUS[2][typesList[i]] else: img = "speaker" - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.png') + if img == 'speaker': + pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.png') + else: + pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + 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 ) |