Merge lp:~costales/unav/0.67-cancel-download into lp:unav

[costales]

Real cancel download

=== added file 'nav/img/voices/no-tick.svg'
--- nav/img/voices/no-tick.svg	1970-01-01 00:00:00 +0000
+++ nav/img/voices/no-tick.svg	2017-03-10 16:20:13 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg4874"
+   height="96"
+   viewBox="0 0 96 96.000001"
+   width="96"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="no-tick.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="725"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="2.4583333"
+     inkscape:cx="48"
+     inkscape:cy="48"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4874" />
+  <metadata
+     id="metadata4879">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>

=== removed file 'nav/img/voices/non-starred.svg'
--- nav/img/voices/non-starred.svg	2017-01-14 23:08:02 +0000
+++ nav/img/voices/non-starred.svg	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   width="96"
-   height="96"
-   id="svg4874"
-   version="1.1"
-   inkscape:version="0.91+devel r"
-   viewBox="0 0 96 96.000001"
-   sodipodi:docname="non-starred.svg">
-  <defs
-     id="defs4876" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6199993"
-     inkscape:cx="-4.3416438"
-     inkscape:cy="69.76867"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4780"
-     showgrid="true"
-     showborder="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5451"
-       empspacing="8" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="8,-8.0000001"
-       id="guide4063" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="4,-8.0000001"
-       id="guide4065" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,88.000001"
-       id="guide4067" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,92.000001"
-       id="guide4069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="104,4"
-       id="guide4071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-5,8.0000001"
-       id="guide4073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="88,-8.0000001"
-       id="guide4077" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,84.000001"
-       id="guide4074" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12,-8.0000001"
-       id="guide4076" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="84,-8.0000001"
-       id="guide4080" />
-    <sodipodi:guide
-       position="48,-8.0000001"
-       orientation="1,0"
-       id="guide4170" />
-    <sodipodi:guide
-       position="-8,48"
-       orientation="0,1"
-       id="guide4172" />
-    <sodipodi:guide
-       position="92,-8.0000001"
-       orientation="1,0"
-       id="guide4760" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4879">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(67.857146,-78.50504)">
-    <g
-       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
-       id="g4845"
-       style="display:inline">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="next01.png"
-         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
-         id="g4778"
-         inkscape:label="Layer 1">
-        <g
-           transform="matrix(-1,0,0,1,575.99999,611)"
-           id="g4780"
-           style="display:inline">
-          <rect
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
-             id="rect4782"
-             width="96.037987"
-             height="96"
-             x="-438.00244"
-             y="345.36221"
-             transform="scale(-1,1)" />
-          <path
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-             d="M 48.021484 8 C 48.021484 8 48.023438 8.0019531 48.023438 8.0019531 C 48.023438 8.0019531 48.025391 8 48.025391 8 L 48.021484 8 z M 48.023438 8.0019531 C 48.020658 8.0024345 48.017186 8.0030924 48.015625 8.0078125 C 48.008625 8.0088121 48.007859 8.0126262 48.005859 8.015625 C 47.999859 8.0186238 47.999047 8.0243449 47.998047 8.0273438 C 47.992047 8.0303426 47.991281 8.0292047 47.988281 8.0332031 C 42.927951 18.893186 39.018172 29.962354 36.794922 36.744141 C 29.481092 36.750138 17.434385 37.027378 5.953125 38.517578 C 5.952125 38.521577 5.9510781 38.522392 5.9550781 38.525391 C 5.9540781 38.532388 5.9598906 38.536164 5.9628906 38.539062 C 5.9638906 38.54606 5.96575 38.548782 5.96875 38.550781 C 5.96975 38.557778 5.9706562 38.555595 5.9726562 38.558594 C 14.737316 46.727322 24.057332 53.865858 29.820312 58.076172 C 27.565103 65.033519 24.105319 76.578677 21.974609 87.958984 C 21.977609 87.960984 21.979375 87.961983 21.984375 87.958984 C 21.990375 87.961983 21.993194 87.956078 21.996094 87.955078 C 22.003094 87.956078 22.007866 87.954125 22.009766 87.953125 C 22.016766 87.954125 22.016531 87.954125 22.019531 87.953125 C 32.497441 82.141414 42.168135 75.48841 47.953125 71.308594 C 53.873275 75.603464 63.783426 82.459396 73.947266 88.001953 C 73.950266 87.999954 73.950219 87.995332 73.949219 87.990234 C 73.953219 87.986236 73.951172 87.979461 73.951172 87.976562 C 73.954172 87.970565 73.953125 87.966743 73.953125 87.964844 C 73.956125 87.958846 73.958984 87.957223 73.958984 87.953125 C 71.669554 76.192038 68.326252 64.939966 66.138672 58.146484 C 72.052872 53.843157 81.633422 46.537088 90.044922 38.583984 C 90.043922 38.580986 90.043109 38.579125 90.037109 38.578125 C 90.034109 38.572127 90.028391 38.571312 90.025391 38.570312 C 90.021391 38.566314 90.013419 38.565453 90.011719 38.564453 C 90.007719 38.560455 90.008906 38.556687 90.003906 38.554688 C 78.111466 37.097764 66.377304 36.800063 59.240234 36.78125 C 56.975133 29.827029 52.986923 18.457674 48.023438 8.0019531 z M 48.021484 18.292969 C 51.110304 25.766972 53.823267 33.067625 55.435547 38.017578 L 56.332031 40.773438 L 59.228516 40.78125 C 64.336616 40.794715 72.076045 41.124943 80.265625 41.757812 C 74.107185 47.009426 67.995863 51.846816 63.783203 54.912109 L 61.441406 56.617188 L 62.330078 59.371094 C 63.895448 64.2323 65.971861 71.694193 67.900391 79.677734 C 61.005081 75.444679 54.517604 71.128064 50.302734 68.070312 L 47.957031 66.371094 L 45.607422 68.066406 C 41.469542 71.056143 35.017477 75.335426 28.023438 79.634766 C 29.919048 71.768427 32.01918 64.262584 33.625 59.308594 L 34.517578 56.556641 L 32.179688 54.847656 C 28.056207 51.835128 21.990151 47.021389 15.738281 41.697266 C 23.804281 41.069284 31.589045 40.746188 36.796875 40.742188 L 39.693359 40.740234 L 40.595703 37.988281 C 42.186103 33.136911 44.890674 25.882296 48.021484 18.292969 z "
-             transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)"
-             id="path4170" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>

