Merge lp:~mhall119/ubuntu-calculator-app/reapply-new-styling into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Michael Hall]

Reapplying revision 90 to use the new styling method

Reapplying revision 90 to use the new styling method

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

PASSED: Continuous integration, rev:94
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/8

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

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-07-03 16:27:23 +0000
+++ Simple/CalcLabel.qml	2013-07-05 18:01:30 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Themes.Ambiance 0.1
 
 Item {
     id: root
@@ -69,7 +70,11 @@
                 id: numberName
                 width: parent.width
                 anchors.verticalCenter: parent.verticalCenter
-                ItemStyle.delegate: Item{} // removes ubuntu shape
+                // removes ubuntu shape
+                style: TextFieldStyle {
+                    background: Item {}
+                }
+
                 readOnly: labelReadOnly
                 text: labelText
                 color: "#FEFEFE"

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-07-03 16:27:23 +0000
+++ Simple/Screen.qml	2013-07-05 18:01:30 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Themes.Ambiance 0.1
 import Ubuntu.Components.ListItems 0.1
 
 //TODO: reuse a number clicking on it
@@ -128,7 +129,10 @@
 
             TextField{
                 width: parent.width
-                ItemStyle.delegate: Item{} // removes ubuntu shape
+                // removes ubuntu shape
+                style: TextFieldStyle {
+                    background: Item {}
+                }
                 text: mainLabel
                 hasClearButton: false
                 color: "#FEFEFE"