Merge lp:~nik90/ubuntu-weather-app/fix-swipedelete into lp:ubuntu-weather-app/obsolete.trunk

[Nekhelesh Ramananthan]

Fixes incorrect assignment of static colours in the swipeDelete component. It now uses theme palette to change dynamically according to the current theme. Also added a trash icon as requested by design for the clock app.

Fixes incorrect assignment of static colours in the swipeDelete component. It now uses theme palette to change dynamically according to the current theme. Also added a trash icon as requested by design for the clock app. I would assume it would also apply to other core apps to maintain consistency.

[lp:~nik90/ubuntu-weather-app/fix-swipedelete]

73. By Nekhelesh Ramananthan on 2013-07-21

Added trash icon

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

PASSED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/18/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/10

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-weather-app/fix-swipedelete]

74. By Nekhelesh Ramananthan on 2013-07-21

Simplified anchor definition

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

PASSED: Continuous integration, rev:74
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/19/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/11

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Thanks Nekhelesh, you possess a great overview!

review: Approve

[Nekhelesh Ramananthan (nik90)]

hehe I generally keep track of the commits of weather since we do lot of similar functions :).

=== modified file 'components/SwipeDelete.qml'
--- components/SwipeDelete.qml	2013-07-16 09:39:11 +0000
+++ components/SwipeDelete.qml	2013-07-21 11:07:25 +0000
@@ -23,7 +23,17 @@
     id: swipeBackgroundItem
 
     anchors.fill: parent
-    color: UbuntuColors.orange
+    color: Theme.palette.normal.base
+
+    Image {
+        id: swipeDeleteIcon
+
+        property int slidingMargin: units.gu(10)
+
+        anchors.fill: parent
+        verticalAlignment: Image.AlignVCenter
+        fillMode: Image.Pad
+    }
 
     Label {
         id: swipeBackgroundText
@@ -32,7 +42,7 @@
 
         anchors.fill: parent
         verticalAlignment: Text.AlignVCenter
-        color: "#FFFFFF"
+        color: Theme.palette.normal.baseText
     }
 
     states: [
@@ -40,12 +50,16 @@
             name: "SwipingRight"
             PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: swipeBackgroundText.slidingMargin
                 anchors.leftMargin: 0; horizontalAlignment: Text.AlignRight; text: i18n.tr("Delete") }
+            PropertyChanges { target: swipeDeleteIcon; anchors.rightMargin: swipeDeleteIcon.slidingMargin
+                anchors.leftMargin: 0; horizontalAlignment: Image.AlignRight; source: Qt.resolvedUrl("../resources/images/trash_icon.png")}
         },
 
         State {
             name: "SwipingLeft"
             PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: 0; anchors.leftMargin: swipeBackgroundText.slidingMargin
                 horizontalAlignment: Text.AlignLeft; text: i18n.tr("Delete") }
+            PropertyChanges { target: swipeDeleteIcon; anchors.rightMargin: 0; source: Qt.resolvedUrl("../resources/images/trash_icon.png")
+                anchors.leftMargin: swipeDeleteIcon.slidingMargin; horizontalAlignment: Image.AlignLeft }
         }
     ]
 }
 
=== added file 'resources/images/[e-mail]'
 Binary files resources/images/[e-mail]	1970-01-01 00:00:00 +0000 and resources/images/[e-mail]	2013-07-21 11:07:25 +0000 differ