=== removed file 'nav/img/voices/starred.svg'
--- nav/img/voices/starred.svg	2017-01-14 14:25:15 +0000
+++ nav/img/voices/starred.svg	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   width="96"
-   height="96"
-   id="svg4874"
-   version="1.1"
-   inkscape:version="0.91+devel r"
-   viewBox="0 0 96 96.000001"
-   sodipodi:docname="starred.svg">
-  <defs
-     id="defs4876" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6199993"
-     inkscape:cx="-4.3416438"
-     inkscape:cy="69.76867"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4780"
-     showgrid="true"
-     showborder="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5451"
-       empspacing="8" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="8,-8.0000001"
-       id="guide4063" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="4,-8.0000001"
-       id="guide4065" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,88.000001"
-       id="guide4067" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,92.000001"
-       id="guide4069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="104,4"
-       id="guide4071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-5,8.0000001"
-       id="guide4073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="88,-8.0000001"
-       id="guide4077" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-8,84.000001"
-       id="guide4074" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12,-8.0000001"
-       id="guide4076" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="84,-8.0000001"
-       id="guide4080" />
-    <sodipodi:guide
-       position="48,-8.0000001"
-       orientation="1,0"
-       id="guide4170" />
-    <sodipodi:guide
-       position="-8,48"
-       orientation="0,1"
-       id="guide4172" />
-    <sodipodi:guide
-       position="92,-8.0000001"
-       orientation="1,0"
-       id="guide4760" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4879">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(67.857146,-78.50504)">
-    <g
-       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
-       id="g4845"
-       style="display:inline">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="next01.png"
-         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
-         id="g4778"
-         inkscape:label="Layer 1">
-        <g
-           transform="matrix(-1,0,0,1,575.99999,611)"
-           id="g4780"
-           style="display:inline">
-          <rect
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
-             id="rect4782"
-             width="96.037987"
-             height="96"
-             x="-438.00244"
-             y="345.36221"
-             transform="scale(-1,1)" />
-          <path
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-             d="m 429.99929,393.33773 c 0,0.004 -9.5e-4,0.007 -0.007,0.009 -0.001,0.007 -0.006,0.007 -0.009,0.009 -0.003,0.006 -0.008,0.008 -0.011,0.009 -0.003,0.006 -0.003,0.006 -0.007,0.009 -10.86428,5.06033 -21.9364,8.97057 -28.72087,11.19382 -0.006,7.31383 -0.28348,19.36 -1.77427,30.84126 -0.004,0.001 -0.006,0.002 -0.009,-0.002 -0.007,10e-4 -0.01,-0.004 -0.0129,-0.007 -0.007,-0.001 -0.009,-0.004 -0.011,-0.007 -0.007,-0.001 -0.006,-0.002 -0.009,-0.004 -8.17196,-8.76466 -15.31373,-18.08322 -19.52571,-23.8462 -6.9601,2.25521 -18.50812,5.71446 -29.89293,7.84517 -0.002,-0.003 -0.003,-0.004 0,-0.009 -0.003,-0.006 0.001,-0.01 0.002,-0.0129 -0.001,-0.007 0.001,-0.011 0.002,-0.0129 -0.001,-0.007 -0.001,-0.008 0,-0.011 5.81401,-10.47791 12.47128,-20.14765 16.65275,-25.93264 -4.29657,-5.92015 -11.1555,-15.83137 -16.70025,-25.99521 0.002,-0.003 0.006,-0.003 0.0111,-0.002 0.004,-0.004 0.01,-0.002 0.0129,-0.002 0.006,-0.003 0.011,-0.002 0.0129,-0.002 0.006,-0.003 0.007,-0.004 0.0111,-0.004 11.76574,2.28943 23.02338,5.63169 29.81955,7.81927 4.30503,-5.9142 11.61263,-15.49511 19.56888,-23.90661 0.003,0.001 0.006,0.003 0.007,0.009 0.006,0.003 0.006,0.008 0.007,0.011 0.004,0.004 0.006,0.0112 0.007,0.0129 0.004,0.004 0.007,0.004 0.009,0.009 1.4575,11.89244 1.75546,23.62651 1.77428,30.76358 6.95749,2.26527 18.3316,6.25356 28.7921,11.21756 z"
-             id="path4170"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>

