Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/miniTamTam
diff options
context:
space:
mode:
authorNat <Nat@localhost.localdomain>2007-03-30 12:50:14 (GMT)
committer Nat <Nat@localhost.localdomain>2007-03-30 12:50:14 (GMT)
commit412e2f774c058ddc60e726fc861cca9d4418e5e5 (patch)
treebb0ecdbd2ec6705b58b95259f26d79974d951bd2 /miniTamTam
parent11f6e14f15f24e40f396d68c3415a793ce544df7 (diff)
Added Drum5 in minitamtam
Diffstat (limited to 'miniTamTam')
-rw-r--r--miniTamTam/miniTamTamMain.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index b8bf123..c7831db 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -126,7 +126,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,408)
+ geneSlider.set_size_request(15,335)
geneAdjustment.connect("value_changed" , self.handleGenerationSlider)
geneSlider.connect("button-release-event", self.handleGenerationSliderRelease)
geneSliderBox.pack_start(self.geneSliderBoxImgTop, False, padding=10)
@@ -139,7 +139,7 @@ class miniTamTamMain(SubActivity):
beatAdjustment = gtk.Adjustment(value=self.beat, lower=2, upper=12, step_incr=1, page_incr=0, page_size=0)
beatSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutjaune.png", beatAdjustment, 5, snap = 1 )
beatSlider.set_inverted(True)
- beatSlider.set_size_request(15,408)
+ beatSlider.set_size_request(15,335)
beatAdjustment.connect("value_changed" , self.handleBeatSlider)
beatSlider.connect("button-release-event", self.handleBeatSliderRelease)
beatSliderBox.pack_start(self.beatSliderBoxImgTop, False, padding=10)
@@ -152,7 +152,7 @@ class miniTamTamMain(SubActivity):
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", tempoAdjustment, 5)
tempoSlider.set_inverted(True)
- tempoSlider.set_size_request(15,408)
+ tempoSlider.set_size_request(15,335)
tempoAdjustment.connect("value_changed" , self.handleTempoSliderChange)
tempoSlider.connect("button-release-event", self.handleTempoSliderRelease)
tempoSliderBox.pack_start(self.tempoSliderBoxImgTop, False, padding=10)
@@ -173,6 +173,7 @@ class miniTamTamMain(SubActivity):
#Generation Button Box
geneVBox = gtk.VBox()
geneTopBox = gtk.HBox()
+ geneMidBox = gtk.HBox()
geneLowBox = gtk.HBox()
generationDrumBtn1 = ImageRadioButton(group = None , mainImg_path = Config.IMAGE_ROOT + 'drum1kit.png' , altImg_path = Config.IMAGE_ROOT + 'drum1kitselgen.png')
@@ -187,13 +188,18 @@ class miniTamTamMain(SubActivity):
generationDrumBtn4.connect('clicked' , self.handleGenerationDrumBtn , 'drum4kit')
geneLowBox.pack_start(generationDrumBtn3, True)
geneLowBox.pack_start(generationDrumBtn4, True)
+ generationDrumBtn5 = ImageRadioButton(group = generationDrumBtn1 , mainImg_path = Config.IMAGE_ROOT + 'drum5kit.png' , altImg_path = Config.IMAGE_ROOT + 'drum5kitselgen.png')
+ generationDrumBtn5.connect('clicked' , self.handleGenerationDrumBtn , 'drum5kit')
+ geneMidBox.pack_start(generationDrumBtn5, True)
geneVBox.pack_start(geneTopBox, True)
+ geneVBox.pack_start(geneMidBox, True)
geneVBox.pack_start(geneLowBox, True)
geneButtonBox.pack_start(geneVBox,True)
self.tooltips.set_tip(generationDrumBtn1,Tooltips.JAZZ)
self.tooltips.set_tip(generationDrumBtn2,Tooltips.ARAB)
self.tooltips.set_tip(generationDrumBtn3,Tooltips.AFRI)
self.tooltips.set_tip(generationDrumBtn4,Tooltips.ELEC)
+ self.tooltips.set_tip(generationDrumBtn5,Tooltips.BRES)
#Transport Button Box
self.seqRecordButton = ImageToggleButton(Config.IMAGE_ROOT + 'record2.png', Config.IMAGE_ROOT + 'record2sel.png')