diff options
-rw-r--r-- | Edit/EditToolbars.py | 38 | ||||
-rw-r--r-- | icons/diceB.svg | 27 | ||||
-rw-r--r-- | icons/recordK.svg | 16 | ||||
-rw-r--r-- | icons/recordO.svg | 18 |
4 files changed, 83 insertions, 16 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index 9c54847..68f8901 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -48,12 +48,14 @@ class mainToolbar(gtk.Toolbar): self.playButtonHandler = self.playButton.connect('toggled', self.handlePlayPause) 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() @@ -66,14 +68,20 @@ class mainToolbar(gtk.Toolbar): self.pauseButtonImg.show() #Record button - self._recordPalette = recordPalette(_('Record'), self.edit) - self.recordButton = ToggleToolButton('record') - self.recordButton.set_palette(self._recordPalette) + self.recordButton = ToggleToolButton('recordK') self.recordButton.connect('clicked', self.edit.handleKeyboardRecordButton) 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) + self.insert(self.recordOggButton, -1) + self.recordOggButton.show() + self.recordOggButton.set_tooltip(_('Record to ogg')) - _insertSeparator(16) + _insertSeparator(12) #Pointer button self._pointerPalette = pointerPalette(_('Select Tool'), self.edit) @@ -99,13 +107,14 @@ class mainToolbar(gtk.Toolbar): self.insert(self.paintButton, -1) self.paintButton.show() - _insertSeparator(17) + _insertSeparator(14) #Duplicate button self.duplicateButton = ToggleToolButton('duplicate') self.duplicateButton.connect('toggled', self.handleDuplicate) self.insert(self.duplicateButton, -1) self.duplicateButton.show() + self.duplicateButton.set_tooltip(_('Duplicate')) #Volume / Tempo button self._volumeTempoPalette = volumeTempoPalette(_('Volume / Tempo'), self.edit) @@ -155,6 +164,14 @@ class generateToolbar(gtk.Toolbar): self.tooltips = gtk.Tooltips() + #BigGeneration button + self.bigGenerationButton = ToolButton('diceB') + #self.generationButton.connect(None) + self.insert(self.bigGenerationButton, -1) + self.bigGenerationButton.show() + + _insertSeparator(50) + #Generation button self._generationPalette = generationPalette(_('Generation'), self.edit) self.generationButton = ToggleToolButton('dice') @@ -170,17 +187,6 @@ class generateToolbar(gtk.Toolbar): self.insert(self.propsButton, -1) self.propsButton.show() -class recordPalette(Palette): - def __init__(self, label, edit): - Palette.__init__(self, label) - - self.edit = edit - - self.recordOggButton = ImageButton(Config.TAM_TAM_ROOT + '/icons/record.svg') - self.recordOggButton.connect('clicked', self.edit.handleAudioRecord) - self.recordOggButton.show() - self.set_content(self.recordOggButton) - class pointerPalette(Palette): def __init__(self, label, edit): Palette.__init__(self, label) diff --git a/icons/diceB.svg b/icons/diceB.svg new file mode 100644 index 0000000..9336ad9 --- /dev/null +++ b/icons/diceB.svg @@ -0,0 +1,27 @@ +<?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="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<path fill="none" stroke="#C8C8C8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M19.406,5.889l23.942,5.085
+ c4.4,0.933,7.219,5.267,6.274,9.665l-5.085,23.941c-0.934,4.401-5.268,7.219-9.663,6.278l-23.943-5.09
+ c-4.4-0.929-7.218-5.265-6.275-9.663l5.084-23.94C10.673,7.762,15.009,4.943,19.406,5.889z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M17.646,14.184
+ c0.398-1.894,2.26-3.091,4.143-2.696c1.891,0.409,3.091,2.261,2.697,4.146c-0.398,1.894-2.266,3.101-4.145,2.696
+ C18.448,17.929,17.247,16.077,17.646,14.184z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M35.884,18.062
+ c0.397-1.893,2.248-3.093,4.143-2.694c1.896,0.396,3.096,2.26,2.697,4.141c-0.409,1.892-2.265,3.093-4.155,2.693
+ C36.688,21.809,35.479,19.942,35.884,18.062z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M30.97,41.183
+ c0.393-1.885,2.26-3.092,4.14-2.687c1.894,0.399,3.097,2.252,2.694,4.146c-0.393,1.885-2.259,3.09-4.144,2.694
+ C31.772,44.928,30.568,43.074,30.97,41.183z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M12.725,37.314
+ c0.412-1.893,2.266-3.104,4.156-2.694c1.884,0.396,3.094,2.251,2.686,4.141c-0.396,1.894-2.25,3.095-4.142,2.695
+ C13.533,41.047,12.33,39.195,12.725,37.314z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M15.151,25.922
+ c0.399-1.894,2.26-3.091,4.143-2.696c1.89,0.409,3.09,2.261,2.697,4.145c-0.399,1.894-2.266,3.101-4.145,2.697
+ C15.953,29.667,14.752,27.815,15.151,25.922z"/>
+<path fill="#CCCCCC" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M33.39,29.8
+ c0.396-1.893,2.247-3.093,4.142-2.694c1.896,0.396,3.096,2.26,2.697,4.141c-0.409,1.891-2.264,3.093-4.154,2.692
+ C34.193,33.547,32.984,31.681,33.39,29.8z"/>
+</svg>
diff --git a/icons/recordK.svg b/icons/recordK.svg new file mode 100644 index 0000000..bd1e58c --- /dev/null +++ b/icons/recordK.svg @@ -0,0 +1,16 @@ +<?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="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<g>
+ <circle fill="#808284" cx="27" cy="27" r="22.5"/>
+ <circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="26.999" cy="27.092" r="18.677"/>
+ <path fill="#FFFFFF" d="M34.895,27c0,4.354-3.541,7.895-7.895,7.895c-4.354,0-7.895-3.541-7.895-7.895
+ c0-4.354,3.54-7.895,7.895-7.895C31.354,19.105,34.895,22.646,34.895,27z"/>
+</g>
+<g enable-background="new ">
+ <path fill="#FFFFFF" d="M35.615,30.777h4.377v8.638h0.087c0.435-0.753,0.898-1.449,1.333-2.145l4.435-6.493h5.42l-6.463,8.318
+ l6.812,11.217h-5.16l-4.782-8.434l-1.681,2.058v6.376h-4.377V30.777z"/>
+</g>
+</svg>
diff --git a/icons/recordO.svg b/icons/recordO.svg new file mode 100644 index 0000000..83f8cfe --- /dev/null +++ b/icons/recordO.svg @@ -0,0 +1,18 @@ +<?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="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<g>
+ <circle fill="#808284" cx="27" cy="27" r="22.5"/>
+ <circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="26.999" cy="27" r="18.677"/>
+ <path fill="#FFFFFF" d="M34.895,27c0,4.354-3.541,7.895-7.895,7.895S19.104,31.354,19.104,27c0-4.354,3.54-7.895,7.895-7.895
+ C31.354,19.105,34.895,22.646,34.895,27z"/>
+</g>
+<g>
+ <path fill="none" stroke="#FFFFFF" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" d="M31,42.936
+ c0.043,0.068,4.286-17.459,10.357,0"/>
+ <path fill="none" stroke="#FFFFFF" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" d="M51,41.445
+ c-0.045-0.068-4.286,17.461-10.357,0"/>
+</g>
+</svg>
|