Merge lp:~fcole90/ubuntu-docviewer-app/new-icon into lp:ubuntu-docviewer-app/trunk

[fcole90]

Added the new icon with origami design.

Added the new icon with origami design.

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

PASSED: Continuous integration, rev:28
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/41/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1984
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1984/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/13

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

review: Approve (continuous-integration)

[lp:~fcole90/ubuntu-docviewer-app/new-icon]

29. By fcole90 on 2014-09-12

Corrected minor difference on the lines of the icon

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

PASSED: Continuous integration, rev:29
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/44/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1987
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/16

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

That's great, thanks Fabio! I think the .desktop file needs to specify the image without the full path to work correctly on devices. So:-

Icon=[e-mail]

review: Needs Fixing

[lp:~fcole90/ubuntu-docviewer-app/new-icon]

30. By fcole90 on 2014-09-13

Changed desktop file to avoid absolute path for the icon

[fcole90 (fcole90)]

Change completed :)

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

PASSED: Continuous integration, rev:30
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/45/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2003
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2003/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/17

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

review: Approve (continuous-integration)

=== removed file 'docviewer64.png'
Binary files docviewer64.png	2013-02-12 16:28:32 +0000 and docviewer64.png	1970-01-01 00:00:00 +0000 differ
=== added file '[e-mail]'
Binary files [e-mail]	1970-01-01 00:00:00 +0000 and [e-mail]	2014-09-13 16:12:32 +0000 differ
=== modified file 'ubuntu-docviewer-app.desktop'
--- ubuntu-docviewer-app.desktop	2013-09-26 15:25:36 +0000
+++ ubuntu-docviewer-app.desktop	2014-09-13 16:12:32 +0000
@@ -4,7 +4,7 @@
 Type=Application
 Terminal=false
 Exec=qmlscene %f ubuntu-docviewer-app.qml
-Icon=/usr/share/ubuntu-docviewer-app/docviewer64.png
+Icon=[e-mail]
 Name=Document Viewer
 MimeType=text/plain;image/png;image/jpeg;image/svg+xml;application/pdf
 Path=/usr/share/ubuntu-docviewer-app