Merge lp:~nik90/ubuntu-clock-app/temp-fixes into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Temporarily hides the location string and sets the bottom edge hint to "Alarms" until both these features are implemented.

Temporarily hides the location string and sets the bottom edge hint to "Alarms" until both these features are implemented.

I generally don't like hacks like this, but these will be removed by the next promotion image.

[Leo Arias (elopio)]

Thanks nik.

review: Approve (code review, compiled and viewed the labels.)

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/397/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1696/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/44

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/398/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/45

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-08-24 12:47:50 +0000
+++ app/clock/ClockPage.qml	2014-08-26 20:31:13 +0000
@@ -123,6 +123,9 @@
             opacity: settingsIcon.opacity
             spacing: units.gu(1)
 
+            // TODO: Remove this once user location finding is implemented
+            visible: false
+
             anchors {
                 top: date.bottom
                 topMargin: units.gu(1)

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2014-08-24 12:47:50 +0000
+++ app/ubuntu-clock-app.qml	2014-08-26 20:31:13 +0000
@@ -100,7 +100,7 @@
               #TODO: The bottom edge title should reflect the time to the next
               alarm. For instance it should read "Next alarm in 9h23m".
             */
-            bottomEdgeTitle: i18n.tr("Next Alarm in ..")
+            bottomEdgeTitle: i18n.tr("Alarms")
             bottomEdgePageComponent: AlarmPage {}
         }
     }