Toolbars

2 files changed, 78 insertions, 6 deletions

diff --git a/SynthLab/SynthLabToolbars.py b/SynthLab/SynthLabToolbars.py
index 48a565b..5e521b2 100644
--- a/SynthLab/SynthLabToolbars.py
+++ b/SynthLab/SynthLabToolbars.py
@@ -75,6 +75,19 @@ class mainToolbar(gtk.Toolbar):
         self.synthRec6Button.show()
         self.synthRec6Button.set_tooltip(_('Record Synth sound into slot 6'))
         
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
+        
+        self.resetButton = ToolButton('reset')
+        self.resetButton.connect('clicked',self.synthLab.handleReset)
+        self.insert(self.resetButton, -1)
+        self.resetButton.show()
+        self.resetButton.set_tooltip(_('Reset the worktable'))
+        
 class presetToolbar(gtk.Toolbar):
     def __init__(self,toolbox, synthLab):
         gtk.Toolbar.__init__(self)
@@ -88,9 +101,68 @@ class presetToolbar(gtk.Toolbar):
         self.toolbox = toolbox
         self.synthLab = synthLab
         
-        self.preset1Button = ToggleToolButton('preset1')
-        self.preset1Button.connect('clicked',self.synthLab.recordSound,1)
+        self.preset1Button = RadioToolButton('preset1', group = None)
+        self.preset1Button.connect('clicked',self.synthLab.presetCallback,1)
         self.insert(self.preset1Button, -1)
         self.preset1Button.show()
-        self.preset1Button.set_tooltip(_('Record Synth sound into slot 1'))
+        self.preset1Button.set_tooltip(_('Preset 1'))
+        
+        self.preset2Button = RadioToolButton('preset2', group = self.preset1Button)
+        self.preset2Button.connect('clicked',self.synthLab.presetCallback,2)
+        self.insert(self.preset2Button, -1)
+        self.preset2Button.show()
+        self.preset2Button.set_tooltip(_('Preset 2'))
+        
+        self.preset3Button = RadioToolButton('preset3', group = self.preset1Button)
+        self.preset3Button.connect('clicked',self.synthLab.presetCallback,3)
+        self.insert(self.preset3Button, -1)
+        self.preset3Button.show()
+        self.preset3Button.set_tooltip(_('Preset 3'))
+        
+        self.preset4Button = RadioToolButton('preset4', group = self.preset1Button)
+        self.preset4Button.connect('clicked',self.synthLab.presetCallback,4)
+        self.insert(self.preset4Button, -1)
+        self.preset4Button.show()
+        self.preset4Button.set_tooltip(_('Preset 4'))
+        
+        self.preset4Button = RadioToolButton('preset4', group = self.preset1Button)
+        self.preset4Button.connect('clicked',self.synthLab.presetCallback,4)
+        self.insert(self.preset4Button, -1)
+        self.preset4Button.show()
+        self.preset4Button.set_tooltip(_('Preset 4'))
+        
+        self.preset5Button = RadioToolButton('preset5', group = self.preset1Button)
+        self.preset5Button.connect('clicked',self.synthLab.presetCallback,5)
+        self.insert(self.preset5Button, -1)
+        self.preset5Button.show()
+        self.preset5Button.set_tooltip(_('Preset 5'))
+        
+        self.preset6Button = RadioToolButton('preset6', group = self.preset1Button)
+        self.preset6Button.connect('clicked',self.synthLab.presetCallback,6)
+        self.insert(self.preset6Button, -1)
+        self.preset6Button.show()
+        self.preset6Button.set_tooltip(_('Preset 6'))
+        
+        self.preset7Button = RadioToolButton('preset7', group = self.preset1Button)
+        self.preset7Button.connect('clicked',self.synthLab.presetCallback,7)
+        self.insert(self.preset7Button, -1)
+        self.preset7Button.show()
+        self.preset7Button.set_tooltip(_('Preset 7'))
+        
+        self.preset8Button = RadioToolButton('preset8', group = self.preset1Button)
+        self.preset8Button.connect('clicked',self.synthLab.presetCallback,8)
+        self.insert(self.preset8Button, -1)
+        self.preset8Button.show()
+        self.preset8Button.set_tooltip(_('Preset 8'))
+        
+        self.preset9Button = RadioToolButton('preset9', group = self.preset1Button)
+        self.preset9Button.connect('clicked',self.synthLab.presetCallback,9)
+        self.insert(self.preset9Button, -1)
+        self.preset9Button.show()
+        self.preset9Button.set_tooltip(_('Preset 9'))
         
+        self.preset10Button = RadioToolButton('preset10', group = self.preset1Button)
+        self.preset10Button.connect('clicked',self.synthLab.presetCallback,10)
+        self.insert(self.preset10Button, -1)
+        self.preset10Button.show()
+        self.preset10Button.set_tooltip(_('Preset 10'))
\ No newline at end of file
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index 453e6e8..2896d82 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -210,7 +210,7 @@ class SynthLabWindow(SubActivity):
         if tempFile in os.listdir(Config.PREF_DIR):
             self.handleLoadTemp()
         else:
-            self.presetCallback(self.presets,0)
+            self.presetCallback(self.presets,1)
  
         self.show_all()
  
@@ -303,7 +303,7 @@ class SynthLabWindow(SubActivity):
         # deep copy the list
         self.locations = [ loc[:] for loc in SynthLabConstants.INIT_LOCATIONS ]
 
-    def handleReset( self, widget, data ):
+    def handleReset( self, widget, data = None):
         self.resetLocations()
         self.objectCount = len(self.locations)
         for i in range(self.objectCount):
@@ -1128,7 +1128,7 @@ class SynthLabWindow(SubActivity):
         self.invalidate_rect( 0, 0, self.drawingAreaWidth, self.drawingAreaHeight )
 
     def presetCallback( self, widget, data ):
-        preset = 'synthFile' + str(data+1)
+        preset = 'synthFile' + str(data)
         f = shelve.open( Config.TAM_TAM_ROOT + '/Resources/SynthFiles/' + preset, 'r')
         self.loadState(f)
         f.close()