Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolipet <olpc@localhost.localdomain>2007-01-09 21:54:57 (GMT)
committer olipet <olpc@localhost.localdomain>2007-01-09 21:54:57 (GMT)
commit34dcffe2fd53078dc6d9d86e01653da5045918c4 (patch)
treef181b13a2321aaf1caccf38288a5934b1067ad89
parent2fa85b2c224f2c73c98e096a985e21cfa3d9d2a8 (diff)
improved display of SynthLab parameters
-rw-r--r--Resources/univorc.csd6
-rw-r--r--SynthLab/Parameter.py12
-rw-r--r--SynthLab/SynthLabParametersWindow.py23
3 files changed, 28 insertions, 13 deletions
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index 5c456ff..4463c55 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -360,8 +360,10 @@ gkduck port gkduck, .03, 1.
ain dcblock gainrev*0.05
arev reverb ain, 2.5
arev butterlp arev, 5000
-
- outs (arev + gaoutL)*koutGain*gkduck, (arev + gaoutR) * koutGain*gkduck
+
+aLeft butterlp gaoutL, 7500
+aRight butterlp gaoutR, 7500
+ outs (arev + aLeft)*koutGain*gkduck, (arev + aRight) * koutGain*gkduck
gaoutL = 0
gaoutR = 0
diff --git a/SynthLab/Parameter.py b/SynthLab/Parameter.py
index 70c6c3b..bf158b0 100644
--- a/SynthLab/Parameter.py
+++ b/SynthLab/Parameter.py
@@ -8,12 +8,16 @@ from Util.ThemeWidgets import *
Tooltips = Config.Tooltips
class Parameter( gtk.Window ):
- def __init__( self, X, Y, string ):
+ def __init__( self, string ):
gtk.Window.__init__( self, gtk.WINDOW_TOPLEVEL )
self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
- self.move(550, 250)
+ color = gtk.gdk.color_parse(Config.INST_BCK_COLOR)
+ self.modify_bg(gtk.STATE_NORMAL, color)
+ self.move(15, 660)
+ self.set_size_request(450, 40)
+# self.move(500, 50)
self.set_decorated(False)
- mainBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
+ mainBox = RoundHBox(fillcolor=Config.INST_BCK_COLOR, bordercolor=Config.INST_BCK_COLOR)
mainBox.set_border_width(4)
mainBox.set_radius(10)
self.text = gtk.Label(string)
@@ -21,5 +25,5 @@ class Parameter( gtk.Window ):
self.add(mainBox)
self.show_all()
- def update( self, X, Y, string ):
+ def update( self, string ):
self.text.set_text(string)
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index 3581d87..51695c7 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -1,7 +1,7 @@
import pygtk
pygtk.require('2.0')
import gtk
-
+import gobject
import Config
from Util.ThemeWidgets import *
from SynthLab.SynthLabConstants import SynthLabConstants
@@ -34,7 +34,7 @@ class SynthLabParametersWindow( gtk.Window ):
self.playNoteFunction = playNoteFunction
self.playingPitch = []
self.parameterOpen = 0
-
+ self.clockStart = 0
self.slider1Val = ''
self.slider2Val = ''
self.slider3Val = ''
@@ -177,19 +177,28 @@ class SynthLabParametersWindow( gtk.Window ):
self.tooltipsUpdate()
def showParameter( self, widget, value=None, data=None ):
- self.parameter = Parameter(50, 50, self.recallSliderValue(data))
- self.parameterOpen = 1
+ if not self.parameterOpen:
+ self.parameter = Parameter(self.recallSliderValue(data))
+ self.parameterOpen = 1
def hideParameter( self, widget, data=None ):
- self.parameter.hide()
- self.parameterOpen = 0
+ if self.parameterOpen and not self.clockStart:
+ self.windowCloseDelay = gobject.timeout_add(500, self.closeParameterWindow)
+ self.clockStart = 1
self.tooltipsUpdate()
if self.instanceID != 12:
self.writeTables( self.synthObjectsParameters.types, self.synthObjectsParameters.controlsParameters, self.synthObjectsParameters.sourcesParameters, self.synthObjectsParameters.fxsParameters )
+ def closeParameterWindow( self ):
+ if self.parameterOpen:
+ self.parameter.hide()
+ self.parameterOpen = 0
+ gobject.source_remove( self.windowCloseDelay )
+ self.clockStart = 0
+ return True
def parameterUpdate( self, data ):
if self.parameterOpen:
- self.parameter.update(50, 50, self.recallSliderValue(data))
+ self.parameter.update(self.recallSliderValue(data))
def tooltipsUpdate( self ):
selectedType = SynthLabConstants.CHOOSE_TYPE[self.objectType][self.choosenType]