From e90310bd612fc920ffb2121b05b69342edc6e270 Mon Sep 17 00:00:00 2001 From: Oli Date: Thu, 23 Aug 2007 22:09:05 +0000 Subject: big dice connected, paint fix --- (limited to 'Edit') diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index 66c4844..8bb9b96 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -49,19 +49,19 @@ class mainToolbar(gtk.Toolbar): self.insert(self.playButton, -1) self.playButton.show() self.playButton.set_tooltip(_('Play / Pause')) - + #Stop button self.stopButton = ToolButton('pstop') self.stopButton.connect('clicked', self.handleStop) self.insert(self.stopButton, -1) self.stopButton.show() self.stopButton.set_tooltip(_('Stop')) - + #Play button Image self.playButtonImg = gtk.Image() self.playButtonImg.set_from_icon_name('play', gtk.ICON_SIZE_LARGE_TOOLBAR) - self.playButtonImg.show() - + self.playButtonImg.show() + #Pause button Image self.pauseButtonImg = gtk.Image() self.pauseButtonImg.set_from_icon_name('pause', gtk.ICON_SIZE_LARGE_TOOLBAR) @@ -73,7 +73,7 @@ class mainToolbar(gtk.Toolbar): self.insert(self.recordButton, -1) self.recordButton.show() self.recordButton.set_tooltip(_('Record keyboard')) - + #RecordOgg button self.recordOggButton = ToggleToolButton('recordO') self.recordOggButton.connect('clicked', self.edit.handleAudioRecord) @@ -147,7 +147,7 @@ class mainToolbar(gtk.Toolbar): elif self.edit.getContext() == 2: #Note self.edit.noteDuplicateWidget(widget) widget.set_active(False) - + class generateToolbar(gtk.Toolbar): def __init__(self,toolbox, edit): gtk.Toolbar.__init__(self) @@ -163,16 +163,16 @@ class generateToolbar(gtk.Toolbar): self.edit = edit self.tooltips = gtk.Tooltips() - + #BigGeneration button self.bigGenerationButton = ToolButton('diceB') - #self.generationButton.connect(None) + self.bigGenerationButton.connect('clicked', self.edit.createNewTune) self.insert(self.bigGenerationButton, -1) self.bigGenerationButton.show() self.bigGenerationButton.set_tooltip(_('Generate Tune')) - + _insertSeparator(68) - + #Generation button self._generationPalette = generationPalette(_('Generation'), self.edit) self.generationButton = ToggleToolButton('dice') @@ -214,6 +214,9 @@ class pointerPalette(Palette): self.set_content(self.pointerBox) + pass + #self.noteDur = widget.props.value + def handleSnapGrid(self, widget): data = widget.props.value grid = int(self.gridDurs[data]) @@ -385,7 +388,7 @@ class generationPalette(Palette): 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 = ImageButton( 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) @@ -412,7 +415,7 @@ class generationPalette(Palette): 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 = ImageButton( 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) @@ -439,7 +442,7 @@ class generationPalette(Palette): 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 = ImageButton( 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) @@ -577,6 +580,7 @@ class generationPalette(Palette): def handleScale(self, widget, data = None): self.scale = widget.props.value + self.edit.scale = self.scale self.parametersChanged() def handleMode( self, widget, data = None ): @@ -858,7 +862,6 @@ class propertiesPalette(Palette): self.panSlider = gtk.HScale(adjustment = self.panSliderAdj) self.panSlider.set_size_request(200,-1) self.panSlider.set_value_pos(gtk.POS_RIGHT) - self.panSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.panCheckButton = gtk.CheckButton() self.panCheckButton.connect('toggled', self.handleGeneCheckButton) self.geneCheckButtonDic['pan'] = self.panCheckButton @@ -873,7 +876,6 @@ class propertiesPalette(Palette): self.reverbSlider = gtk.HScale(adjustment = self.reverbSliderAdj) self.reverbSlider.set_size_request(200,-1) self.reverbSlider.set_value_pos(gtk.POS_RIGHT) - self.reverbSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.reverbCheckButton = gtk.CheckButton() self.reverbCheckButton.connect('toggled', self.handleGeneCheckButton) self.geneCheckButtonDic['reverb'] = self.reverbCheckButton @@ -888,7 +890,6 @@ class propertiesPalette(Palette): self.attackDurSlider = gtk.HScale(adjustment = self.attackDurSliderAdj) self.attackDurSlider.set_size_request(200,-1) self.attackDurSlider.set_value_pos(gtk.POS_RIGHT) - self.attackDurSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.attackDurCheckButton = gtk.CheckButton() self.attackDurCheckButton.connect('toggled', self.handleGeneCheckButton) self.geneCheckButtonDic['attack'] = self.attackDurCheckButton @@ -903,7 +904,6 @@ class propertiesPalette(Palette): self.decayDurSlider = gtk.HScale(adjustment = self.decayDurSliderAdj) self.decayDurSlider.set_size_request(200,-1) self.decayDurSlider.set_value_pos(gtk.POS_RIGHT) - self.decayDurSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.decayDurCheckButton = gtk.CheckButton() self.decayDurCheckButton.connect('toggled', self.handleGeneCheckButton) self.geneCheckButtonDic['decay'] = self.decayDurCheckButton @@ -927,7 +927,6 @@ class propertiesPalette(Palette): self.filterCutoffSlider = gtk.HScale(adjustment = self.filterCutoffSliderAdj) self.filterCutoffSlider.set_size_request(200,-1) self.filterCutoffSlider.set_value_pos(gtk.POS_RIGHT) - self.filterCutoffSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.filterCutoffCheckButton = gtk.CheckButton() self.filterCutoffCheckButton.connect('toggled', self.handleGeneCheckButton) self.geneCheckButtonDic['filter'] = self.filterCutoffCheckButton @@ -956,7 +955,6 @@ class propertiesPalette(Palette): self.minimumSlider = gtk.HScale(adjustment = self.minimumSliderAdj) self.minimumSlider.set_size_request(200,-1) self.minimumSlider.set_value_pos(gtk.POS_RIGHT) - self.minimumSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.minimumBox.pack_start(self.minimumLabel, False, False, padding = 5) self.minimumBox.pack_end(self.minimumSlider, False, False, padding = 52) @@ -967,7 +965,6 @@ class propertiesPalette(Palette): self.maximumSlider = gtk.HScale(adjustment = self.maximumSliderAdj) self.maximumSlider.set_size_request(200,-1) self.maximumSlider.set_value_pos(gtk.POS_RIGHT) - self.maximumSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.maximumBox.pack_start(self.maximumLabel, False, False, padding = 5) self.maximumBox.pack_end(self.maximumSlider, False, False, padding = 52) @@ -978,7 +975,6 @@ class propertiesPalette(Palette): self.randomSlider = gtk.HScale(adjustment = self.randomSliderAdj) self.randomSlider.set_size_request(200,-1) self.randomSlider.set_value_pos(gtk.POS_RIGHT) - self.randomSlider.set_update_policy(gtk.UPDATE_DISCONTINUOUS) self.randomBox.pack_start(self.randomLabel, False, False, padding = 5) self.randomBox.pack_end(self.randomSlider, False, False, padding = 52) diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index db58585..2d0db40 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -54,6 +54,8 @@ class MainWindow( SubActivity ): self.csnd.setTrackVolume(100, i) self.trackCount = 6 + self.scale = GenerationConstants.DEFAULT_SCALE + def init_data( ): TP.ProfileBegin("init_data") self._data = {} @@ -915,7 +917,7 @@ class MainWindow( SubActivity ): self.noteDB.setInstrument( pages, id, instrument.instrumentId ) def getScale(self): - return self.generationPanel.scale + return self.scale def handleVolume( self, widget ): self._data["volume"] = round( widget.get_value() ) @@ -1938,8 +1940,8 @@ class InstrumentButton( gtk.DrawingArea ): colormap = self.get_colormap() self.color = { "background": colormap.alloc_color( backgroundFill, True, True ), - "divider": colormap.alloc_color( "#000", True, True ), - "+/-": colormap.alloc_color( Config.FG_COLOR, True, True ), + "divider": colormap.alloc_color( "#000", True, True ), + "+/-": colormap.alloc_color( Config.FG_COLOR, True, True ), "+/-Highlight": colormap.alloc_color( "#FFF", True, True ) } self.pixmap = None -- cgit v0.9.1