From 0696bd1e480debac4a9a134954767e2086e33241 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Wed, 29 Aug 2007 08:58:27 +0000
Subject: Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

---
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 76264e4..875e20e 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -34,6 +34,7 @@ class mainToolbar(gtk.Toolbar):
         def _insertSeparator(x = 1):
             for i in range(x):
                 self.separator = gtk.SeparatorToolItem()
+                self.separator.set_expand(True)
                 self.separator.set_draw(True)
                 self.insert(self.separator,-1)
                 self.separator.show()
@@ -81,7 +82,7 @@ class mainToolbar(gtk.Toolbar):
         self.recordOggButton.show()
         self.recordOggButton.set_tooltip(_('Record to ogg'))
 
-        _insertSeparator(12)
+        _insertSeparator(1)
 
         #Pointer button
         self._pointerPalette = pointerPalette(_('Select Tool'), self.edit)
@@ -113,7 +114,7 @@ class mainToolbar(gtk.Toolbar):
         self.insert(self.paintButton, -1)
         self.paintButton.show()
 
-        _insertSeparator(14)
+        _insertSeparator(1)
 
         #Duplicate button
         self.duplicateButton = ToggleToolButton('duplicate')
@@ -162,7 +163,8 @@ class generateToolbar(gtk.Toolbar):
         def _insertSeparator(x = 1):
             for i in range(x):
                 self.separator = gtk.SeparatorToolItem()
-                self.separator.set_draw(True)
+                self.separator.set_expand(True)
+                self.separator.set_draw(False)
                 self.insert(self.separator,-1)
                 self.separator.show()
 
@@ -178,7 +180,7 @@ class generateToolbar(gtk.Toolbar):
         self.bigGenerationButton.show()
         self.bigGenerationButton.set_tooltip(_('Generate Tune'))
 
-        _insertSeparator(68)
+        _insertSeparator(1)
 
         #Generation button
         self._generationPalette = generationPalette(_('Generation'), self.edit)
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 76c85ae..e34fc19 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -2087,5 +2087,5 @@ class instrumentPalette(Palette):
         self.volumeBox.pack_start(self.volumeSlider, padding = 5)
         self.volumeBox.show_all()
 
-        self.set_content(self.volumeBox)
-
+        self.set_content(self.volumeBox)  
+    
\ No newline at end of file
diff --git a/SynthLab/SynthLabToolbars.py b/SynthLab/SynthLabToolbars.py
index a040230..0d64632 100644
--- a/SynthLab/SynthLabToolbars.py
+++ b/SynthLab/SynthLabToolbars.py
@@ -49,7 +49,7 @@ class mainToolbar(gtk.Toolbar):
         self.durationSliderTool.show()
         self.durationSliderTool.set_tooltip(self.tooltips, _('Duration'))
         
-        _insertSeparator(6)
+        _insertSeparator(1)
         
         self.synthRec1Button = ToggleToolButton('rec1')
         self.synthRec1Button.connect('clicked',self.synthLab.recordSound,1)
@@ -87,7 +87,7 @@ class mainToolbar(gtk.Toolbar):
         self.synthRec6Button.show()
         self.synthRec6Button.set_tooltip(_('Record Synth sound into slot 6'))
         
-        _insertSeparator(6)
+        _insertSeparator(1)
         
         self.resetButton = ToolButton('sl-reset')
         self.resetButton.connect('clicked',self.synthLab.handleReset)
diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py
index 0ba9755..4717d00 100644
--- a/miniTamTam/miniToolbars.py
+++ b/miniTamTam/miniToolbars.py
@@ -30,7 +30,7 @@ class playToolbar(gtk.Toolbar):
         self.playButton.show()
         self.playButton.set_tooltip(_('Play / Stop'))
 
-        _insertSeparator(3)
+        _insertSeparator(1)
 
         self.balanceSliderImgLeft = gtk.Image()
         self.balanceSliderImgRight = gtk.Image()
@@ -59,7 +59,7 @@ class playToolbar(gtk.Toolbar):
         self.balanceSliderTool.show()
         self.balanceSliderTool.set_tooltip(self.tooltips, _('Balance'))
 
-        _insertSeparator(22)
+        _insertSeparator(1)
 
         self.reverbSliderImgRight = gtk.Image()
         self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb0.png')
@@ -121,7 +121,7 @@ class recordToolbar(gtk.Toolbar):
         self.micRec4Button.show()
         self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
 
-        _insertSeparator(12)
+        _insertSeparator()
 
         self.keyboardRecButton = ToggleToolButton('keyrec')
         self.keyboardRecButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton )
@@ -142,7 +142,7 @@ class recordToolbar(gtk.Toolbar):
         self.keyboardRecMinusButton.show()
         self.keyboardRecMinusButton.set_tooltip(_('Click to clear all loops'))
 
-        _insertSeparator(2)
+        _insertSeparator()
 
         self.loopSetButton = ToggleToolButton('loop')
         self.loopSetButton.connect('clicked', self.miniTamTam.handleLoopSettingsBtn)
--
cgit v0.9.1