Merge lp:~ken-vandine/dropping-letters/sound into lp:dropping-letters

[Ken VanDine]

Updated string on toolbar to Sound, it's more appropriate than Volume. Darkened
the sound icon a bit to make it easier to see on the toolbar.

Updated string on toolbar to Sound, it's more appropriate than Volume. Darkened
the sound icon a bit to make it easier to see on the toolbar.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good.

review: Approve

=== modified file 'audio-volume-high-symbolic.svg'
--- audio-volume-high-symbolic.svg	2013-01-22 19:16:44 +0000
+++ audio-volume-high-symbolic.svg	2013-05-07 17:55:30 +0000
@@ -1,31 +1,112 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <metadata id="metadata90">
-  <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>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs id="defs7386">
-  <clipPath id="clipPath6279-3">
-   <rect id="rect6281-9" style="color:#bebebe;fill:#bebebe" height="6.375" width="3.825" y="220.75" x="26.85"/>
-  </clipPath>
-  <clipPath id="clipPath6265-334">
-   <rect id="rect6267-61" style="color:#bebebe;fill:#bebebe" height="5.2159" width="2.8977" y="221.33" x="26.966"/>
-  </clipPath>
-  <clipPath id="clipPath6259-5">
-   <rect id="rect6261-61" style="color:#bebebe;fill:#bebebe" height="4.8735" width="1.8763" y="221.5" x="26.999"/>
-  </clipPath>
- </defs>
- <g id="layer9" transform="translate(-41 -197)">
-  <path id="path3718" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m26.938 220.41a1.2751 1.2751 0 0 0 -0.65625 2.1875c0.75756 0.75756 0.75756 1.9299 0 2.6875a1.2816 1.2816 0 1 0 1.8125 1.8125c1.732-1.732 1.732-4.5805 0-6.3125a1.2751 1.2751 0 0 0 -1.1562 -0.375z" clip-path="url(#clipPath6279-3)" transform="matrix(.78431 0 0 .78431 26.941 28.863)"/>
-  <path id="path3726" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.125 221.09a0.5796 0.5796 0 0 0 -0.34375 1c1.0233 1.0233 1.0233 2.6642 0 3.6875a0.5796 0.5796 0 1 0 0.8125 0.8125c1.4663-1.4663 1.4663-3.8462 0-5.3125a0.5796 0.5796 0 0 0 -0.46875 -0.1875z" clip-path="url(#clipPath6265-334)" transform="matrix(1.7255 0 0 1.7255 3.4708 -181.9)"/>
-  <path id="path3728" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.062 221.31a0.37504 0.37504 0 0 0 -0.125 0.625c1.1015 1.1015 1.1015 2.8985 0 4a0.37565 0.37565 0 1 0 0.53125 0.53125c1.3881-1.3881 1.3881-3.6744 0-5.0625a0.37504 0.37504 0 0 0 -0.40625 -0.0937z" clip-path="url(#clipPath6259-5)" transform="matrix(2.6667 0 0 2.6667 -20 -392.67)"/>
-  <path id="path5491" style="color:#bebebe;fill:#bebebe" d="m41 202h2.4844l2.9688-3 0.54687 0.0156v11l-0.4753 0.00083-3.04-3.02h-2.4844v-5z"/>
- </g>
+
+<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="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="audio-volume-high-symbolic.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1623"
+     inkscape:window-height="861"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <clipPath
+       id="clipPath6279-3">
+      <rect
+         id="rect6281-9"
+         style="color:#bebebe;fill:#bebebe"
+         height="6.375"
+         width="3.825"
+         y="220.75"
+         x="26.85" />
+    </clipPath>
+    <clipPath
+       id="clipPath6265-334">
+      <rect
+         id="rect6267-61"
+         style="color:#bebebe;fill:#bebebe"
+         height="5.2159"
+         width="2.8977"
+         y="221.33"
+         x="26.966" />
+    </clipPath>
+    <clipPath
+       id="clipPath6259-5">
+      <rect
+         id="rect6261-61"
+         style="color:#bebebe;fill:#bebebe"
+         height="4.8735"
+         width="1.8763"
+         y="221.5"
+         x="26.999" />
+    </clipPath>
+  </defs>
+  <g
+     id="layer9"
+     transform="translate(-41 -197)"
+     style="fill:#808080">
+    <path
+       id="path3718"
+       style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#808080"
+       d="m26.938 220.41a1.2751 1.2751 0 0 0 -0.65625 2.1875c0.75756 0.75756 0.75756 1.9299 0 2.6875a1.2816 1.2816 0 1 0 1.8125 1.8125c1.732-1.732 1.732-4.5805 0-6.3125a1.2751 1.2751 0 0 0 -1.1562 -0.375z"
+       clip-path="url(#clipPath6279-3)"
+       transform="matrix(.78431 0 0 .78431 26.941 28.863)" />
+    <path
+       id="path3726"
+       style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#808080"
+       d="m27.125 221.09a0.5796 0.5796 0 0 0 -0.34375 1c1.0233 1.0233 1.0233 2.6642 0 3.6875a0.5796 0.5796 0 1 0 0.8125 0.8125c1.4663-1.4663 1.4663-3.8462 0-5.3125a0.5796 0.5796 0 0 0 -0.46875 -0.1875z"
+       clip-path="url(#clipPath6265-334)"
+       transform="matrix(1.7255 0 0 1.7255 3.4708 -181.9)" />
+    <path
+       id="path3728"
+       style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#808080"
+       d="m27.062 221.31a0.37504 0.37504 0 0 0 -0.125 0.625c1.1015 1.1015 1.1015 2.8985 0 4a0.37565 0.37565 0 1 0 0.53125 0.53125c1.3881-1.3881 1.3881-3.6744 0-5.0625a0.37504 0.37504 0 0 0 -0.40625 -0.0937z"
+       clip-path="url(#clipPath6259-5)"
+       transform="matrix(2.6667 0 0 2.6667 -20 -392.67)" />
+    <path
+       id="path5491"
+       style="color:#bebebe;fill:#808080"
+       d="m41 202h2.4844l2.9688-3 0.54687 0.0156v11l-0.4753 0.00083-3.04-3.02h-2.4844v-5z" />
+  </g>
 </svg>

=== modified file 'audio-volume-muted-symbolic.svg'
--- audio-volume-muted-symbolic.svg	2013-01-22 19:16:44 +0000
+++ audio-volume-muted-symbolic.svg	2013-05-07 17:55:30 +0000
@@ -1,32 +1,115 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata id="metadata90">
-  <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>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <defs id="defs7386">
-  <clipPath id="clipPath6279-2-3" clipPathUnits="userSpaceOnUse">
-   <rect id="rect6281-5-3" style="color:#bebebe;fill:#bebebe" height="6.375" width="3.825" y="220.75" x="26.85"/>
-  </clipPath>
-  <clipPath id="clipPath3668" clipPathUnits="userSpaceOnUse">
-   <rect id="rect3670" style="color:#bebebe;fill:#bebebe" height="3.3729" width="1.8763" y="221.5" x="26.999"/>
-  </clipPath>
-  <clipPath id="clipPath3697" clipPathUnits="userSpaceOnUse">
-   <path id="path3699" style="color:#bebebe;fill:#bebebe" d="m26.966 221.33v5.2159h0.57955v-1.1591h2.3182v-4.0568h-2.8977z"/>
-  </clipPath>
- </defs>
- <g id="layer9" transform="translate(-101 -197)">
-  <path id="path3268" style="opacity:.35;color:#bebebe;fill:#bebebe" d="m101 202h2.4844l2.9688-3 0.54687 0.0156v11l-0.4753 0.00083-3.0403-3.0164h-2.4844v-5z"/>
-  <path id="path3272" style="opacity:.35;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m26.938 220.41a1.2751 1.2751 0 0 0 -0.65625 2.1875c0.75756 0.75756 0.75756 1.9299 0 2.6875a1.2816 1.2816 0 1 0 1.8125 1.8125c1.732-1.732 1.732-4.5805 0-6.3125a1.2751 1.2751 0 0 0 -1.1562 -0.375z" clip-path="url(#clipPath6279-2-3)" transform="matrix(.78431 0 0 .78431 86.941 28.863)"/>
-  <path id="path3274" style="opacity:.35;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.125 221.09a0.5796 0.5796 0 0 0 -0.34375 1c1.0233 1.0233 1.0233 2.6642 0 3.6875a0.5796 0.5796 0 1 0 0.8125 0.8125c1.4663-1.4663 1.4663-3.8462 0-5.3125a0.5796 0.5796 0 0 0 -0.46875 -0.1875z" clip-path="url(#clipPath3697)" transform="matrix(1.7255 0 0 1.7255 63.471 -181.9)"/>
-  <path id="path3276" style="opacity:.35;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.062 221.31a0.37504 0.37504 0 0 0 -0.125 0.625c1.1015 1.1015 1.1015 2.8985 0 4a0.37565 0.37565 0 1 0 0.53125 0.53125c1.3881-1.3881 1.3881-3.6744 0-5.0625a0.37504 0.37504 0 0 0 -0.40625 -0.0937z" clip-path="url(#clipPath3668)" transform="matrix(2.6667 0 0 2.6667 40 -392.67)"/>
-  <path id="path3761-2-3-5-4-8-9-8-0-1-7" style="color:#bebebe;fill:#bebebe" d="m112 208h1.375l1.125 1.0938 1.0938-1.0938h1.4062v1.4688l-1.0938 1.0625 1.0938 1.0625v1.4062h-1.4375l-1.0625-1.0625-1.0625 1.0625h-1.4375v-1.4062l1.0625-1.0625-1.0625-1.0625v-1.4688z"/>
- </g>
+
+<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="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="audio-volume-muted-symbolic.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3834"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer9" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <clipPath
+       id="clipPath6279-2-3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6281-5-3"
+         style="color:#bebebe;fill:#bebebe"
+         height="6.375"
+         width="3.825"
+         y="220.75"
+         x="26.85" />
+    </clipPath>
+    <clipPath
+       id="clipPath3668"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect3670"
+         style="color:#bebebe;fill:#bebebe"
+         height="3.3729"
+         width="1.8763"
+         y="221.5"
+         x="26.999" />
+    </clipPath>
+    <clipPath
+       id="clipPath3697"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         id="path3699"
+         style="color:#bebebe;fill:#bebebe"
+         d="m26.966 221.33v5.2159h0.57955v-1.1591h2.3182v-4.0568h-2.8977z" />
+    </clipPath>
+  </defs>
+  <g
+     id="layer9"
+     transform="translate(-101 -197)">
+    <path
+       id="path3268"
+       style="opacity:0.34999999999999998;color:#bebebe;fill:#4d4d4d"
+       d="m101 202h2.4844l2.9688-3 0.54687 0.0156v11l-0.4753 0.00083-3.0403-3.0164h-2.4844v-5z" />
+    <path
+       id="path3272"
+       style="opacity:0.34999999999999998;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#4d4d4d"
+       d="m26.938 220.41a1.2751 1.2751 0 0 0 -0.65625 2.1875c0.75756 0.75756 0.75756 1.9299 0 2.6875a1.2816 1.2816 0 1 0 1.8125 1.8125c1.732-1.732 1.732-4.5805 0-6.3125a1.2751 1.2751 0 0 0 -1.1562 -0.375z"
+       clip-path="url(#clipPath6279-2-3)"
+       transform="matrix(.78431 0 0 .78431 86.941 28.863)" />
+    <path
+       id="path3274"
+       style="opacity:0.34999999999999998;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#4d4d4d"
+       d="m27.125 221.09a0.5796 0.5796 0 0 0 -0.34375 1c1.0233 1.0233 1.0233 2.6642 0 3.6875a0.5796 0.5796 0 1 0 0.8125 0.8125c1.4663-1.4663 1.4663-3.8462 0-5.3125a0.5796 0.5796 0 0 0 -0.46875 -0.1875z"
+       clip-path="url(#clipPath3697)"
+       transform="matrix(1.7255 0 0 1.7255 63.471 -181.9)" />
+    <path
+       id="path3276"
+       style="opacity:0.34999999999999998;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#4d4d4d"
+       d="m27.062 221.31a0.37504 0.37504 0 0 0 -0.125 0.625c1.1015 1.1015 1.1015 2.8985 0 4a0.37565 0.37565 0 1 0 0.53125 0.53125c1.3881-1.3881 1.3881-3.6744 0-5.0625a0.37504 0.37504 0 0 0 -0.40625 -0.0937z"
+       clip-path="url(#clipPath3668)"
+       transform="matrix(2.6667 0 0 2.6667 40 -392.67)" />
+    <path
+       id="path3761-2-3-5-4-8-9-8-0-1-7"
+       style="color:#bebebe;fill:#4d4d4d"
+       d="m112 208h1.375l1.125 1.0938 1.0938-1.0938h1.4062v1.4688l-1.0938 1.0625 1.0938 1.0625v1.4062h-1.4375l-1.0625-1.0625-1.0625 1.0625h-1.4375v-1.4062l1.0625-1.0625-1.0625-1.0625v-1.4688z" />
+  </g>
 </svg>

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-07 05:05:47 +0000
+++ debian/changelog	2013-05-07 17:55:30 +0000
@@ -1,7 +1,8 @@
-dropping-letters (0.1.1) UNRELEASED; urgency=low
+dropping-letters (0.1.1) raring; urgency=low
 
   * Use a toolbar for volume and new game instead of the small items on the
     bottombar
+  * disable all the audio playback code for now, it is broken on devices
   * Add HUD support
   * debian/control
     - depend on qtdeclarative5-hud1.0

=== modified file 'dropping-letters.qml'
--- dropping-letters.qml	2013-05-07 05:09:41 +0000
+++ dropping-letters.qml	2013-05-07 17:55:30 +0000
@@ -27,8 +27,9 @@
     Page {
         tools: ToolbarActions {
             Action {
-                text: i18n.tr("Volume")
+                text: i18n.tr("Sound")
                 iconSource: (volume.audible ? "audio-volume-high-symbolic.svg" : "audio-volume-muted-symbolic.svg")
+                visible: volume.supportsMedia
                 onTriggered: {
                     volume.audible = !volume.audible;
                 }
@@ -47,6 +48,11 @@
             property int frame: 0
             property bool reverse: false
             property bool audible: true
+            // we are using this to disable audio playback, it is breaking
+            // on devices.  Set this to true when playback is fixed or
+            // find a way to fail gracefully.  When this can be enabled again,
+            // be sure to uncomment all the Audio elements
+            property bool supportsMedia: false
         }
 
         Flipable {
@@ -264,44 +270,50 @@
                     }
                 }
 
+                /* Uncomment this out when volume.supportsMedia can be set to true
                 Audio {
                     id: music
                     source: "Easy_Lemon_60_second.ogg"
-                    autoPlay: true
-                    onStopped: music.play()
+                    autoPlay: volume.supportsMedia
+                    onStopped: {
+                        if (volume.supportsMedia) {
+                            music.play();
+                        }
+                    }
                     muted: !volume.audible
                 }
 
                 Audio {
                     id: click
                     source: "407__tictacshutup__click-1-off-click.ogg"
-                    autoLoad: true
+                    autoLoad: volume.supportsMedia
                     muted: !volume.audible
                 }
 
                 Audio {
                     id: success
                     source: "80921__justinbw__buttonchime02up.ogg"
-                    autoLoad: true
+                    autoLoad: volume.supportsMedia
                     muted: !volume.audible
                 }
 
                 Audio {
                     id: failure
                     source: "106727__kantouth__cartoon-bing-low.ogg"
-                    autoLoad: true
+                    autoLoad: volume.supportsMedia
                     muted: !volume.audible
                 }
 
                 Audio {
                     id: gameover
                     source: "45137__dj-chronos__dark-church-bell.ogg"
-                    autoLoad: true
+                    autoLoad: volume.supportsMedia
                     onStopped: {
                         flipable.flipped = false
                     }
                     muted: !volume.audible
                 }
+                */
 
                 Rectangle {
                     id: bottombar
@@ -394,7 +406,9 @@
                         }
                         function processSuggestedWord() {
                             if (accum.isValid) {
-                                success.play();
+                                if (volume.supportsMedia) {
+                                    success.play();
+                                }
                                 var thisscore = 0, wordlength = accum.text.length;
                                 accum.text = "";
 
@@ -408,7 +422,9 @@
                                 scoredisplay.text = "" + (thisscore * wordlength);
                                 showscoredisplay.start();
                             } else {
-                                failure.play();
+                                if (volume.supportsMedia) {
+                                    failure.play();
+                                }
                                 accum.text = "";
                                 main.selectedItems.forEach(function(b) { b.selected = false; })
                                 main.selectedItems = [];
@@ -479,7 +495,9 @@
                         lm.get(idx).letters.append({ letter: main.getRandomWeightedLetter() });
                         if (lm.get(idx).letters.count >= 10) {
                             droptimer.stop();
-                            gameover.play();
+                            if (volume.supportsMedia) {
+                                gameover.play();
+                            }
                             var db = LocalStorage.openDatabaseSync("dropping-letters", "1.0", "Dropping Letters", 1000);
                             db.transaction(function(tx) {
                                 tx.executeSql("insert into Scores values (?,?)", [main.score, 0]);
@@ -558,7 +576,9 @@
                                                 if (!box.selected) {
                                                     box.selected = true;
                                                     accum.text += letter;
-                                                    click.play();
+                                                    if (volume.supportsMedia) {
+                                                        click.play();
+                                                    }
                                                     main.selectedItems[main.selectedItems.length] = box;
                                                 } else {
                                                     if (box === main.selectedItems[main.selectedItems.length - 1]) {