Merge lp:~nik90/ubuntu-clock-app/alarm-status-effects into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Small visual tweaks to the alarm listitems when enabling/disabling alarms as specified in the design spec.

This MP implements small visual changes when enabling/disabling alarms as specified in the design spec.

- When an alarm is disabled, the opacity of the labels (alarm time, name, recurrence) is decreased to 80%

- When an alarm is enabled, the alarm recurrence options is replaced with the time to the alarm for 5 seconds. After the 5 seconds the original alarm recurrence options are shown again.

For instance if current time is 18:00 and the alarm is enabled to ring at 20:00 then it should say "in 2h" for 5 seconds.

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

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/423/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/141/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/70

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/alarm-status-effects]

76. By Nekhelesh Ramananthan on 2014-09-02

Added case for alarms in less an hour

77. By Nekhelesh Ramananthan on 2014-09-02

Updated changed

[Riccardo Padovani (rpadovani)]

Imo, you should add also a case in which alarmETA < 1h, to display online number of minutes before the ring.

Also, remember to update .pot file ;-)

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/alarm-status-effects]

78. By Nekhelesh Ramananthan on 2014-09-02

Updated pot file

[Riccardo Padovani (rpadovani)]

Lgtm now

review: Approve

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

FAILED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/259/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/142/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/259

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/259/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/424/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/71

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/alarm-status-effects]

79. By Nekhelesh Ramananthan on 2014-09-03

merged trunk

80. By Nekhelesh Ramananthan on 2014-09-03

tiny fix

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-08-28 00:36:51 +0000
+++ app/alarm/AlarmDelegate.qml	2014-09-03 22:51:58 +0000
@@ -44,6 +44,8 @@
     Column {
         id: alarmDetailsColumn
 
+        opacity: model.enabled ? 1.0 : 0.8
+
         anchors {
             left: alarmTime.right
             right: alarmStatus.left
@@ -68,7 +70,7 @@
 
             fontSize: "xx-small"
             width: parent.width
-            visible: type === Alarm.Repeating
+            visible: type === Alarm.Repeating || _internalTimerLoader.sourceComponent != undefined
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             text: alarmUtils.format_day_string(daysOfWeek, type)
         }
@@ -90,6 +92,30 @@
             }
         }
 
+        Component {
+            id: _internalTimerComponent
+            Timer {
+                running: false
+                interval: 5000
+                repeat: false
+                onTriggered: {
+                    alarmSubtitle.text = alarmUtils.format_day_string(daysOfWeek)
+                    _internalTimerLoader.sourceComponent = undefined
+                }
+            }
+        }
+
+        Loader {
+            id: _internalTimerLoader
+            asynchronous: true
+
+            onStatusChanged: {
+                if(status === Loader.Ready) {
+                    _internalTimerLoader.item.restart()
+                }
+            }
+        }
+
         Connections {
             target: model
             onStatusChanged: {
@@ -99,6 +125,38 @@
                 */
                 if (model.status === Alarm.Ready) {
                     alarmStatus.checked = model.enabled;
+
+                    if(alarmStatus.checked) {
+                        var timeObject = alarmUtils.get_time_to_next_alarm(model.date - new Date())
+                        var alarmETA
+
+                        // TRANSLATORS: the first argument is the number of days,
+                        // followed by hour and minute (eg. in 1d 20h 3m)
+                        if(timeObject.days) {
+                            alarmETA = i18n.tr("in %1d %1h %2m")
+                            .arg(timeObject.days)
+                            .arg(timeObject.hours)
+                            .arg(timeObject.minutes)
+                        }
+
+                        // TRANSLATORS: the first argument is the number of
+                        // hours followed by the minutes (eg. in 4h 3m)
+                        else if (timeObject.hours) {
+                            alarmETA = i18n.tr("in %1h %2m")
+                            .arg(timeObject.hours)
+                            .arg(timeObject.minutes)
+                        }
+
+                        // TRANSLATORS: the argument is the number of
+                        // minutes to the alarm (eg. in 3m)
+                        else {
+                            alarmETA = i18n.tr("in %1m")
+                            .arg(timeObject.minutes)
+                        }
+
+                        alarmSubtitle.text = alarmETA
+                        _internalTimerLoader.sourceComponent = _internalTimerComponent
+                    }
                 }
             }
         }

=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2014-09-01 12:00:17 +0000
+++ app/alarm/AlarmUtils.qml	2014-09-03 22:51:58 +0000
@@ -50,6 +50,23 @@
         }
     }
 
+    function get_time_to_next_alarm ( datetime_offset ) {
+        // increase by a minute, so we could make a nicer time
+        // to the next alarm, otherwise a minute always missing
+        // which makes it look odd
+        datetime_offset += 60000;
+
+        var days_in_offset = Math.floor( datetime_offset / ( 3600000 * 24 ) );
+        var hours_in_offset = Math.floor( datetime_offset / 3600000 % 24 );
+        var minutes_in_offset = Math.floor( datetime_offset / 60000 % 60 );
+
+        return {
+            days : days_in_offset,
+            hours : hours_in_offset,
+            minutes : minutes_in_offset
+        }
+    }
+
     // Function return the alarm dayOfWeek according to the day provided
     function get_alarm_day(day) {
         switch(day) {

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-03 22:14:49 +0000
+++ debian/changelog	2014-09-03 22:51:58 +0000
@@ -19,6 +19,8 @@
   * Updated QtQuick library imports to v2.3
   * Switched bzr branch to lp:ubuntu-clock-app
   * Updated pot file name
+  * Added visual tweaks (80% opacity for disabled alarms) and show time to 
+    next alarm when enabling an alarm.
   * Enabled one-time alarms in the UI (LP: #1358320)
   * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
 

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-08-26 14:07:25 +0000
+++ po/com.ubuntu.clock.pot	2014-09-03 22:51:58 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-26 16:06+0200\n"
+"POT-Creation-Date: 2014-09-02 17:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,21 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../app/alarm/AlarmDelegate.qml:135
+#, qt-format
+msgid "in %1d %1h %2m"
+msgstr ""
+
+#: ../app/alarm/AlarmDelegate.qml:144
+#, qt-format
+msgid "in %1h %2m"
+msgstr ""
+
+#: ../app/alarm/AlarmDelegate.qml:152
+#, c-format, qt-format
+msgid "in %1m"
+msgstr ""
+
 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:52
 #: ../app/alarm/EditAlarmPage.qml:268
 msgid "Label"
@@ -27,7 +42,7 @@
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:26
+#: ../app/alarm/AlarmPage.qml:26 ../app/ubuntu-clock-app.qml:103
 msgid "Alarms"
 msgstr ""
 
@@ -110,10 +125,6 @@
 msgid "City"
 msgstr ""
 
-#: ../app/ubuntu-clock-app.qml:103
-msgid "Next Alarm in .."
-msgstr ""
-
 #: ../app/worldclock/UserWorldCityDelegate.qml:139
 msgid "Today"
 msgstr ""