cleanup

1 files changed, 16 insertions, 17 deletions

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 9edfaa5..706fd63 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -342,25 +342,16 @@ 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)
@@ -382,8 +373,12 @@ class generationPalette(Palette):
         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)
@@ -393,9 +388,9 @@ class generationPalette(Palette):
         self.YAdjustment2 = gtk.Adjustment(self.pitchStep * 100, 0, 100, 1, 1, 1)
         self.YAdjustment2.connect("value-changed", self.handleYAdjustment2)
         self.XYSlider2 = XYSlider( self.XYSliderBox2, self.XYButton2, self.XAdjustment2, self.YAdjustment2, False, True )
-        self.XSlider2BottomLabelBox.pack_start(self.XSlider1Img, False, False, padding = 5)
+        self.XSlider2BottomLabelBox.pack_start(self.XSlider2Img, False, False, padding = 5)
         self.XSlider2BottomLabelBox.pack_start(self.XSlider2BottomLabel, False, False, padding = 5)
-        self.YSlider2BottomLabelBox.pack_start(self.YSlider1Img, False, False, padding = 5)
+        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)
@@ -405,8 +400,12 @@ class generationPalette(Palette):
         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)
@@ -416,9 +415,9 @@ class generationPalette(Palette):
         self.YAdjustment3 = gtk.Adjustment(self.silence * 100, 0, 100, 1, 1, 1)
         self.YAdjustment3.connect("value-changed", self.handleYAdjustment3)
         self.XYSlider3 = XYSlider( self.XYSliderBox3, self.XYButton3, self.XAdjustment3, self.YAdjustment3, False, True )
-        self.XSlider3BottomLabelBox.pack_start(self.XSlider1Img, False, False, padding = 5)
+        self.XSlider3BottomLabelBox.pack_start(self.XSlider3Img, False, False, padding = 5)
         self.XSlider3BottomLabelBox.pack_start(self.XSlider3BottomLabel, False, False, padding = 5)
-        self.YSlider3BottomLabelBox.pack_start(self.YSlider1Img, False, False, padding = 5)
+        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)