Merge lp:~xnox/ubuntu-calculator-app/fix-missing-trash.png into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Dimitri John Ledkov]

Fix failure to load trash.png.

Fix failure to load trash.png.

[Dimitri John Ledkov (xnox)]

Without this loading the app crashes.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:219
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/158/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1462
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/157
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/157
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/29

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/158/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Sorry Dimitri, I understand your patch, but I don't understand what's the problem. Where do you find problems? I'm able to start calc both on mako and on Saucy on desktop, and there is always the trash icon.

review: Needs Information

[Dimitri John Ledkov (xnox)]

if one builds click using clickbuddy/cmake, only the generated pngs from
nested directory are included. the svgs and trash.png from top level source
tree are not. thus i move trash.png in the same location as the rest of
generated pngs such that all of them are in a single location and accesible
from either source tree, deb, click, or cmake built click.
On 22 Feb 2014 17:50, "Riccardo Padovani" <email address hidden> wrote:

> Review: Needs Information
>
> Sorry Dimitri, I understand your patch, but I don't understand what's the
> problem. Where do you find problems? I'm able to start calc both on mako
> and on Saucy on desktop, and there is always the trash icon.
> --
>
> https://code.launchpad.net/~xnox/ubuntu-calculator-app/fix-missing-trash.png/+merge/207790
> You are the owner of lp:~xnox/ubuntu-calculator-app/fix-missing-trash.png.
>

[Riccardo Padovani (rpadovani)]

Gothca, thanks for the explanation!

lgtm

review: Approve

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2014-02-09 11:33:54 +0000
+++ Simple/Screen.qml	2014-02-22 14:02:15 +0000
@@ -46,7 +46,7 @@
                 height: units.gu(4)
                 Image {
                     anchors.centerIn: parent
-                    source: Qt.resolvedUrl("../images/trash.png")
+                    source: Qt.resolvedUrl("images/trash.png")
                     width: units.gu(2)
                     height: units.gu(2)
                 }
@@ -78,7 +78,7 @@
                 height: units.gu(4)
                 Image {
                     anchors.centerIn: parent
-                    source: Qt.resolvedUrl("../images/trash.png")
+                    source: Qt.resolvedUrl("images/trash.png")
                     width: units.gu(2)
                     height: units.gu(2)
                 }

=== renamed file 'images/trash.png' => 'Simple/images/trash.png'