Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Edit/EditToolbars.py10
-rw-r--r--NEWS4
-rw-r--r--SynthLab/SynthLabToolbars.py1
-rw-r--r--SynthLab/SynthLabWindow.py27
-rwxr-xr-xTamTam.py2
-rw-r--r--Util/ThemeWidgets.py35
-rw-r--r--icons/dice.svg50
-rw-r--r--icons/preset1.svg11
-rw-r--r--icons/tempo1.svg8
-rw-r--r--icons/tempo2.svg9
-rw-r--r--icons/tempo3.svg8
-rw-r--r--icons/tempo4.svg9
-rw-r--r--icons/tempo5.svg9
-rw-r--r--icons/tempo6.svg11
-rw-r--r--icons/tempo7.svg9
-rw-r--r--icons/tempo8.svg10
-rw-r--r--icons/voltemp.svg16
-rw-r--r--icons/volume0.svg10
-rw-r--r--icons/volume1.svg12
-rw-r--r--icons/volume2.svg14
-rw-r--r--icons/volume3.svg16
-rw-r--r--miniTamTam/miniTamTamMain.py2
22 files changed, 252 insertions, 31 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 67bf1ce..8de42c6 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -41,10 +41,8 @@ class mainToolbar(gtk.Toolbar):
self.rewindButton.show()
#Record button
- self._generationPalette = generationPalette(_('Generation'), self.edit)
self.recordButton = ToggleToolButton('record')
#self.recordButton.connect(None)
- self.recordButton.set_palette(self._generationPalette)
self.insert(self.recordButton, -1)
self.recordButton.show()
@@ -68,6 +66,14 @@ class mainToolbar(gtk.Toolbar):
self.insert(self.volumeTempoButton, -1)
self.volumeTempoButton.show()
+ #Generation button
+ self._generationPalette = generationPalette(_('Generation'), self.edit)
+ self.generationButton = ToggleToolButton('dice')
+ #self.generationButton.connect(None)
+ self.generationButton.set_palette(self._generationPalette)
+ self.insert(self.generationButton, -1)
+ self.generationButton.show()
+
#Properties button
self._propsPalette = propsPalette(_('Properties'), self.edit)
self.propsButton = ToggleToolButton('props')
diff --git a/NEWS b/NEWS
index d1f1ec5..eba7f6f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-35
+34
+
+* Synthlab sugar integration (olipet, Flipo)
33
diff --git a/SynthLab/SynthLabToolbars.py b/SynthLab/SynthLabToolbars.py
index 39df99a..a87cca7 100644
--- a/SynthLab/SynthLabToolbars.py
+++ b/SynthLab/SynthLabToolbars.py
@@ -32,6 +32,7 @@ class mainToolbar(gtk.Toolbar):
self.durationSlider = gtk.HScale(adjustment = self.durationSliderAdj)
self.durationSlider.set_size_request(250,15)
self.durationSlider.set_inverted(False)
+ self.durationSlider.set_value_pos(gtk.POS_RIGHT)
self.durationSliderTool = gtk.ToolItem()
self.durationSliderTool.add(self.durationSlider)
self.insert(self.durationSliderLabelTool, -1)
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index 092c836..da2f8fa 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -11,7 +11,7 @@ from gettext import gettext as _
import os
from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.graphics.combobox import ComboBox
+from Util.ThemeWidgets import BigComboBox
import Config
from Util.ThemeWidgets import *
@@ -124,14 +124,14 @@ class SynthLabWindow(SubActivity):
self.mainBox.pack_start(self.subBox)
menuBox = gtk.HBox()
- self.objComboBox = ComboBox()
+ self.objComboBox = BigComboBox()
self.objComboBox.append_item(0, 'adsr', Config.IMAGE_ROOT + '/adsr.png')
self.objComboBox.set_active(0)
self.objComboBox.connect('changed', self.changeObject)
comboMenu = ToolComboBox(self.objComboBox)
menuBox.pack_start(comboMenu)
self.infoBox.pack_start(menuBox, False, False, 5)
-
+
slidersBox = gtk.HBox()
#fake values
@@ -164,6 +164,7 @@ class SynthLabWindow(SubActivity):
slider4Init = parametersTable[tablePos+3]
sliderTextColor = gtk.gdk.color_parse(Config.WHITE_COLOR)
+ sliderHeight = 268
self.p1Adjust = gtk.Adjustment(slider1Init, slider1Min, slider1Max, slider1Step, slider1Step, 0)
self.p1Adjust.connect("value-changed", self.sendTables, 1)
@@ -172,7 +173,7 @@ class SynthLabWindow(SubActivity):
self.slider1.connect("enter-notify-event", self.handleSliderEnter, 1)
self.slider1.set_digits(slider1Snap)
self.slider1.set_inverted(True)
- self.slider1.set_size_request(55, 300)
+ self.slider1.set_size_request(55, sliderHeight)
self.slider1.modify_fg(gtk.STATE_NORMAL, sliderTextColor)
slidersBox.pack_start(self.slider1, True, False)
@@ -183,7 +184,7 @@ class SynthLabWindow(SubActivity):
self.slider2.connect("enter-notify-event", self.handleSliderEnter, 2)
self.slider2.set_digits(slider2Snap)
self.slider2.set_inverted(True)
- self.slider2.set_size_request(55, 300)
+ self.slider2.set_size_request(55, sliderHeight)
self.slider2.modify_fg(gtk.STATE_NORMAL, sliderTextColor)
slidersBox.pack_start(self.slider2, True, False)
@@ -194,7 +195,7 @@ class SynthLabWindow(SubActivity):
self.slider3.connect("enter-notify-event", self.handleSliderEnter, 3)
self.slider3.set_digits(slider3Snap)
self.slider3.set_inverted(True)
- self.slider3.set_size_request(55, 300)
+ self.slider3.set_size_request(55, sliderHeight)
self.slider3.modify_fg(gtk.STATE_NORMAL, sliderTextColor)
slidersBox.pack_start(self.slider3, True, False)
@@ -205,7 +206,7 @@ class SynthLabWindow(SubActivity):
self.slider4.connect("enter-notify-event", self.handleSliderEnter, 4)
self.slider4.set_digits(2)
self.slider4.set_inverted(True)
- self.slider4.set_size_request(55, 300)
+ self.slider4.set_size_request(55, sliderHeight)
self.slider4.modify_fg(gtk.STATE_NORMAL, sliderTextColor)
slidersBox.pack_start(self.slider4, True, False)
@@ -305,6 +306,9 @@ class SynthLabWindow(SubActivity):
self.changeObject(self.objComboBox)
else:
self.updateViewer()
+ #Not sure about this
+ self.slider1.grab_focus()
+ self.sendTables(self.slider1, 1)
def changeObject(self, widget):
self.choosenType = widget.props.value
@@ -424,7 +428,6 @@ class SynthLabWindow(SubActivity):
def handleSliderEnter(self, widget, data, slider):
widget.grab_focus()
self.sendTables(widget, slider)
- self.updateViewer()
def onKeyPress(self,widget,event):
key = event.hardware_keycode
@@ -720,10 +723,10 @@ class SynthLabWindow(SubActivity):
choosen = SynthLabConstants.CHOOSE_TYPE[obj/4][self.typesTable[obj]]
_str = Tooltips.SYNTHTYPES[obj/4][self.typesTable[obj]] + ': ' + Tooltips.SYNTHPARA[choosen][gate[1]]
if gate[0] == 1:
- gateNum = self.overGate[1]+1
- exec 'self.slider%s.grab_focus()' % str(gateNum)
- exec 'self.sendTables(self.slider%s, %d)' % (str(gateNum), gateNum)
- self.updateViewer()
+ if True:
+ gateNum = self.overGate[1]+1
+ exec 'self.slider%s.grab_focus()' % str(gateNum)
+ exec 'self.sendTables(self.slider%s, %d)' % (str(gateNum), gateNum)
self.parameterUpdate( _str )
def startDragObject( self, i ):
diff --git a/TamTam.py b/TamTam.py
index 10bd33f..7beef59 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -186,7 +186,7 @@ class TamTam(Activity):
if Config.DEBUG > 3: print 'DEBUG: TamTam::onFocusOut in TamTam.py'
csnd = new_csound_client()
csnd.connect(False)
-
+
def onKeyPress(self, widget, event):
if Config.DEBUG > 5: print 'DEBUG: TamTam::onKeyPress in TamTam.py'
if event.state == gtk.gdk.MOD1_MASK:
diff --git a/Util/ThemeWidgets.py b/Util/ThemeWidgets.py
index a63b452..f1b0105 100644
--- a/Util/ThemeWidgets.py
+++ b/Util/ThemeWidgets.py
@@ -2,6 +2,8 @@ import pygtk
pygtk.require( '2.0' )
import gtk
+from sugar.graphics.combobox import ComboBox
+
class ITYPE:
PIXBUF = 0
@@ -1119,3 +1121,36 @@ class keyButton(gtk.Button):
def set_strokecolor(self,r,g,b):
self.strokecolor = [r,g,b]
self.queue_draw()
+
+class BigComboBox(ComboBox):
+ def __init__(self):
+ ComboBox.__init__(self)
+
+ def append_item(self, action_id, text, icon_name=None):
+ if not self._icon_renderer and icon_name:
+ self._icon_renderer = gtk.CellRendererPixbuf()
+
+ settings = self.get_settings()
+ w, h = gtk.icon_size_lookup_for_settings(settings, gtk.ICON_SIZE_MENU)
+ self._icon_renderer.props.stock_size = w
+
+ self.pack_start(self._icon_renderer, False)
+ self.add_attribute(self._icon_renderer, 'pixbuf', 2)
+
+ if not self._text_renderer and text:
+ self._text_renderer = gtk.CellRendererText()
+ self.pack_end(self._text_renderer, True)
+ self.add_attribute(self._text_renderer, 'text', 1)
+
+ if icon_name:
+ size = gtk.ICON_SIZE_LARGE_TOOLBAR
+
+ width, height = gtk.icon_size_lookup(size)
+ if icon_name[0:6] == "theme:":
+ icon_name = self._get_real_name_from_theme(icon_name[6:], size)
+ pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon_name, width, height)
+ else:
+ pixbuf = None
+
+ self._model.append([action_id, text, pixbuf, False])
+
diff --git a/icons/dice.svg b/icons/dice.svg
new file mode 100644
index 0000000..cd970f7
--- /dev/null
+++ b/icons/dice.svg
@@ -0,0 +1,50 @@
+<?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="56.688px" height="55.499px" viewBox="0 0 56.688 55.499" enable-background="new 0 0 56.688 55.499" xml:space="preserve">
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#666666" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M55.24,16.389l-6.92,17.14c-1.28,3.15-4.87,4.67-8.02,3.4l-17.14-6.92c-3.15-1.28-4.67-4.87-3.4-8.02l6.92-17.14
+ c1.28-3.15,4.87-4.67,8.02-3.4l17.14,6.92C54.99,9.648,56.51,13.238,55.24,16.389z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M42.62,26.479c1.35,0.55,2.01,2.08,1.46,3.44c-0.55,1.35-2.08,2-3.44,1.46c-1.35-0.55-2-2.09-1.45-3.44
+ C39.73,26.588,41.27,25.929,42.62,26.479z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M38.73,17.318c1.35,0.54,2.01,2.08,1.46,3.43c-0.55,1.35-2.08,2.01-3.44,1.46c-1.35-0.55-2-2.08-1.45-3.44
+ C35.84,17.418,37.38,16.769,38.73,17.318z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M34.84,8.148c1.35,0.55,2.01,2.09,1.46,3.44c-0.55,1.35-2.08,2-3.44,1.46c-1.35-0.55-2-2.09-1.45-3.44
+ C31.95,8.258,33.49,7.599,34.84,8.148z"/>
+</g>
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#666666" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M35.48,21.539l4.01,20.62c0.74,3.79-1.74,7.47-5.53,8.2l-20.62,4.01c-3.79,0.74-7.47-1.74-8.2-5.53l-4.01-20.62
+ c-0.74-3.79,1.74-7.47,5.53-8.2l20.62-4.01C31.07,15.269,34.75,17.749,35.48,21.539z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M26.65,23.258c1.63-0.32,3.2,0.75,3.52,2.37c0.31,1.63-0.75,3.2-2.37,3.52c-1.63,0.32-3.21-0.75-3.52-2.37
+ C23.96,25.148,25.021,23.579,26.65,23.258z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M29.701,38.968c1.63-0.32,3.2,0.74,3.52,2.37c0.32,1.63-0.75,3.2-2.37,3.52c-1.63,0.31-3.2-0.75-3.52-2.38
+ C27.011,40.858,28.081,39.278,29.701,38.968z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M14,42.019c1.62-0.32,3.2,0.75,3.51,2.37c0.32,1.63-0.74,3.2-2.37,3.52c-1.62,0.32-3.2-0.75-3.52-2.37
+ C11.311,43.909,12.371,42.338,14,42.019z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M20.32,32.639c1.63-0.32,3.2,0.75,3.52,2.37c0.32,1.63-0.74,3.2-2.37,3.52c-1.63,0.32-3.2-0.75-3.52-2.37
+ C17.641,34.528,18.701,32.958,20.32,32.639z"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" stroke="#CCCCCC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M10.94,26.309c1.63-0.31,3.21,0.75,3.52,2.38c0.32,1.62-0.74,3.2-2.37,3.51c-1.63,0.32-3.2-0.74-3.52-2.37
+ C8.261,28.198,9.32,26.628,10.94,26.309z"/>
+</g>
+</svg>
diff --git a/icons/preset1.svg b/icons/preset1.svg
index 90caf4b..9673b82 100644
--- a/icons/preset1.svg
+++ b/icons/preset1.svg
@@ -2,12 +2,11 @@
<!-- 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">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.105,-0.168 4.105,44.832 39.086,44.832 39.207,8.969
- 30.071,0.072 "/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.948,0.12 29.948,9.293 39.249,9.293 "/>
+ width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444
+ 35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.043 35.334,15.753 44.168,15.753 "/>
<g>
- <path fill="#FFFFFF" d="M20.031,19.622h-0.038l-2.352,1.118l-0.474-2.162l3.262-1.516h2.389v12.325h-2.786L20.031,19.622
- L20.031,19.622z"/>
+ <path fill="#FFFFFF" d="M26.749,26.727h-0.036L24.48,27.79l-0.45-2.053l3.097-1.44h2.27V36h-2.647V26.727z"/>
</g>
</svg>
diff --git a/icons/tempo1.svg b/icons/tempo1.svg
new file mode 100644
index 0000000..bb9aeec
--- /dev/null
+++ b/icons/tempo1.svg
@@ -0,0 +1,8 @@
+<?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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M23.5,6.5c3,3,7,7,9,11c-7,5-4,6-3,26c-1,1-8,1-9,0c0,0,2,1,2-1
+ c0-3-2-7-2-11c0-2,1-4,1-6c0-3-2-1-2-3c0-3,3-8,3-11c0-2-1-1-2-2v-3H23.5z"/>
+</svg>
diff --git a/icons/tempo2.svg b/icons/tempo2.svg
new file mode 100644
index 0000000..4a98310
--- /dev/null
+++ b/icons/tempo2.svg
@@ -0,0 +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) -->
+<!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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M27.5,44.5v-3C28.5,42.5,28.5,43.5,27.5,44.5z M26.5,10.5
+ c2,2,2,6,2,8c0,4-3,11-3,13s4,7,7,10c-2,2-4,3-5,5h-6c1-1,2-3,2-5c0-3-2-9-3-14c0,0,0-1-1,0v-6c0-3,3-8,3-11c0-1-2-2-2-6h3
+ C23.5,5.5,26.5,9.5,26.5,10.5z"/>
+</svg>
diff --git a/icons/tempo3.svg b/icons/tempo3.svg
new file mode 100644
index 0000000..bd893bd
--- /dev/null
+++ b/icons/tempo3.svg
@@ -0,0 +1,8 @@
+<?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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M30.5,17.5c0,3-2,2-2,4c0,3,4,14,7,21c-1,0-3,1-5,1c1-1,2,0,2-3
+ c0-2-4-7-6-10c-3,3-5,8-7,13c-1,0-3-1-4-1c3-3,7-14,7-18s-1-3-4-4c3-2,4-8,4-14h3C23.5,9.5,30.5,14.5,30.5,17.5z"/>
+</svg>
diff --git a/icons/tempo4.svg b/icons/tempo4.svg
new file mode 100644
index 0000000..6fa5afa
--- /dev/null
+++ b/icons/tempo4.svg
@@ -0,0 +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) -->
+<!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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M34.5,22.5c-1-1-2-4-5-6c-1,2,0,3,0,6c0,2-3,4-3,7c0,2,4,2,4,4
+ c0,3-1,4-2,5c0-1,0-3-1-4c-1,3-2,7-3,10c-4-3,0-6,0-9s-3-11-4-17l-4,4c1-5,8.25-11.12,7.25-16.12c0.68,0.68,3.029,0,2.87,2.12
+ C26.5,10.25,33.62,17.75,34.5,22.5z"/>
+</svg>
diff --git a/icons/tempo5.svg b/icons/tempo5.svg
new file mode 100644
index 0000000..9500e7e
--- /dev/null
+++ b/icons/tempo5.svg
@@ -0,0 +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) -->
+<!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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M24.5,13.5c2,1,5,3,5,6c0,2-2,3-2,5c0,9,11,4,11,13c-1,0-3-2-4-3
+ c-3-1-9,1-10-3c-2,3-5,7-7,11c-3,0-3-1-4-1c0-2,3-3,4-6s4-8,4-10c0-3-1-3-2-5c-1,0-2,1-3,2c0-1,2-3,2-4c1-2,3-5,2-8c0,0,1-1,4-2
+ C25.5,9.5,25.5,11.5,24.5,13.5z"/>
+</svg>
diff --git a/icons/tempo6.svg b/icons/tempo6.svg
new file mode 100644
index 0000000..9844fd6
--- /dev/null
+++ b/icons/tempo6.svg
@@ -0,0 +1,11 @@
+<?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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M22.5,10.5c3,2,7,5,7,7c0,3-4,8-4,10c0,3,1,3,1,5h5l2-2l2,2v4
+ c-1,0-3-2-5-2c-3,0-5,1-8,1c-1,3-2,7-2,10h-5c1-1,3-3,3-4c1-5,1-11,1-18l-1-1c-1,1-1.75,2.88-2.75,2.88c0,0-0.25-0.63-0.25-1.63
+ c4-4,2-8.25,2-13.25c0-1,0.25-2.5,0.38-5.38L22.5,5.5C23.12,6.5,22.5,8.5,22.5,10.5z"/>
+<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" points="
+ 25,20 25.25,16.75 26.5,17.88 "/>
+</svg>
diff --git a/icons/tempo7.svg b/icons/tempo7.svg
new file mode 100644
index 0000000..54bed80
--- /dev/null
+++ b/icons/tempo7.svg
@@ -0,0 +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) -->
+<!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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M20.5,7.5c1,1,1,3,1,4c10,4,8,6,8,14c0,2,6,9,10,13c-1,2-2,4-4,5
+ c1.62-8.88-8.75-13.88-12-15c-1,1-1,0-1,2c0,3,2,5,3,7c-1,1-3,2-6,2c0-1,2-1,2-4c0-2-4-4-4-6c0-3,3-4,5-6c-3-8-8-2-11-6h6
+ c0-1,1,0,1-3c0-2-1-1-2-2l1-5H20.5z"/>
+</svg>
diff --git a/icons/tempo8.svg b/icons/tempo8.svg
new file mode 100644
index 0000000..2c0154f
--- /dev/null
+++ b/icons/tempo8.svg
@@ -0,0 +1,10 @@
+<?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="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M20.5,12.5c0.67,0.4,0.4,1.9,1.75,2.25s1.05-0.38,1.5-0.37
+ c4.971,0,10.95-0.88,11.75,7.12c-1-2-3-4-5-5l-4,1c1,2,4,4,5,7c1,1,1,4,1,6c3,3,8-1,11,6c-2.88-0.82-4.25-2.62-12.75-2.75
+ c-1.561-0.02-2.34-1.561-3.75-1.87c-3.42-0.76-4.67-0.38-5.5-0.38c-3,0-8,7-11,7c-2,0-3-1-3-2c4,2,8-4,9-7c2-1,5-1,8-3c-2-4-6-5-8-3
+ l-6-6l2-2c1,1,1,2,1,4c1,0,4.12,0.38,6.12-0.62L16.5,17.5v-5H20.5z"/>
+</svg>
diff --git a/icons/voltemp.svg b/icons/voltemp.svg
index a7a0a7a..e8ed7e0 100644
--- a/icons/voltemp.svg
+++ b/icons/voltemp.svg
@@ -3,14 +3,14 @@
<!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="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M5.76,20.303c0-1.355,1.13-2.455,2.5-2.455h40
- c1.381,0,2.5,1.1,2.5,2.455c0,1.345-1.119,2.455-2.5,2.455h-40C6.89,22.758,5.76,21.648,5.76,20.303z"/>
-<path fill="#FFFFFF" d="M33.43,20.303c0,2.798-2.31,5.066-5.17,5.066c-2.85,0-5.16-2.268-5.16-5.066c0-2.808,2.31-5.076,5.16-5.076
- C31.12,15.227,33.43,17.495,33.43,20.303z"/>
+<path fill="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M0.245,18.559c0-2.208,1.38-4,3.052-4h48.836
+ c1.686,0,3.052,1.792,3.052,4c0,2.19-1.366,4-3.052,4H3.296C1.625,22.559,0.245,20.75,0.245,18.559z"/>
+<path fill="#FFFFFF" d="M33.774,18.644c0,3.25-2.683,5.885-6.006,5.885c-3.31,0-5.995-2.635-5.995-5.885
+ c0-3.262,2.685-5.897,5.995-5.897C31.092,12.747,33.774,15.381,33.774,18.644z"/>
<g>
- <path fill="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M5.76,35.188c0-1.346,1.13-2.455,2.5-2.455h40
- c1.381,0,2.5,1.109,2.5,2.455c0,1.354-1.119,2.454-2.5,2.454h-40C6.89,37.643,5.76,36.542,5.76,35.188z"/>
+ <path fill="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M0.185,38.365c0-2.191,1.38-4,3.052-4h48.835
+ c1.687,0,3.053,1.809,3.053,4c0,2.206-1.366,4-3.053,4H3.237C1.564,42.365,0.185,40.571,0.185,38.365z"/>
</g>
-<path fill="#FFFFFF" d="M20.76,34.696c0,2.808-2.31,5.076-5.16,5.076c-2.859,0-5.169-2.269-5.169-5.076
- c0-2.797,2.31-5.066,5.169-5.066C18.45,29.63,20.76,31.899,20.76,34.696z"/>
+<path fill="#FFFFFF" d="M20.799,38.388c0,3.323-2.684,6.007-5.995,6.007c-3.322,0-6.005-2.685-6.005-6.007
+ c0-3.31,2.684-5.993,6.005-5.993C18.115,32.395,20.799,35.078,20.799,38.388z"/>
</svg>
diff --git a/icons/volume0.svg b/icons/volume0.svg
new file mode 100644
index 0000000..963ebf0
--- /dev/null
+++ b/icons/volume0.svg
@@ -0,0 +1,10 @@
+<?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="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<g>
+ <path fill="#FFFFFF" d="M6.23,13.818c0,1.617-1.312,2.931-2.934,2.931c-1.618,0-2.931-1.313-2.931-2.931
+ c0-1.614,1.312-2.93,2.932-2.93C4.918,10.889,6.23,12.204,6.23,13.818z"/>
+</g>
+</svg>
diff --git a/icons/volume1.svg b/icons/volume1.svg
new file mode 100644
index 0000000..a23fb00
--- /dev/null
+++ b/icons/volume1.svg
@@ -0,0 +1,12 @@
+<?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="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M8.929,7.078c3.546,3.548,3.546,9.297,0,12.846"
+ />
+<g>
+ <path fill="#FFFFFF" d="M6.23,13.818c0,1.617-1.312,2.931-2.934,2.931c-1.618,0-2.931-1.313-2.931-2.931
+ c0-1.614,1.312-2.93,2.932-2.93C4.918,10.889,6.23,12.204,6.23,13.818z"/>
+</g>
+</svg>
diff --git a/icons/volume2.svg b/icons/volume2.svg
new file mode 100644
index 0000000..7b719e4
--- /dev/null
+++ b/icons/volume2.svg
@@ -0,0 +1,14 @@
+<?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="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M14.574,4.015c5.242,5.236,5.242,13.73,0,18.973"
+ />
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M8.929,7.078c3.546,3.548,3.546,9.297,0,12.846"
+ />
+<g>
+ <path fill="#FFFFFF" d="M6.23,13.818c0,1.617-1.312,2.931-2.934,2.931c-1.618,0-2.931-1.313-2.931-2.931
+ c0-1.614,1.312-2.93,2.932-2.93C4.918,10.889,6.23,12.204,6.23,13.818z"/>
+</g>
+</svg>
diff --git a/icons/volume3.svg b/icons/volume3.svg
new file mode 100644
index 0000000..db92a17
--- /dev/null
+++ b/icons/volume3.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="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M14.574,4.015c5.242,5.236,5.242,13.73,0,18.973"
+ />
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M8.929,7.078c3.546,3.548,3.546,9.297,0,12.846"
+ />
+<g>
+ <path fill="#FFFFFF" d="M6.23,13.818c0,1.617-1.312,2.931-2.934,2.931c-1.618,0-2.931-1.313-2.931-2.931
+ c0-1.614,1.312-2.93,2.932-2.93C4.918,10.889,6.23,12.204,6.23,13.818z"/>
+</g>
+<path fill="none" stroke="#FFFFFF" stroke-width="2.25" stroke-linecap="round" d="M20.135,0.528
+ c7.166,7.164,7.166,18.777-0.002,25.943"/>
+</svg>
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index c1725ac..a1ccd63 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -505,7 +505,7 @@ class miniTamTamMain(SubActivity):
img = int(self.scale( self.tempo,
Config.PLAYER_TEMPO_LOWER,Config.PLAYER_TEMPO_UPPER,
- 1,8))
+ 1,9))
self.tempoSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'tempo' + str(img) + '.png')
def handleBalanceSlider(self, adj):
generated by cgit v0.9.1 at 2024-05-05 20:42:42 (GMT)