diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-07-21 01:00:26 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-21 01:00:26 (GMT) |
| commit | 9337c242b42e2cfed2f8e1640ee8b3543350d7d2 (patch) | |
| tree | 692494dee8ce7cff23bf42374fe2ad5bb95ebea3 /miniTamTam | |
| parent | b92cff136e1b7d77906a3da4fd984435180fb389 (diff) | |
| parent | 51e33640b438452b08a0a84b8f4a436268ec301f (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 8 | ||||
| -rw-r--r-- | miniTamTam/miniToolbars.py | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index b2ea4d7..9d34eb0 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -248,7 +248,7 @@ class miniTamTamMain(SubActivity): geneAdjustment = gtk.Adjustment(value=self.regularity, lower=0, upper=1, step_incr=0.01, page_incr=0, page_size=0) geneSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutbleu.png", geneAdjustment, 5 ) geneSlider.set_inverted(False) - geneSlider.set_size_request(15,320) + geneSlider.set_size_request(15,305) geneAdjustment.connect("value_changed" , self.handleGenerationSlider) geneSlider.connect("button-release-event", self.handleGenerationSliderRelease) geneSliderBox.pack_start(self.geneSliderBoxImgTop, False, padding=10) @@ -261,7 +261,7 @@ class miniTamTamMain(SubActivity): self.beatAdjustment = gtk.Adjustment(value=self.beat, lower=2, upper=12, step_incr=1, page_incr=0, page_size=0) self.beatSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutjaune.png", self.beatAdjustment, 5, snap = 1 ) self.beatSlider.set_inverted(True) - self.beatSlider.set_size_request(15,320) + self.beatSlider.set_size_request(15,305) self.beatAdjustment.connect("value_changed" , self.handleBeatSlider) self.beatSlider.connect("button-release-event", self.handleBeatSliderRelease) beatSliderBox.pack_start(self.beatSliderBoxImgTop, False, padding=10) @@ -277,7 +277,7 @@ class miniTamTamMain(SubActivity): self.tempoAdjustment = gtk.Adjustment(value=self.tempo, lower=Config.PLAYER_TEMPO_LOWER, upper=Config.PLAYER_TEMPO_UPPER, step_incr=1, page_incr=1, page_size=1) tempoSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutvert.png", self.tempoAdjustment, 5) tempoSlider.set_inverted(True) - tempoSlider.set_size_request(15,320) + tempoSlider.set_size_request(15,305) self.tempoAdjustmentHandler = self.tempoAdjustment.connect("value_changed" , self.handleTempoSliderChange) tempoSlider.connect("button-press-event", self.handleTempoSliderPress) tempoSlider.connect("button-release-event", self.handleTempoSliderRelease) @@ -291,7 +291,7 @@ class miniTamTamMain(SubActivity): self.volumeAdjustment = gtk.Adjustment(value=self.volume, lower=0, upper=200, step_incr=1, page_incr=1, page_size=1) volumeSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutbleu.png", self.volumeAdjustment, 5) volumeSlider.set_inverted(True) - volumeSlider.set_size_request(15,320) + volumeSlider.set_size_request(15,305) self.volumeAdjustment.connect("value_changed" , self.handleVolumeSlider) #volumeSlider.connect("button-release-event", self.handleVolumeSliderRelease) volumeSliderBox.pack_start(self.volumeSliderBoxImgTop, False, padding=10) diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py index 90088a8..92a1afc 100644 --- a/miniTamTam/miniToolbars.py +++ b/miniTamTam/miniToolbars.py @@ -134,6 +134,12 @@ class recordToolbar(gtk.Toolbar): self.keyboardRecOverButton.show() self.keyboardRecOverButton.set_tooltip(_('Click to add a loop')) self.keyboardRecOverButton.set_sensitive(False) + + self.keyboardRecMinusButton = ToolButton('minusrec') + self.keyboardRecMinusButton.connect('clicked', self.miniTamTam.sequencer.clearSequencer ) + self.insert(self.keyboardRecMinusButton, -1) + self.keyboardRecMinusButton.show() + self.keyboardRecMinusButton.set_tooltip(_('Click to clear all loops')) _insertSeparator(2) |