=== added file 'nav/img/voices/tick.svg'
--- nav/img/voices/tick.svg	1970-01-01 00:00:00 +0000
+++ nav/img/voices/tick.svg	2017-03-10 16:20:13 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4874" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="96" viewBox="0 0 96 96.000001" width="96" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata4879">
+  <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/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(67.857 -78.505)">
+  <rect id="rect4782" style="color:#000000;fill:none" transform="rotate(90)" height="96" width="96" y="-28.143" x="78.505"/>
+  <path id="path4041-9" style="fill:#808080" d="m21.228 99.016-46.196 41.447-26.606-23.802-4.2834 4.8422 30.878 32.49 49.122-51.691z"/>
+ </g>
+</svg>

=== modified file 'po/unav.pot'
--- po/unav.pot	2017-03-07 18:49:43 +0000
+++ po/unav.pot	2017-03-10 16:20:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unav\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 19:49+0100\n"
+"POT-Creation-Date: 2017-03-10 17:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -274,7 +274,7 @@
 msgstr ""
 
 #: nav/index.html.strings:11 qml/Coordinate.qml:152 qml/Coordinate.qml:386
-#: qml/DownloadVoices.qml:244 qml/Main.qml:974
+#: qml/DownloadVoices.qml:250 qml/Main.qml:974
 msgid "Close"
 msgstr ""
 
