Merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1202364 into lp:ubuntu-clock-app/saucy

[Paolo Rotolo]

 - Stopwatch: Added lap and clear icons.
 - Added the grey version of the clear icon for the toolbar.
 - Timer: added white space between the text label and the reset icon.

- Stopwatch: Added lap and clear icons.
- Added the grey version of the clear icon for the toolbar.
- Timer: added white space between the text label and the reset icon.

[Nekhelesh Ramananthan (nik90)]

lgtm! Merging :)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml	2013-07-14 12:40:59 +0000
+++ alarm/AlarmPage.qml	2013-07-19 19:18:28 +0000
@@ -773,7 +773,7 @@
 
         back: ToolbarButton {
             text: "Back";
-            iconSource: Qt.resolvedUrl("../images/reset_icon.png")
+            iconSource: Qt.resolvedUrl("../images/back_icon.png")
             visible: !addAlarm.visible;
             onTriggered: {
                 circleMinutes.state = "NORMAL";

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-07-16 18:25:18 +0000
+++ clock/ClockPage.qml	2013-07-19 19:18:28 +0000
@@ -296,7 +296,7 @@
 
         back: ToolbarButton {
             text: "Back";
-            iconSource: Qt.resolvedUrl("../images/reset_icon.png")
+            iconSource: Qt.resolvedUrl("../images/back_icon.png")
             visible: !addCity.visible;
             onTriggered: {
                 clockPage.state = "NORMAL";

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-07-16 18:25:18 +0000
+++ clock/WorldClock.qml	2013-07-19 19:18:28 +0000
@@ -78,8 +78,8 @@
             hasClearButton: true
             placeholderText: i18n.tr("Search");
             primaryItem: Image {
-                height: parent.height/1.5
-                width: height
+                height: parent.height/1.4
+                width: parent.height/1.45
                 source: Qt.resolvedUrl("../images/search_icon.png")
             }
 

=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-07-19 19:18:28 +0000 differ
=== modified file 'images/[e-mail]'
Binary files images/[e-mail]	2013-06-21 23:19:57 +0000 and images/[e-mail]	2013-07-19 19:18:28 +0000 differ
=== modified file 'images/[e-mail]'
Binary files images/[e-mail]	2013-06-21 23:19:57 +0000 and images/[e-mail]	2013-07-19 19:18:28 +0000 differ
=== modified file 'images/[e-mail]'
Binary files images/[e-mail]	2013-06-15 21:21:19 +0000 and images/[e-mail]	2013-07-19 19:18:28 +0000 differ
=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-07-16 18:25:18 +0000
+++ timer/TimerPage.qml	2013-07-19 19:18:28 +0000
@@ -303,7 +303,7 @@
 
             visible: false
             hasClearButton: true
-            anchors { left: analogTimer.left; right: analogTimer.right; top: analogTimer.bottom; topMargin: units.gu(7)}
+            anchors { left: analogTimer.left; right: analogTimer.right; top: analogTimer.bottom; topMargin: units.gu(10)}
 
             placeholderText: i18n.tr("Timer One")
         }
@@ -348,7 +348,7 @@
 
         back: ToolbarButton {
             text: "Back";
-            iconSource: Qt.resolvedUrl("../images/reset_icon.png");
+            iconSource: Qt.resolvedUrl("../images/back_icon.png");
             visible: timerPage.state == "ADDPRESET" ? true : false;
 
             onTriggered: {