diff options
author | Oli <olivier.belanger@umontreal.ca> | 2007-08-03 00:33:28 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2007-08-03 00:33:28 (GMT) |
commit | 9f8413d7828142b054f8e8b91bd515aa86b08e81 (patch) | |
tree | c7221fc902eefe753e8f52cfc4fb3fad82d6ce5f | |
parent | fa5d2f34b3bdd079002b5e57038a5ef7b92dc8fa (diff) |
synthlab's display fine tunning
-rwxr-xr-x | Resources/Images/adsr+.svg | 4 | ||||
-rwxr-xr-x | Resources/Images/lfo+.svg | 14 | ||||
-rwxr-xr-x | Resources/Images/rand+.svg | 16 | ||||
-rwxr-xr-x | Resources/Images/speaker.svg | 13 | ||||
-rwxr-xr-x | Resources/Images/trackpadX+.svg | 16 | ||||
-rwxr-xr-x | Resources/Images/trackpadY+.svg | 16 | ||||
-rw-r--r-- | SynthLab/SynthLabWindow.py | 17 |
7 files changed, 57 insertions, 39 deletions
diff --git a/Resources/Images/adsr+.svg b/Resources/Images/adsr+.svg index 487fe2d..bbf18d5 100755 --- a/Resources/Images/adsr+.svg +++ b/Resources/Images/adsr+.svg @@ -4,8 +4,8 @@ <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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
<g>
- <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="3.188,4.512 7.583,0.5 71.418,0.5
- 75.812,4.512 75.812,48.352 58.312,73.125 23.107,73.125 3.188,48.352 "/>
+ <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812
+ 69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>
<circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>
<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="28.171" y1="21.042" x2="33.98" y2="30.479"/>
diff --git a/Resources/Images/lfo+.svg b/Resources/Images/lfo+.svg index cf98f53..4bdaa74 100755 --- a/Resources/Images/lfo+.svg +++ b/Resources/Images/lfo+.svg @@ -3,12 +3,12 @@ <!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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
-<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="3.188,4.512 7.583,0.5 71.418,0.5
- 75.812,4.512 75.812,48.352 58.312,73.125 23.107,73.125 3.188,48.352 "/>
+<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,9.569 9.615,5.812
+ 69.386,5.812 73.5,9.569 73.5,50.617 57.114,73.812 24.151,73.812 5.5,50.617 "/>
<circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="19.482" x2="18.11" y2="48.688"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="34.122" x2="63.11" y2="34.072"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="50.444" y1="22.607" x2="62.411" y2="34.607"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="28.451" y1="44.413" x2="50.337" y2="22.528"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="18.725" y1="34.688" x2="28.451" y2="44.413"/>
+<line fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="23.482" x2="18.11" y2="52.688"/>
+<line fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="38.122" x2="63.109" y2="38.072"/>
+<line fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="50.443" y1="26.607" x2="62.411" y2="38.607"/>
+<line fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="28.451" y1="48.413" x2="50.337" y2="26.528"/>
+<line fill="none" stroke="#2D2B2B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="18.725" y1="38.688" x2="28.451" y2="48.413"/>
</svg>
diff --git a/Resources/Images/rand+.svg b/Resources/Images/rand+.svg index 61af30d..62d89d1 100755 --- a/Resources/Images/rand+.svg +++ b/Resources/Images/rand+.svg @@ -3,15 +3,15 @@ <!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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
-<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="3.188,4.512 7.583,0.5 71.418,0.5
- 75.812,4.512 75.812,48.352 58.312,73.125 23.107,73.125 3.188,48.352 "/>
+<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812
+ 69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>
<circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>
<line fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="19.482" x2="18.11" y2="48.688"/>
<line fill="none" stroke="#333333" stroke-width="1.08" stroke-linecap="round" stroke-linejoin="round" x1="18.11" y1="34.122" x2="63.109" y2="34.072"/>
-<polyline fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="
- 29.849,22.684 26.539,41.294 19.04,26.295 "/>
-<polyline fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="
- 45.152,24.78 39.747,46.976 31.062,22.684 "/>
-<polyline fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="
- 64.04,50.892 59.241,20.589 51.16,29.881 45.454,25.083 "/>
+<polyline fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="29.849,22.684
+ 26.539,41.294 19.04,26.295 "/>
+<polyline fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="45.152,24.78
+ 39.747,46.977 31.062,22.684 "/>
+<polyline fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="64.04,50.893
+ 59.241,20.589 51.16,29.881 45.454,25.083 "/>
</svg>
diff --git a/Resources/Images/speaker.svg b/Resources/Images/speaker.svg new file mode 100755 index 0000000..b0d38a5 --- /dev/null +++ b/Resources/Images/speaker.svg @@ -0,0 +1,13 @@ +<?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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FF0000" stroke="#333333" stroke-linecap="square" d="M29.528,20.354h23.383
+ c0,0,15.076,31.692,15.125,31.841c0.906,2.764-2.504,4.239-2.372,4.239c2.787,0-31.64-0.082-49.519-0.109
+ c-4.499-0.007-1.047-5.316-1.12-5.175C13.697,53.729,29.528,20.354,29.528,20.354z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FF0000" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" d="
+ M65.648,5.702c3.083,0,5.57,1.493,5.57,3.358v11.194c0,1.866-2.487,3.358-5.57,3.358H16.792c-3.084,0-5.572-1.493-5.572-3.358V9.061
+ c0-1.866,2.488-3.358,5.572-3.358H65.648z"/>
+<circle fill-rule="evenodd" clip-rule="evenodd" fill="#FF0000" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="41.816" cy="5.479" r="4.726"/>
+</svg>
diff --git a/Resources/Images/trackpadX+.svg b/Resources/Images/trackpadX+.svg index f97bc32..8122fed 100755 --- a/Resources/Images/trackpadX+.svg +++ b/Resources/Images/trackpadX+.svg @@ -3,20 +3,20 @@ <!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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
-<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="3.188,4.512 7.583,0.5 71.418,0.5
- 75.812,4.512 75.812,48.352 58.312,73.125 23.107,73.125 3.188,48.352 "/>
+<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812
+ 69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>
<circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>
-<rect x="19.5" y="14.499" fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="40" height="40.002"/>
+<rect x="19.5" y="14.499" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="40" height="40.002"/>
<g>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="22.411" x2="39.641" y2="49.913"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="22.411" x2="39.641" y2="49.913"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="21.411" x2="31.861" y2="28.91"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="21.411" x2="31.861" y2="28.91"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="49.438" x2="31.861" y2="41.938"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="49.438" x2="31.861" y2="41.938"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="21.16" x2="47.139" y2="28.661"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="21.16" x2="47.139" y2="28.661"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="49.69" x2="47.139" y2="42.188"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="49.689" x2="47.139" y2="42.188"/>
</g>
</svg>
diff --git a/Resources/Images/trackpadY+.svg b/Resources/Images/trackpadY+.svg index 9b47723..51bac2e 100755 --- a/Resources/Images/trackpadY+.svg +++ b/Resources/Images/trackpadY+.svg @@ -3,20 +3,20 @@ <!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="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
-<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="3.188,4.512 7.583,0.5 71.418,0.5
- 75.812,4.512 75.812,48.352 58.312,73.125 23.107,73.125 3.188,48.352 "/>
+<polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812
+ 69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>
<circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>
-<rect x="17.001" y="10.8" fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="44.998" height="45"/>
+<rect x="17.001" y="10.8" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="44.998" height="45"/>
<g>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="24.734" y1="34.017" x2="55.7" y2="34.017"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="24.734" y1="34.017" x2="55.7" y2="34.017"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="22.734" y1="34.396" x2="31.203" y2="42.831"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="22.734" y1="34.396" x2="31.203" y2="42.831"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="55.859" y1="34.396" x2="47.451" y2="42.831"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="55.859" y1="34.396" x2="47.451" y2="42.831"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="23.327" y1="34.017" x2="31.796" y2="25.549"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="23.327" y1="34.017" x2="31.796" y2="25.549"/>
- <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="56.266" y1="34.017" x2="47.858" y2="25.549"/>
+ <line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="56.266" y1="34.017" x2="47.857" y2="25.549"/>
</g>
</svg>
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index f120fa9..e22a722 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -125,7 +125,7 @@ class SynthLabWindow(SubActivity): menuBox = gtk.HBox() self.objComboBox = BigComboBox() - self.objComboBox.append_item(0, 'adsr', Config.IMAGE_ROOT + '/adsr.png') + self.objComboBox.append_item(0, 'adsr', Config.TAM_TAM_ROOT + '/icons/adsr-menu.svg') self.objComboBox.set_active(0) self.objComboBox.connect('changed', self.changeObject) comboMenu = ToolComboBox(self.objComboBox) @@ -214,12 +214,20 @@ class SynthLabWindow(SubActivity): self.infoText = 'ADSR envelope apply on the overall signal' textBox = gtk.HBox() + text_color = gtk.gdk.color_parse(Config.WHITE_COLOR) + text_bg_color = gtk.gdk.color_parse(Config.TOOLBAR_BCK_COLOR) textScroller = gtk.ScrolledWindow() textScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) textScroller.set_size_request(270, 310) self.textBuf = gtk.TextBuffer(None) self.textBuf.set_text(self.infoText) self.textViewer = gtk.TextView(self.textBuf) + self.textViewer.modify_text(gtk.STATE_NORMAL, text_color) + self.textViewer.modify_base(gtk.STATE_NORMAL, text_bg_color) + self.textViewer.set_border_window_size(gtk.TEXT_WINDOW_LEFT, 1) + self.textViewer.set_border_window_size(gtk.TEXT_WINDOW_RIGHT, 1) + self.textViewer.set_border_window_size(gtk.TEXT_WINDOW_TOP, 1) + self.textViewer.set_border_window_size(gtk.TEXT_WINDOW_BOTTOM, 1) self.textViewer.set_wrap_mode(gtk.WRAP_WORD) self.textViewer.set_editable(False) self.textViewer.set_overwrite(True) @@ -294,7 +302,7 @@ class SynthLabWindow(SubActivity): self.objectType = self.instanceID / 4 self.objComboBox.remove_all() for obj in SynthLabConstants.CHOOSE_TYPE[self.objectType]: - self.objComboBox.append_item(SynthLabConstants.CHOOSE_TYPE[self.objectType].index(obj), obj, Config.IMAGE_ROOT + '/' + obj + '.png') + self.objComboBox.append_item(SynthLabConstants.CHOOSE_TYPE[self.objectType].index(obj), obj, Config.TAM_TAM_ROOT + '/icons/' + obj + '-menu.svg') oldChoosen = self.choosenType if self.instanceID != 12: @@ -1156,10 +1164,7 @@ class SynthLabWindow(SubActivity): elif i < 8: img = SynthLabConstants.CHOOSE_TYPE_PLUS[1][typesList[i]] elif i < 12: img = SynthLabConstants.CHOOSE_TYPE_PLUS[2][typesList[i]] else: img = "speaker" - if img == 'speaker': - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.png') - else: - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.svg') + pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + img + '.svg') map = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) map.draw_rectangle( gc, True, 0, 0, pix.get_width(), pix.get_height() ) map.draw_pixbuf( gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) |