diff options
| author | Oli <olpc@localhost.localdomain> | 2007-02-20 04:06:01 (GMT) |
|---|---|---|
| committer | Oli <olpc@localhost.localdomain> | 2007-02-20 04:06:01 (GMT) |
| commit | 9cb3c1da375b29a180fde030309c5ff472fb8810 (patch) | |
| tree | fc7b886e814ef1ed83b3c26ee3de65ba52d8366f /SynthLab | |
| parent | ed2ba751a970cbbed4d97b3adafe41909d986b0d (diff) | |
| parent | 7500163da85140a8b0e93f8bf1dd8845d2029240 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'SynthLab')
| -rw-r--r-- | SynthLab/SynthLabParametersWindow.py | 2 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py index 499ffcb..45aff9f 100644 --- a/SynthLab/SynthLabParametersWindow.py +++ b/SynthLab/SynthLabParametersWindow.py @@ -129,7 +129,7 @@ class SynthLabParametersWindow( gtk.Window ): self.mainBox.pack_start(self.sliderBox) - closeButton = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/close.png' ) + closeButton = ImageButton(Config.IMAGE_ROOT + 'close.png' ) closeButton.connect('clicked', self.destroy ) self.mainBox.pack_start(closeButton) diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index c1ddbe5..398e135 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -11,7 +11,7 @@ import os import Config from Util.ThemeWidgets import * -from Util.CSoundClient import CSoundClient +from Util.CSoundClient import new_csound_client from SynthLab.SynthLabParametersWindow import SynthLabParametersWindow from SynthLab.SynthObjectsParameters import SynthObjectsParameters from SynthLab.SynthLabConstants import SynthLabConstants @@ -20,13 +20,13 @@ from Util.Trackpad import Trackpad Tooltips = Config.Tooltips class SynthLabWindow( gtk.Window ): - def __init__( self, client, table, closeCallback ): + def __init__( self, table, closeCallback ): gtk.Window.__init__( self, gtk.WINDOW_TOPLEVEL ) color = gtk.gdk.color_parse(Config.PANEL_BCK_COLOR) self.modify_bg(gtk.STATE_NORMAL, color) self.set_border_width(Config.MAIN_WINDOW_PADDING) self.set_keep_above(False) - self.csnd = client + self.csnd = new_csound_client() self.trackpad = Trackpad( self, self.csnd ) self.table = table self.closeCallback = closeCallback @@ -149,11 +149,11 @@ class SynthLabWindow( gtk.Window ): self.sliderBox.pack_start(self.durationSlider, True, True, 5) self.sliderBox.pack_start(self.durLabel, False, padding=10) - saveButton = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/save.png') + saveButton = ImageButton(Config.IMAGE_ROOT + 'save.png') saveButton.connect("clicked", self.handleSave, None) self.buttonBox.pack_start(saveButton, False, False, 2) - loadButton = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/load.png') + loadButton = ImageButton(Config.IMAGE_ROOT + 'load.png') loadButton.connect("clicked", self.handleLoad, None) self.buttonBox.pack_start(loadButton, False, False, 2) @@ -161,11 +161,11 @@ class SynthLabWindow( gtk.Window ): self.recordButton.connect("clicked", self.recordSound) self.buttonBox.pack_start(self.recordButton, False, False, 2) - resetButton = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/reset.png') + resetButton = ImageButton(Config.IMAGE_ROOT + 'reset.png') resetButton.connect("clicked", self.handleReset, None) self.buttonBox.pack_start(resetButton, False, False, 2) - closeButton = ImageButton(Config.TAM_TAM_ROOT + '/Resources/Images/close.png') + closeButton = ImageButton(Config.IMAGE_ROOT + 'close.png') closeButton.connect("clicked", self.handleClose, None) self.buttonBox.pack_start(closeButton, False, False, 2) |