Details

4 files changed, 38 insertions, 46 deletions

diff --git a/Config.py b/Config.py
index 254ca6b..b71598b 100644
--- a/Config.py
+++ b/Config.py
@@ -414,7 +414,7 @@ THUMBNAIL_DISPLAYED_COLOR = "#CC1133"
 ### miniTamTam/SYNTHLAB SPECIFIC ###
 INST_BCK_COLOR = '#999999'
 PANEL_BCK_COLOR =  '#CCCCCC'
-PANEL_COLOR = '#999999'
+PANEL_COLOR = '#CCCCCC'
 SL_LINE_COLOR = "#666666"
 SL_OVER_WIRE_COLOR = "#FFFFFF"
 SL_OVER_GATE_COLOR = "#00FF18"
diff --git a/SynthLab/SynthLabToolbars.py b/SynthLab/SynthLabToolbars.py
index aa97e5a..ab4baf4 100644
--- a/SynthLab/SynthLabToolbars.py
+++ b/SynthLab/SynthLabToolbars.py
@@ -12,11 +12,12 @@ class mainToolbar(gtk.Toolbar):
     def __init__(self,toolbox, synthLab):
         gtk.Toolbar.__init__(self)
         
-        def _insertSeparator():
-            self.separator = gtk.SeparatorToolItem()
-            self.separator.set_draw(True)
-            self.insert(self.separator,-1)
-            self.separator.show()        
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()        
             
         self.toolbox = toolbox
         self.synthLab = synthLab
@@ -36,8 +37,7 @@ class mainToolbar(gtk.Toolbar):
         self.durationSliderTool.show()
         self.durationSliderTool.set_tooltip(self.tooltips, _('Duration'))
         
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(2)
         
         self.synthRec1Button = ToggleToolButton('rec1')
         self.synthRec1Button.connect('clicked',self.synthLab.recordSound,1)
@@ -75,12 +75,7 @@ class mainToolbar(gtk.Toolbar):
         self.synthRec6Button.show()
         self.synthRec6Button.set_tooltip(_('Record Synth sound into slot 6'))
         
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(9)
         
         self.resetButton = ToolButton('reset')
         self.resetButton.connect('clicked',self.synthLab.handleReset)
@@ -92,11 +87,12 @@ class presetToolbar(gtk.Toolbar):
     def __init__(self,toolbox, synthLab):
         gtk.Toolbar.__init__(self)
         
-        def _insertSeparator():
-            self.separator = gtk.SeparatorToolItem()
-            self.separator.set_draw(True)
-            self.insert(self.separator,-1)
-            self.separator.show()        
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()          
             
         self.toolbox = toolbox
         self.synthLab = synthLab
diff --git a/icons/reset.svg b/icons/reset.svg
index 2c553a1..27e7b19 100644
--- a/icons/reset.svg
+++ b/icons/reset.svg
@@ -3,8 +3,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

 	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">

-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="33.865,41.531 11.531,41.198 7.323,9.323 38.448,9.323 "/>

-<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M7.323,7.198c22.004-2.468,25.334-2.75,29.459-3.5s-9.667-3.25-13.959-2.75

-	c-2.002,0.233-9,1.375-14.125,4.875"/>

-<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M17.698,0.531l7.334-1.333c0,0-3.667-1.917-6.25,0.583"/>

+<polygon fill="none" stroke="#FFFFFF" stroke-width="3" points="33.865,41.531 11.531,41.198 7.323,9.323 38.448,9.323 "/>

+<path fill="none" stroke="#FFFFFF" stroke-width="3" d="M7.323,7.198c22.004-2.468,25.334-2.75,29.459-3.5s-9.667-3.25-13.959-2.75

+	c-2.002,0.233-11.25,1.875-15.375,6.25"/>

+<path fill="none" stroke="#FFFFFF" stroke-width="3" d="M17.698,0.531l7.75-1.708c0,0-4.875-3.625-7.75,1.5"/>

+<line fill="none" stroke="#FFFFFF" stroke-width="3" x1="23.198" y1="15.698" x2="23.198" y2="33.198"/>

+<line fill="none" stroke="#FFFFFF" stroke-width="3" x1="32.198" y1="16.198" x2="30.198" y2="33.198"/>

+<line fill="none" stroke="#FFFFFF" stroke-width="3" x1="13.448" y1="16.948" x2="15.198" y2="33.198"/>

 </svg>

diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py
index 4b6d34a..f6bdb70 100644
--- a/miniTamTam/miniToolbars.py
+++ b/miniTamTam/miniToolbars.py
@@ -11,11 +11,12 @@ class playToolbar(gtk.Toolbar):
     def __init__(self,toolbox, miniTamTam):
         gtk.Toolbar.__init__(self)
 
-        def _insertSeparator():
-            self.separator = gtk.SeparatorToolItem()
-            self.separator.set_draw(True)
-            self.insert(self.separator,-1)
-            self.separator.show()
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()   
 
         self.toolbox = toolbox
         self.miniTamTam = miniTamTam
@@ -28,9 +29,7 @@ class playToolbar(gtk.Toolbar):
         self.playButton.show()
         self.playButton.set_tooltip(_('Play / Stop'))
 
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(3)
 
         self.balanceSliderImgLeft = gtk.Image()
         self.balanceSliderImgRight = gtk.Image()
@@ -59,8 +58,7 @@ class playToolbar(gtk.Toolbar):
         self.balanceSliderTool.show()
         self.balanceSliderTool.set_tooltip(self.tooltips, _('Balance'))
 
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(2)
 
         self.reverbSliderImgRight = gtk.Image()
         self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb0.png')
@@ -88,11 +86,12 @@ class recordToolbar(gtk.Toolbar):
     def __init__(self,toolbox, miniTamTam):
         gtk.Toolbar.__init__(self)
 
-        def _insertSeparator():
-            self.separator = gtk.SeparatorToolItem()
-            self.separator.set_draw(True)
-            self.insert(self.separator,-1)
-            self.separator.show()
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()   
 
         self.toolbox = toolbox
         self.miniTamTam = miniTamTam
@@ -121,12 +120,7 @@ class recordToolbar(gtk.Toolbar):
         self.micRec4Button.show()
         self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
 
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(6)
 
         self.keyboardRecButton = ToggleToolButton('keyrec')
         self.keyboardRecButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton )
@@ -141,8 +135,7 @@ class recordToolbar(gtk.Toolbar):
         self.keyboardRecOverButton.set_tooltip(_('Click to add a loop'))
         self.keyboardRecOverButton.set_sensitive(False)
 
-        _insertSeparator()
-        _insertSeparator()
+        _insertSeparator(2)
 
         self.loopSetButton = ToggleToolButton('loop')
         self.loopSetButton.connect('clicked', self.miniTamTam.handleLoopSettingsBtn)