[Sugar-devel] [PATCH] Record: use a different icon for each entry in duration and timer combo boxes

Manuel Quiñones manuq at laptop.org
Mon Jul 25 01:41:23 EDT 2011


As discussed in the mailing list [1], this is not the ideal solution,
but is better than the previous one, having each entry the same icon.

[1]: http://lists.sugarlabs.org/archive/sugar-devel/2011-July/032344.html

This removes the custom class IconComboBox that was created for the
same-icons combos, and returns to the usage of ToolComboBox.

Signed-off-by: Manuel Quiñones <manuq at laptop.org>
---
 iconcombobox.py      |   41 ---------
 icons/duration.svg   |  193 -------------------------------------------
 icons/duration_a.svg |  159 +++++++++++++++++++++++++++++++++++
 icons/duration_b.svg |  159 +++++++++++++++++++++++++++++++++++
 icons/duration_c.svg |  159 +++++++++++++++++++++++++++++++++++
 icons/timer.svg      |  192 ------------------------------------------
 icons/timer_a.svg    |  174 +++++++++++++++++++++++++++++++++++++++
 icons/timer_b.svg    |  199 ++++++++++++++++++++++++++++++++++++++++++++
 icons/timer_c.svg    |  224 ++++++++++++++++++++++++++++++++++++++++++++++++++
 record.py            |   25 ++++--
 10 files changed, 1091 insertions(+), 434 deletions(-)
 delete mode 100644 iconcombobox.py
 delete mode 100644 icons/duration.svg
 create mode 100644 icons/duration_a.svg
 create mode 100644 icons/duration_b.svg
 create mode 100644 icons/duration_c.svg
 delete mode 100644 icons/timer.svg
 create mode 100644 icons/timer_a.svg
 create mode 100644 icons/timer_b.svg
 create mode 100644 icons/timer_c.svg