@@ -401,35 +401,35 @@
 "Expected format is:"
 msgstr ""
 
-#: qml/DownloadVoices.qml:50
+#: qml/DownloadVoices.qml:53
 msgid "Download voices"
 msgstr ""
 
-#: qml/DownloadVoices.qml:58
+#: qml/DownloadVoices.qml:61
 msgid "Play current voice"
 msgstr ""
 
-#: qml/DownloadVoices.qml:67 qml/DownloadVoices.qml:240
+#: qml/DownloadVoices.qml:70 qml/DownloadVoices.qml:246
 msgid "How to add a voice"
 msgstr ""
 
-#: qml/DownloadVoices.qml:158
+#: qml/DownloadVoices.qml:161
 msgid "By "
 msgstr ""
 
-#: qml/DownloadVoices.qml:203
+#: qml/DownloadVoices.qml:208
 msgid "Cancel Download"
 msgstr ""
 
-#: qml/DownloadVoices.qml:218
+#: qml/DownloadVoices.qml:224
 msgid "About the voices"
 msgstr ""
 
-#: qml/DownloadVoices.qml:224
+#: qml/DownloadVoices.qml:230
 msgid "The stars are for the recommended voices."
 msgstr ""
 
-#: qml/DownloadVoices.qml:232
+#: qml/DownloadVoices.qml:238
 msgid "You can add a new voice to uNav following these steps:"
 msgstr ""
 

=== modified file 'qml/DownloadVoices.qml'
--- qml/DownloadVoices.qml	2017-01-22 10:02:06 +0000
+++ qml/DownloadVoices.qml	2017-03-10 16:20:13 +0000
@@ -27,6 +27,7 @@
     
     property string voice: ''
     property bool downloading: false
+    property bool canceled: false
     
     Component.onDestruction: { // Return to Settings
         mainPageStack.executeJavaScript("load_custom_voices(false)");
@@ -40,8 +41,10 @@
         id: singleDownload
         onFinished: {
             downloadVoices.downloading = false;
-            navApp.settings.currentVoice = downloadVoices.voice;
-            py.mvVoice(path);
+            if (!downloadVoices.canceled) {
+                navApp.settings.currentVoice = downloadVoices.voice;
+                py.mvVoice(path);
+            }
         }
     }
 
@@ -135,11 +138,11 @@
 
                 UbuntuShape {
                     aspect: UbuntuShape.Flat
-                    height: units.gu(2); width: height
+                    height: units.gu(3); width: height
                     sourceScale: Qt.vector2d(0.8, 0.8)
                     radius: "small"
                     source: Image {
-                        source: model.starred === 'y' ? Qt.resolvedUrl("../nav/img/voices/starred.svg") : Qt.resolvedUrl("../nav/img/voices/non-starred.svg")
+                        source: model.author === navApp.settings.currentVoice ? Qt.resolvedUrl("../nav/img/voices/tick.svg") : Qt.resolvedUrl("../nav/img/voices/no-tick.svg")
                     }
                     sourceHorizontalAlignment: UbuntuShape.AlignHCenter
                     SlotsLayout.position: SlotsLayout.Leading
@@ -176,8 +179,10 @@
                 
                 downloadVoices.voice = model.author;
                 downloadVoices.downloading = true;
+                downloadVoices.canceled = false;
                 
                 py.rmOlder();
+                
                 singleDownload.download("http://people.ubuntu.com/~costales/unav/voices/unav_" + model.voice_code + ".tar.gz");
             }
         }
@@ -206,6 +211,7 @@
                 onClicked: {
                     singleDownload.cancel
                     downloadVoices.downloading = false;
+                    downloadVoices.canceled = true;
                 }
             }
         }