diff options
author | Nat <natcl@hotmail.com> | 2007-08-21 04:38:04 (GMT) |
---|---|---|
committer | Nat <natcl@hotmail.com> | 2007-08-21 04:38:04 (GMT) |
commit | 0699ac2cd131063a5e47c1551cce8d2271791195 (patch) | |
tree | 42f6eaad1c2b7168fd073431154d3b4d145d0c90 | |
parent | 16a344da8812e687f66a92df225a6dd38bf1fb3d (diff) |
Play/Stop icon switch
-rw-r--r-- | Edit/EditToolbars.py | 20 | ||||
-rw-r--r-- | icons/pstop.svg | 10 | ||||
-rw-r--r-- | miniTamTam/miniTamTamMain.py | 12 |
3 files changed, 33 insertions, 9 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index 3418512..a7c0f3b 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -50,6 +50,16 @@ class mainToolbar(gtk.Toolbar): self.playButton.connect('toggled', self.handlePlayStop) self.insert(self.playButton, -1) self.playButton.show() + + #Play button Image + self.playButtonImg = gtk.Image() + self.playButtonImg.set_from_icon_name('play', gtk.ICON_SIZE_LARGE_TOOLBAR) + self.playButtonImg.show() + + #Stop button Image + self.stopButtonImg = gtk.Image() + self.stopButtonImg.set_from_icon_name('pstop', gtk.ICON_SIZE_LARGE_TOOLBAR) + self.stopButtonImg.show() #Pause button self.pauseButton = ToolButton('pause') @@ -136,13 +146,15 @@ class mainToolbar(gtk.Toolbar): self.edit.handlePlay(widget) self.rewindButton.set_sensitive(False) self.pauseButton.set_sensitive(True) + widget.set_icon_widget(self.stopButtonImg) else: self.edit.handleStop(widget) self.rewindButton.set_sensitive(True) self.pauseButton.set_sensitive(False) + widget.set_icon_widget(self.playButtonImg) def handlePause(self, widget, data = None): - self.edit.handleStop(widget, False) + self.edit.handleStop(rewind = False) self.playButton.set_active(False) def handleDuplicate(self, widget): @@ -372,7 +384,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/XYButDownClick.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) @@ -399,7 +411,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/XYButDownClick.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) @@ -426,7 +438,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/XYButDownClick.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) diff --git a/icons/pstop.svg b/icons/pstop.svg index 246f45c..8fbdbd5 100644 --- a/icons/pstop.svg +++ b/icons/pstop.svg @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576) -->
+<!-- Generator: Adobe Illustrator 13.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="45px" height="45px" viewBox="0 0 45 45" enable-background="new 0 0 45 45" xml:space="preserve">
-<circle fill="#808284" cx="22.5" cy="22.5" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.499" cy="22.592" r="18.677"/>
-<rect x="15.75" y="15.041" fill="#FFFFFF" width="13.5" height="14.1"/>
+ width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>
+<rect x="20.75" y="20.041" fill="#FFFFFF" width="13.5" height="14.1"/>
</svg>
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index a1ccd63..f8e3232 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -142,6 +142,15 @@ class miniTamTamMain(SubActivity): self.syncTimeout = gobject.timeout_add( 1000, self.updateSync ) #------------------------------------------------------------------- + #Play button Image + self.playButtonImg = gtk.Image() + self.playButtonImg.set_from_icon_name('play', gtk.ICON_SIZE_LARGE_TOOLBAR) + self.playButtonImg.show() + + #Stop button Image + self.stopButtonImg = gtk.Image() + self.stopButtonImg.set_from_icon_name('pstop', gtk.ICON_SIZE_LARGE_TOOLBAR) + self.stopButtonImg.show() # Toolbar self.activity.activity_toolbar.share.show() self._playToolbar = playToolbar(self.activity.toolbox, self) @@ -541,6 +550,7 @@ class miniTamTamMain(SubActivity): self.drumFillin.stop() self.sequencer.stopPlayback() self.csnd.loopPause() + widget.set_icon_widget(self.playButtonImg) else: if not self.firstTime: self.regenerate() @@ -551,6 +561,8 @@ class miniTamTamMain(SubActivity): #print "play:: next beat in %f ticks. bpb == %d. setting ticks to %d" % (nextInTicks, self.beat, Config.TICKS_PER_BEAT*self.beat - int(round(nextInTicks))) self.csnd.loopSetTick( Config.TICKS_PER_BEAT*self.beat - int(round(nextInTicks)) ) self.csnd.loopStart() + widget.set_icon_widget(self.stopButtonImg) + def handleGenerationDrumBtn(self , widget , data): #data is drum1kit, drum2kit, or drum3kit |