diff --git a/iconcombobox.py b/iconcombobox.py
deleted file mode 100644
index d5eb807..0000000
--- a/iconcombobox.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#Copyright (c) 2011 One Laptop per Child
-
-#Permission is hereby granted, free of charge, to any person obtaining a copy
-#of this software and associated documentation files (the "Software"), to deal
-#in the Software without restriction, including without limitation the rights
-#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#copies of the Software, and to permit persons to whom the Software is
-#furnished to do so, subject to the following conditions:
-
-#The above copyright notice and this permission notice shall be included in
-#all copies or substantial portions of the Software.
-
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#THE SOFTWARE.
-
-import gtk
-
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics import style
-
-
-class IconComboBox(gtk.ToolItem):
-    def __init__(self, icon_name, **kwargs):
-        gtk.ToolItem.__init__(self, **kwargs)
-
-        self.icon_name = icon_name
-        self.set_border_width(style.DEFAULT_PADDING)
-
-        self.combo = ComboBox()
-        self.combo.set_focus_on_click(False)
-        self.combo.show()
-
-        self.add(self.combo)
-
-    def append_item(self, i, text):
-        self.combo.append_item(i, text, icon_name=self.icon_name)
diff --git a/icons/duration.svg b/icons/duration.svg
deleted file mode 100644
index 43cd335..0000000
--- a/icons/duration.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   contentScriptType="text/ecmascript"
-   width="55px"
-   zoomAndPan="magnify"
-   contentStyleType="text/css"
-   height="55px"
-   preserveAspectRatio="xMidYMid meet"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="timer.svg">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1024"
-     inkscape:window-height="525"
-     id="namedview19"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="36.253557"
-     inkscape:cy="28.65546"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="all"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="path3791"
-       sodipodi:cx="24.629629"
-       sodipodi:cy="24.25926"
-       sodipodi:rx="21.296297"
-       sodipodi:ry="21.296297"
-       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
-       transform="matrix(0.89950544,0,0,0.89950544,5.3455146,7.678664)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="timer"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27.605804,29.867439 8.04512,-11.042322"
-       id="path3897"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="duration"
-     style="display:inline">
-    <path
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       d="m 36.539789,13.013087 c 9.161862,4.992537 12.541772,16.466949 7.549234,25.628815 L 27.5,29.602112 z"
-       id="path4311"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="-9.4478671"
-       inkscape:transform-center-y="-3.7746184" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4283"
-       d="M 27.571522,30.159444 39.546676,36.73611"
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:transform-center-x="-6.1363368"
-       inkscape:transform-center-y="3.4538125" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Capa"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <g
-       style="display:inline"
-       id="g4315">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3811"
-         d="m 27.5,15.555556 0,3.888889"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 41.444444,29.5 -3.888889,0"
-         id="path3823"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3829"
-         d="m 13.555556,29.5 3.888889,0"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 27.5,43.444444 0,-3.888889"
-         id="path3854"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4076"
-         d="m 22.873381,5.940543 9.622594,0"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 38.96491,8.681773 5.209549,3.91786"
-         id="path4080"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4107"
-         d="m 16.03509,8.681773 -5.209549,3.91786"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <path
-       transform="matrix(0.89950544,0,0,0.89950544,5.3455146,7.6786635)"
-       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
-       sodipodi:ry="21.296297"
-       sodipodi:rx="21.296297"
-       sodipodi:cy="24.25926"
-       sodipodi:cx="24.629629"
-       id="path4380"
-       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="timer2"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <g
-       id="g4198"
-       style="stroke-width:1.69182169;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-       transform="matrix(0.88661828,0,0,0.88661828,43.331119,7.0338455)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4190"
-         d="m 3.6632464,51.336754 0,-12.532159"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 9.9293259,45.070674 -12.532159,0"
-         id="path4192"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4194"
-         d="M 8.0940337,49.501461 -0.76754091,40.639887"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 8.0940334,40.639887 -8.86157401,8.861574"
-         id="path4196"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/icons/duration_a.svg b/icons/duration_a.svg
new file mode 100644
index 0000000..72e0a7c
--- /dev/null
+++ b/icons/duration_a.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="duration_b.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="7.4650131"
+     inkscape:cx="21.312816"
+     inkscape:cy="30.858757"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+       d="m 30.706158,9.5024374 c 4.580931,2.4962676 7.716374,6.6130046 9.082517,11.2509076 l -18.122306,5.338116 z"
+       id="path4311"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-x="-9.4478671"
+       inkscape:transform-center-y="-3.7746184" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4283"
+       d="M 21.811642,26.484562 34.733496,22.048057"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       inkscape:transform-center-x="-6.6834378"
+       inkscape:transform-center-y="-2.2170045" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline" />
+</svg>
diff --git a/icons/duration_b.svg b/icons/duration_b.svg
new file mode 100644
index 0000000..01c0234
--- /dev/null
+++ b/icons/duration_b.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="record_timer-duration_2.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="7.4650131"
+     inkscape:cx="21.312816"
+     inkscape:cy="30.858757"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer2" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+       d="M 30.706158,9.5024374 C 39.86802,14.494973 43.24793,25.969385 38.255392,35.131252 L 21.666369,26.091461 z"
+       id="path4311"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-x="-9.4478671"
+       inkscape:transform-center-y="-3.7746184" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4283"
+       d="M 21.737891,26.648793 33.713045,33.22546"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       inkscape:transform-center-x="-6.1363368"
+       inkscape:transform-center-y="3.4538125" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline" />
+</svg>
diff --git a/icons/duration_c.svg b/icons/duration_c.svg
new file mode 100644
index 0000000..5ca1e09
--- /dev/null
+++ b/icons/duration_c.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="duration_b.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="7.4650131"
+     inkscape:cx="21.312816"
+     inkscape:cy="30.858757"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+       d="M 30.706158,9.5024374 C 43.083018,21.996634 41.908348,36.284169 28.878315,43.838537 L 21.666369,26.091461 z"
+       id="path4311"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-x="-9.4478671"
+       inkscape:transform-center-y="-3.7746184" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4283"
+       d="m 21.606636,26.705139 5.509495,12.502093"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       inkscape:transform-center-x="-2.7722523"
+       inkscape:transform-center-y="6.4728715" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline" />
+</svg>
diff --git a/icons/timer.svg b/icons/timer.svg
deleted file mode 100644
index 134a0a1..0000000
--- a/icons/timer.svg
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   contentScriptType="text/ecmascript"
-   width="55px"
-   zoomAndPan="magnify"
-   contentStyleType="text/css"
-   height="55px"
-   preserveAspectRatio="xMidYMid meet"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="record_timer-duration.svg">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1024"
-     inkscape:window-height="525"
-     id="namedview19"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="36.253557"
-     inkscape:cy="28.65546"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="all"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="path3791"
-       sodipodi:cx="24.629629"
-       sodipodi:cy="24.25926"
-       sodipodi:rx="21.296297"
-       sodipodi:ry="21.296297"
-       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
-       transform="matrix(0.89950544,0,0,0.89950544,5.3455146,7.678664)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="timer"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27.605804,29.867439 8.04512,-11.042322"
-       id="path3897"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="duration"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       d="m 36.539789,13.013087 c 9.161862,4.992537 12.541772,16.466949 7.549234,25.628815 L 27.5,29.602112 z"
-       id="path4311"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="-9.4478671"
-       inkscape:transform-center-y="-3.7746184" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4283"
-       d="M 27.571522,30.159444 39.546676,36.73611"
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:transform-center-x="-6.1363368"
-       inkscape:transform-center-y="3.4538125" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Capa"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <g
-       style="display:inline"
-       id="g4315">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3811"
-         d="m 27.5,15.555556 0,3.888889"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 41.444444,29.5 -3.888889,0"
-         id="path3823"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3829"
-         d="m 13.555556,29.5 3.888889,0"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 27.5,43.444444 0,-3.888889"
-         id="path3854"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4076"
-         d="m 22.873381,5.940543 9.622594,0"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 38.96491,8.681773 5.209549,3.91786"
-         id="path4080"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4107"
-         d="m 16.03509,8.681773 -5.209549,3.91786"
-         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <path
-       transform="matrix(0.89950544,0,0,0.89950544,5.3455146,7.6786635)"
-       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
-       sodipodi:ry="21.296297"
-       sodipodi:rx="21.296297"
-       sodipodi:cy="24.25926"
-       sodipodi:cx="24.629629"
-       id="path4380"
-       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="timer2"
-     style="display:inline">
-    <g
-       id="g4198"
-       style="stroke-width:1.69182165;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-       transform="matrix(0.88661828,0,0,0.88661828,43.331119,7.0338455)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4190"
-         d="m 3.6632464,51.336754 0,-12.532159"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182165;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182165;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 9.9293259,45.070674 -12.532159,0"
-         id="path4192"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4194"
-         d="M 8.0940337,49.501461 -0.76754091,40.639887"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182165;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.69182165;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 8.0940334,40.639887 -8.86157401,8.861574"
-         id="path4196"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/icons/timer_a.svg b/icons/timer_a.svg
new file mode 100644
index 0000000..a73bd62
--- /dev/null
+++ b/icons/timer_a.svg
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="timer_c.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="5.5442514"
+     inkscape:cx="27.249494"
+     inkscape:cy="27.546711"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer5" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="M 21.41862,26.710342 29.46374,15.668021"
+       id="path3897"
+       inkscape:connector-curvature="0" />
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline">
+    <g
+       transform="matrix(0.7232101,0,0,0.74604598,35.162404,15.374614)"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       id="g3943">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         id="path3945"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3947"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         id="path3949"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/timer_b.svg b/icons/timer_b.svg
new file mode 100644
index 0000000..51c68a7
--- /dev/null
+++ b/icons/timer_b.svg
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="timer_a.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#13243c"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="5.5442514"
+     inkscape:cx="24.093071"
+     inkscape:cy="27.546711"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer5" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="M 21.41862,26.710342 29.46374,15.668021"
+       id="path3897"
+       inkscape:connector-curvature="0" />
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline">
+    <g
+       id="g4198"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       transform="matrix(0.7232101,0,0,0.74604598,40.700293,15.374614)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4190"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         id="path4192"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4194"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         id="path4196"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.7232101,0,0,0.74604598,29.39066,15.374614)"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       id="g3943">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         id="path3945"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3947"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         id="path3949"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/timer_c.svg b/icons/timer_c.svg
new file mode 100644
index 0000000..e75a45a
--- /dev/null
+++ b/icons/timer_c.svg
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   width="55px"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   height="55px"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="timer_a.svg">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="527"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="5.5442514"
+     inkscape:cx="27.249494"
+     inkscape:cy="27.546711"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="all"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3791"
+       sodipodi:cx="24.629629"
+       sodipodi:cy="24.25926"
+       sodipodi:rx="21.296297"
+       sodipodi:ry="21.296297"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166981,4.5215674)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="timer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="duration"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Capa"
+     style="display:inline">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="M 21.41862,26.710342 29.46374,15.668021"
+       id="path3897"
+       inkscape:connector-curvature="0" />
+    <g
+       style="display:inline"
+       id="g4315"
+       transform="translate(-6.1871844,-3.1570962)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3811"
+         d="m 27.5,15.555556 0,3.888889"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 41.444444,29.5 -3.888889,0"
+         id="path3823"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3829"
+         d="m 13.555556,29.5 3.888889,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 27.5,43.444444 0,-3.888889"
+         id="path3854"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4076"
+         d="m 22.873381,5.940543 9.622594,0"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 38.96491,8.681773 5.209549,3.91786"
+         id="path4080"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4107"
+         d="m 16.03509,8.681773 -5.209549,3.91786"
+         style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       transform="matrix(0.89950544,0,0,0.89950544,-0.84166979,4.5215673)"
+       d="m 45.925926,24.25926 a 21.296297,21.296297 0 1 1 -42.5925939,0 21.296297,21.296297 0 1 1 42.5925939,0 z"
+       sodipodi:ry="21.296297"
+       sodipodi:rx="21.296297"
+       sodipodi:cy="24.25926"
+       sodipodi:cx="24.629629"
+       id="path4380"
+       style="fill:none;stroke:#000000;stroke-width:3.89102697;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="timer2"
+     style="display:inline">
+    <g
+       id="g4198"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       transform="matrix(0.7232101,0,0,0.74604598,46.472037,15.374614)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4190"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         id="path4192"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4194"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         id="path4196"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.7232101,0,0,0.74604598,35.162404,15.374614)"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       id="g3943">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         id="path3945"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3947"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         id="path3949"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g3953"
+       style="stroke-width:1.84091818;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       transform="matrix(0.7232101,0,0,0.74604598,23.852772,15.374614)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3955"
+         d="m 3.6632464,51.336754 0,-12.532159"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.9293259,45.070674 -12.532159,0"
+         id="path3957"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3959"
+         d="M 8.0940337,49.501461 -0.76754091,40.639887"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.84091818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 8.0940334,40.639887 -8.86157401,8.861574"
+         id="path3961"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/record.py b/record.py
index e6c7bb3..be02ea3 100644
--- a/record.py
+++ b/record.py
@@ -49,7 +49,6 @@ import utils
 from tray import HTray
 from mediaview import MediaView
 import hw
