From 8cd4358300c82c744729827ef741bc19efd5f537 Mon Sep 17 00:00:00 2001 From: Nat Date: Mon, 20 Aug 2007 18:24:35 +0000 Subject: Labels --- (limited to 'Edit/EditToolbars.py') diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index e79db1f..60c1332 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -343,9 +343,16 @@ class generationPalette(Palette): self.scaleModeBox = gtk.VBox() self.decisionBox = gtk.HBox() + self.XSliderImg = gtk.Image() + self.XSliderImg.set_from_icon_name('sideR') + self.YSliderImg = gtk.Image() + self.YSliderImg.set_from_icon_name('updownR') + self.XYSlider1MainBox = gtk.VBox() self.XYSlider1TopLabel = gtk.Label(_('Rythm')) + self.XSlider1BottomLabelBox = gtk.HBox() self.XSlider1BottomLabel = gtk.Label(_('Density')) + self.YSlider1BottomLabelBox = gtk.HBox() self.YSlider1BottomLabel = gtk.Label(_('Regularity')) self.XYSliderBox1 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000') self.XYSliderBox1.set_size_request(200,200) @@ -355,14 +362,20 @@ class generationPalette(Palette): self.YAdjustment1 = gtk.Adjustment(self.rythmRegularity * 100, 0, 100, 1, 1, 1) self.YAdjustment1.connect("value-changed", self.handleYAdjustment1) self.XYSlider1 = XYSlider( self.XYSliderBox1, self.XYButton1, self.XAdjustment1, self.YAdjustment1, False, True ) + self.XSlider1BottomLabelBox.pack_start(self.XSliderImg, False, False, padding = 5) + self.XSlider1BottomLabelBox.pack_start(self.XSlider1BottomLabel, False, False, padding = 5) + self.YSlider1BottomLabelBox.pack_start(self.YSliderImg, 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.XSlider1BottomLabel, False, False, padding = 2) - self.XYSlider1MainBox.pack_start(self.YSlider1BottomLabel, 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.XSlider2BottomLabel = gtk.Label(_('Regularity')) + self.YSlider2BottomLabelBox = gtk.HBox() self.YSlider2BottomLabel = gtk.Label(_('Maximum step')) self.XYSliderBox2 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000') self.XYSliderBox2.set_size_request(200,200) @@ -372,6 +385,10 @@ 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.XSliderImg, False, False, padding = 5) + self.XSlider2BottomLabelBox.pack_start(self.XSlider1BottomLabel, False, False, padding = 5) + self.YSlider2BottomLabelBox.pack_start(self.YSliderImg, 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) -- cgit v0.9.1