Merge lp:~fboucault/ubuntu-calculator-app/new_theming into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Florian Boucault]

Adapted to newer and simpler toolkit's theming infrastructure.

The ItemStyle attached property has been removed and widgets now have a 'style' property equivalent to what ItemStyle.delegate was providing.
The Ubuntu UI Toolkit merge request containing that change is: https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/simple_theming/+merge/171645
It will be merged in the morning so that the fixes for this app can be merged in the same day.

For testing, armhf packages of the toolkit are available at: http://people.canonical.com/~kaleo/sdk_simple_theming/

[Dalius (dalius-sandbox)]

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-06-14 16:57:35 +0000
+++ Simple/CalcLabel.qml	2013-06-27 19:04:27 +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-06-14 16:19:05 +0000
+++ Simple/Screen.qml	2013-06-27 19:04:27 +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"