-from iconcombobox import IconComboBox
 
 logger = logging.getLogger('record.py')
 COLOR_BLACK = gdk.color_parse('#000000')
@@ -881,18 +880,23 @@ class RecordControl():
         self.quality.combo.set_active(idx)
 
 
-class TimerCombo(IconComboBox):
+class TimerCombo(ToolComboBox):
     TIMERS = (0, 5, 10)
+    ICON_FILENAMES = {0: 'timer_a',
+                      5: 'timer_b',
+                      10: 'timer_c'}
 
     def __init__(self):
-        super(TimerCombo, self).__init__('timer')
+        super(TimerCombo, self).__init__()
+        self.combo.set_focus_on_click(False)
         
         for i in self.TIMERS:
+            icon_name = self.ICON_FILENAMES[i]
             if i == 0:
-                self.append_item(i, _('Immediate'))
+                self.combo.append_item(i, _('Immediate'), icon_name=icon_name)
             else:
                 string = TimerCombo._seconds_string(i)
-                self.append_item(i, string)
+                self.combo.append_item(i, string, icon_name=icon_name)
         self.combo.set_active(0)
 
     def get_value(self):
@@ -909,15 +913,20 @@ class TimerCombo(IconComboBox):
         return ngettext('%s second', '%s seconds', x) % x
 
 
-class DurationCombo(IconComboBox):
+class DurationCombo(ToolComboBox):
     DURATIONS = (2, 4, 6)
+    ICON_FILENAMES = {2: 'duration_a',
+                      4: 'duration_b',
+                      6: 'duration_c'}
 
     def __init__(self):
-        super(DurationCombo, self).__init__('duration')
+        super(DurationCombo, self).__init__()
+        self.combo.set_focus_on_click(False)
 
         for i in self.DURATIONS:
+            icon_name = self.ICON_FILENAMES[i]
             string = DurationCombo._minutes_string(i)
-            self.append_item(i, string)
+            self.combo.append_item(i, string, icon_name=icon_name)
         self.combo.set_active(0)
 
     def get_value(self):
-- 
1.7.4.4



More information about the Sugar-devel mailing list