diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | Resources/Images/helpShow1.jpg | bin | 32978 -> 32969 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow2.jpg | bin | 87879 -> 87871 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow3.jpg | bin | 79394 -> 79367 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow4.jpg | bin | 63889 -> 63870 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow5.jpg | bin | 75381 -> 75364 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow6.jpg | bin | 60254 -> 60244 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow7.jpg | bin | 52719 -> 52708 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow8.jpg | bin | 70321 -> 70312 bytes | |||
| -rwxr-xr-x | Resources/Images/helpShow9.jpg | bin | 52311 -> 52295 bytes | |||
| -rw-r--r-- | icons/minusrec.svg | 15 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 8 | ||||
| -rw-r--r-- | miniTamTam/miniToolbars.py | 6 |
13 files changed, 28 insertions, 5 deletions
@@ -1,6 +1,8 @@ 33 -* +* Added Sugar Toolbar to miniTamTam and Synthlab (Flipo) +* Network now working in miniTamTam, use the share button on the activity toolbar (lync) +* Added help subsystem (ethrop, lejames) 32 diff --git a/Resources/Images/helpShow1.jpg b/Resources/Images/helpShow1.jpg Binary files differindex f452054..885db27 100755 --- a/Resources/Images/helpShow1.jpg +++ b/Resources/Images/helpShow1.jpg diff --git a/Resources/Images/helpShow2.jpg b/Resources/Images/helpShow2.jpg Binary files differindex 8f4cdd2..009e58e 100755 --- a/Resources/Images/helpShow2.jpg +++ b/Resources/Images/helpShow2.jpg diff --git a/Resources/Images/helpShow3.jpg b/Resources/Images/helpShow3.jpg Binary files differindex 9fee5f8..b3858aa 100755 --- a/Resources/Images/helpShow3.jpg +++ b/Resources/Images/helpShow3.jpg diff --git a/Resources/Images/helpShow4.jpg b/Resources/Images/helpShow4.jpg Binary files differindex 8c0177f..21acecf 100755 --- a/Resources/Images/helpShow4.jpg +++ b/Resources/Images/helpShow4.jpg diff --git a/Resources/Images/helpShow5.jpg b/Resources/Images/helpShow5.jpg Binary files differindex e18acd4..f7d47d6 100755 --- a/Resources/Images/helpShow5.jpg +++ b/Resources/Images/helpShow5.jpg diff --git a/Resources/Images/helpShow6.jpg b/Resources/Images/helpShow6.jpg Binary files differindex 9df826c..8b548e3 100755 --- a/Resources/Images/helpShow6.jpg +++ b/Resources/Images/helpShow6.jpg diff --git a/Resources/Images/helpShow7.jpg b/Resources/Images/helpShow7.jpg Binary files differindex b27573e..58f6f1a 100755 --- a/Resources/Images/helpShow7.jpg +++ b/Resources/Images/helpShow7.jpg diff --git a/Resources/Images/helpShow8.jpg b/Resources/Images/helpShow8.jpg Binary files differindex 93b9671..c135fa8 100755 --- a/Resources/Images/helpShow8.jpg +++ b/Resources/Images/helpShow8.jpg diff --git a/Resources/Images/helpShow9.jpg b/Resources/Images/helpShow9.jpg Binary files differindex 9258cb8..6a1e01a 100755 --- a/Resources/Images/helpShow9.jpg +++ b/Resources/Images/helpShow9.jpg diff --git a/icons/minusrec.svg b/icons/minusrec.svg new file mode 100644 index 0000000..242cfa2 --- /dev/null +++ b/icons/minusrec.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576) -->
+<!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="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
+<circle fill="#808284" cx="22.297" cy="23.037" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.295" cy="23.129" r="21.572"/>
+<g>
+ <path fill="#FFFFFF" d="M13.319,16.993h2.72v5.364h0.055c0.27-0.468,0.558-0.898,0.828-1.333l2.755-4.031h3.367l-4.018,5.167
+ l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.719L13.319,16.993L13.319,16.993z"/>
+</g>
+<circle fill="none" cx="22.628" cy="22.89" r="17.085"/>
+<text transform="matrix(1 0 0 1 25.1145 23.8645)" fill="#FFFFFF" font-family="'MyriadPro-Bold'" font-size="16">-</text>
+<circle fill="none" stroke="#4C4D4F" cx="22.628" cy="22.89" r="17.085"/>
+</svg>
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) |
