Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

1 files changed, 22 insertions, 23 deletions

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 2ef608f..e58482e 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -342,29 +342,20 @@ class generationPalette(Palette):
         self.slidersBox = gtk.HBox()
         self.scaleModeBox = gtk.VBox()
         self.decisionBox = gtk.HBox()
-
-        self.XSlider1Img = gtk.Image()
-        self.XSlider1Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
-        self.YSlider1Img = gtk.Image()
-        self.YSlider1Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
-        self.XSlider2Img = gtk.Image()
-        self.XSlider2Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
-        self.YSlider2Img = gtk.Image()
-        self.YSlider2Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
-        self.XSlider3Img = gtk.Image()
-        self.XSlider3Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
-        self.YSlider3Img = gtk.Image()
-        self.YSlider3Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
         
         self.XYSlider1MainBox = gtk.VBox()
         self.XYSlider1TopLabel = gtk.Label(_('Rythm'))
         self.XSlider1BottomLabelBox = gtk.HBox()
+        self.XSlider1Img = gtk.Image()
+        self.XSlider1Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
         self.XSlider1BottomLabel = gtk.Label(_('Density'))
         self.YSlider1BottomLabelBox = gtk.HBox()
+        self.YSlider1Img = gtk.Image()
+        self.YSlider1Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
         self.YSlider1BottomLabel = gtk.Label(_('Regularity'))
         self.XYSliderBox1 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
         self.XYSliderBox1.set_size_request(200,200)
-        self.XYButton1 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XYButton1 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDownClick.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
         self.XAdjustment1 = gtk.Adjustment(self.rythmDensity * 100, 0, 100, 1, 1, 1)
         self.XAdjustment1.connect("value-changed", self.handleXAdjustment1)
         self.YAdjustment1 = gtk.Adjustment(self.rythmRegularity * 100, 0, 100, 1, 1, 1)
@@ -375,19 +366,23 @@ class generationPalette(Palette):
         self.YSlider1BottomLabelBox.pack_start(self.YSlider1Img, False, False, padding = 5)
         self.YSlider1BottomLabelBox.pack_start(self.YSlider1BottomLabel, False, False, padding = 5)
         self.XYSlider1MainBox.pack_start(self.XYSlider1TopLabel, False, False, padding = 5)
-        self.XYSlider1MainBox.pack_start(self.XYSlider1, False, False, padding = 0)
+        self.XYSlider1MainBox.pack_start(self.XYSlider1, False, False, padding = 2)
         self.XYSlider1MainBox.pack_start(self.XSlider1BottomLabelBox, False, False, padding = 2)
         self.XYSlider1MainBox.pack_start(self.YSlider1BottomLabelBox, False, False, padding = 2)
 
         self.XYSlider2MainBox = gtk.VBox()
         self.XYSlider2TopLabel = gtk.Label(_('Pitch'))
         self.XSlider2BottomLabelBox = gtk.HBox()
+        self.XSlider2Img = gtk.Image()
+        self.XSlider2Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
         self.XSlider2BottomLabel = gtk.Label(_('Regularity'))
         self.YSlider2BottomLabelBox = gtk.HBox()
+        self.YSlider2Img = gtk.Image()
+        self.YSlider2Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
         self.YSlider2BottomLabel = gtk.Label(_('Maximum step'))
         self.XYSliderBox2 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
         self.XYSliderBox2.set_size_request(200,200)
-        self.XYButton2 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XYButton2 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDownClick.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
         self.XAdjustment2 = gtk.Adjustment(self.pitchRegularity * 100, 0, 100, 1, 1, 1)
         self.XAdjustment2.connect("value-changed", self.handleXAdjustment2)
         self.YAdjustment2 = gtk.Adjustment(self.pitchStep * 100, 0, 100, 1, 1, 1)
@@ -398,19 +393,23 @@ class generationPalette(Palette):
         self.YSlider2BottomLabelBox.pack_start(self.YSlider2Img, False, False, padding = 5)
         self.YSlider2BottomLabelBox.pack_start(self.YSlider2BottomLabel, False, False, padding = 5)
         self.XYSlider2MainBox.pack_start(self.XYSlider2TopLabel, False, False, padding = 5)
-        self.XYSlider2MainBox.pack_start(self.XYSlider2, False, False, padding = 0)
-        self.XYSlider2MainBox.pack_start(self.XSlider2BottomLabel, False, False, padding = 2)
-        self.XYSlider2MainBox.pack_start(self.YSlider2BottomLabel, False, False, padding = 2)
+        self.XYSlider2MainBox.pack_start(self.XYSlider2, False, False, padding = 2)
+        self.XYSlider2MainBox.pack_start(self.XSlider2BottomLabelBox, False, False, padding = 2)
+        self.XYSlider2MainBox.pack_start(self.YSlider2BottomLabelBox, False, False, padding = 2)
 
         self.XYSlider3MainBox = gtk.VBox()
         self.XYSlider3TopLabel = gtk.Label(_('Duration'))
         self.XSlider3BottomLabelBox = gtk.HBox()
+        self.XSlider3Img = gtk.Image()
+        self.XSlider3Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/sideR.svg')
         self.XSlider3BottomLabel = gtk.Label(_('Note duration'))
         self.YSlider3BottomLabelBox = gtk.HBox()
+        self.YSlider3Img = gtk.Image()
+        self.YSlider3Img.set_from_file(Config.TAM_TAM_ROOT + '/icons/updownR.svg')
         self.YSlider3BottomLabel = gtk.Label(_('Silence density'))
         self.XYSliderBox3 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
         self.XYSliderBox3.set_size_request(200,200)
-        self.XYButton3 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XYButton3 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDownClick.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
         self.XAdjustment3 = gtk.Adjustment(self.duration * 100, 0, 100, 1, 1, 1)
         self.XAdjustment3.connect("value-changed", self.handleXAdjustment3)
         self.YAdjustment3 = gtk.Adjustment(self.silence * 100, 0, 100, 1, 1, 1)
@@ -421,9 +420,9 @@ class generationPalette(Palette):
         self.YSlider3BottomLabelBox.pack_start(self.YSlider3Img, False, False, padding = 5)
         self.YSlider3BottomLabelBox.pack_start(self.YSlider3BottomLabel, False, False, padding = 5)
         self.XYSlider3MainBox.pack_start(self.XYSlider3TopLabel, False, False, padding = 5)
-        self.XYSlider3MainBox.pack_start(self.XYSlider3, False, False, padding = 0)
-        self.XYSlider3MainBox.pack_start(self.XSlider3BottomLabel, False, False, padding = 2)
-        self.XYSlider3MainBox.pack_start(self.YSlider3BottomLabel, False, False, padding = 2)
+        self.XYSlider3MainBox.pack_start(self.XYSlider3, False, False, padding = 2)
+        self.XYSlider3MainBox.pack_start(self.XSlider3BottomLabelBox, False, False, padding = 2)
+        self.XYSlider3MainBox.pack_start(self.YSlider3BottomLabelBox, False, False, padding = 2)
 
         self.slidersBox.pack_start(self.XYSlider1MainBox, False, False, padding = 5)
         self.slidersBox.pack_start(self.XYSlider2MainBox, False, False, padding = 5)