diff options
| author | Nat <natcl@hotmail.com> | 2007-08-20 16:27:30 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-08-20 16:27:30 (GMT) |
| commit | e99d2de9adc5c1314cbb3b6954c7caf9ccada9ec (patch) | |
| tree | 8b7a52b5d35e907b139a195c63603181ea067e42 /Edit | |
| parent | 6e89806275673d7785aab0e0a44355eee678aea2 (diff) | |
Generation labels
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/EditToolbars.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index 24b0ab2..398ab45 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -343,6 +343,8 @@ class generationPalette(Palette): self.scaleModeBox = gtk.VBox() self.decisionBox = gtk.HBox() + self.XYSliderMainBox1 = gtk.VBox() + self.XYSlider1TopLabel = gtk.Label(_('Rythm')) 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') @@ -351,6 +353,8 @@ 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.XYSliderMainBox1.pack_start(self.XYSlider1TopLabel, False, False, padding = 5) + self.XYSliderMainBox1.pack_start(self.XYSlider1, False, False, padding = 0) self.XYSliderBox2 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000') self.XYSliderBox2.set_size_request(200,200) @@ -370,9 +374,9 @@ class generationPalette(Palette): self.YAdjustment3.connect("value-changed", self.handleYAdjustment3) self.XYSlider3 = XYSlider( self.XYSliderBox3, self.XYButton3, self.XAdjustment3, self.YAdjustment3, False, True ) - self.slidersBox.pack_start(self.XYSlider1, False, False, padding = 5) - self.slidersBox.pack_start(self.XYSlider2, False, False, padding = 5) - self.slidersBox.pack_start(self.XYSlider3, False, False, padding = 5) + self.slidersBox.pack_start(self.XYSliderMainBox1, False, False, padding = 0) + self.slidersBox.pack_start(self.XYSlider2, False, False, padding = 0) + self.slidersBox.pack_start(self.XYSlider3, False, False, padding = 0) self.previewBox = gtk.HBox() self.previewDA = gtk.DrawingArea() @@ -410,8 +414,6 @@ class generationPalette(Palette): self.acceptButton.connect('clicked',self.generate) self.cancelButton = ImageButton(Config.TAM_TAM_ROOT + '/icons/cancel.svg') self.cancelButton.connect('clicked',self.cancel) - self.previewButton = gtk.Button(label = 'Preview') - self.previewButton.connect('clicked', self.previewGeneratorTemp, self.getGenerationParameters()) self.decisionBox.pack_start(self.cancelButton, False, False, padding = 5) self.decisionBox.pack_start(self.acceptButton, False, False, padding = 5) self.decisionBox.pack_start(self.previewButton, False, False, padding = 5) @@ -527,10 +529,7 @@ class generationPalette(Palette): self.edit.generate(self.getGenerationParameters()) self.popdown(True) - ############ generate a preview melody ############## - def previewGeneratorTemp(self, widget, parameters): - self.previewGenerator(parameters) - + ############ generate a preview melody ##############s def previewGenerator(self, parameters): makeRythm = GenerationRythm() makePitch = GenerationPitch(parameters.pattern) |