Merge lp:~rpadovani/ubuntu-calculator-app/24Sep2013 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Some updates to fix graphic issues on device:
- Add trash.png, our Icon wasn't on device
- Fixed text size in a couple of text

Some updates to fix graphic issues on device:
- Add trash.png, our Icon wasn't on device
- Fixed text size in a couple of text

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/107/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/462
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/106

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-09-24 19:51:16 +0000
+++ Simple/Screen.qml	2013-09-24 20:13:21 +0000
@@ -45,9 +45,9 @@
             Item {
                 width: parent.width
                 height: units.gu(4)
-                Icon {
+                Image {
                     anchors.centerIn: parent
-                    name: "user-trash-symbolic"
+                    source: Qt.resolvedUrl("../images/trash.png")
                     width: units.gu(2)
                     height: units.gu(2)
                 }
@@ -60,6 +60,7 @@
                 color: "#9094AA"
                 text: _content.x > root.width / 3 ? "Release To Delete" : "Pull To Delete"
                 font.italic: true
+                font.pixelSize: FontUtils.sizeToPixels("medium")
             }
         }
     }
@@ -76,9 +77,9 @@
             Item {
                 width: parent.width
                 height: units.gu(4)
-                Icon {
+                Image {
                     anchors.centerIn: parent
-                    name: "user-trash-symbolic"
+                    source: Qt.resolvedUrl("../images/trash.png")
                     width: units.gu(2)
                     height: units.gu(2)
                 }
@@ -91,6 +92,7 @@
                 color: "#9094AA"
                 text: _content.x < -root.width / 3 ? "Release To Delete" : "Pull To Delete"
                 font.italic: true
+                font.pixelSize: FontUtils.sizeToPixels("medium")
             }
         }
     }
@@ -113,6 +115,7 @@
                 color: "#FFFFFF"
 
                 text: i18n.tr("Delete this calculation?")
+                font.pixelSize: FontUtils.sizeToPixels("medium")
             }
 
            Button {

=== added file 'images/trash.png'
Binary files images/trash.png	1970-01-01 00:00:00 +0000 and images/trash.png	2013-09-24 20:13:21 +0000 differ