Merge lp:~nik90/ubuntu-clock-app/add-vibration-support into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Added vibration settings option for alarms.

Added vibration settings option for alarms.

NOTE: You will require mako image >180 for this.

Screenshot: https://imgur.com/f9Wf3ao

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

FAILED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/102/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1259/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/102/console

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/add-vibration-support]

39. By Nekhelesh Ramananthan on 2014-08-02

Made vibration string translatable

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

FAILED: Continuous integration, rev:39
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/103/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1260/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/103/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Approving the C++ pieces as requested, they LGTM.

review: Approve

[lp:~nik90/ubuntu-clock-app/add-vibration-support]

40. By Nekhelesh Ramananthan on 2014-08-07

Added ability to click on the list label to enable/disable vibration

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

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/131/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1415/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/131/console

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/add-vibration-support]

41. By Nekhelesh Ramananthan on 2014-08-09

Merged trunk

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

FAILED: Continuous integration, rev:41
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/147/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1440/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/147/console

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works great on device, thanks!

review: Approve

[lp:~nik90/ubuntu-clock-app/add-vibration-support]

42. By Nekhelesh Ramananthan on 2014-08-11

Merged trunk

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

FAILED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/158/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1471/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/158/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-07-29 13:56:07 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-08-11 15:42:53 +0000
@@ -81,6 +81,34 @@
 
         anchors.fill: parent
 
+        ListItem.Base {
+            Column {
+                width: parent.width
+                height: childrenRect.height
+                anchors.verticalCenter: parent.verticalCenter
+
+                Label {
+                    color: UbuntuColors.midAubergine
+                    text: i18n.tr("Alarm volume")
+                }
+
+                Slider {
+                    id: _volumeSlider
+
+                    height: units.gu(2)
+                    width: parent.width
+
+                    minimumValue: 1
+                    maximumValue: 100
+                    value: alarmSettings.volume
+
+                    onValueChanged: {
+                        alarmSettings.volume = formatValue(value)
+                    }
+                }
+            }
+        }
+
         ListItem.Expandable {
             id: _alarmDuration
 
@@ -144,31 +172,33 @@
         }
 
         ListItem.Base {
-            Column {
-                width: parent.width
-                height: childrenRect.height
+            Label {
+                text: i18n.tr("Vibration")
+                color: UbuntuColors.midAubergine
                 anchors.verticalCenter: parent.verticalCenter
-
-                Label {
-                    color: UbuntuColors.midAubergine
-                    text: i18n.tr("Alarm volume")
+            }
+
+            Switch {
+                id: vibrateSwitch
+
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
                 }
 
-                Slider {
-                    id: _volumeSlider
-
-                    height: units.gu(2)
-                    width: parent.width
-
-                    minimumValue: 1
-                    maximumValue: 100
-                    value: alarmSettings.volume
-
-                    onValueChanged: {
-                        alarmSettings.volume = formatValue(value)
+                checked: alarmSettings.vibration === "pulse"
+                onCheckedChanged: {
+                    if(checked) {
+                        alarmSettings.vibration = "pulse"
+                    } else {
+                        alarmSettings.vibration = "none"
                     }
                 }
             }
+
+            onClicked: {
+                vibrateSwitch.checked = !vibrateSwitch.checked
+            }
         }
 
         SubtitledListItem {

=== modified file 'backend/modules/Alarm/Settings/alarmsettings.cpp'
--- backend/modules/Alarm/Settings/alarmsettings.cpp	2014-07-28 23:09:07 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.cpp	2014-08-11 15:42:53 +0000
@@ -65,6 +65,16 @@
             emit durationChanged();
         }
     }
+
+    it = properties.find("HapticFeedback");
+
+    if (it != properties.end()) {
+        const QString vibration = it.value().toString();
+        if (m_vibration != vibration) {
+            m_vibration = vibration;
+            emit vibrationChanged();
+        }
+    }
 }
 
 void AlarmSettings::refreshProperties()
@@ -87,6 +97,7 @@
 
     m_volume = map["DefaultVolume"].toInt();
     m_duration = map["Duration"].toInt();
+    m_vibration = map["HapticFeedback"].toString();
 }
 
 void AlarmSettings::setDBusProperty(const QString &name, const QVariant &value)
@@ -113,6 +124,11 @@
     return m_duration;
 }
 
+QString AlarmSettings::vibration() const
+{
+    return m_vibration;
+}
+
 void AlarmSettings::setVolume(int volume)
 {
     if(m_volume == volume) {
@@ -140,3 +156,17 @@
 
     setDBusProperty("Duration", QVariant(m_duration));
 }
+
+void AlarmSettings::setVibration(QString vibration)
+{
+    if(m_vibration == vibration) {
+        // Don't send the vibration mode over dbus if it is the same one already
+        return;
+    }
+
+    // Change the property and let qml know about it
+    m_vibration = vibration;
+    emit vibrationChanged();
+
+    setDBusProperty("HapticFeedback", QVariant(m_vibration));
+}

=== modified file 'backend/modules/Alarm/Settings/alarmsettings.h'
--- backend/modules/Alarm/Settings/alarmsettings.h	2014-07-28 23:09:07 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.h	2014-08-11 15:42:53 +0000
@@ -38,6 +38,12 @@
                 WRITE setDuration
                 NOTIFY durationChanged)
 
+    // Property to control the haptic feedback mode
+    Q_PROPERTY(QString vibration
+               READ vibration
+               WRITE setVibration
+               NOTIFY vibrationChanged)
+
 public:
     AlarmSettings(QObject *parent = 0);
 
@@ -47,12 +53,18 @@
     // Function to return the alarm duration
     int duration() const;
 
+    // Function to return the alarm haptic mode
+    QString vibration() const;
+
     // Function to set the alarm volume
     void setVolume(int volume);
 
     // Function to set the alarm duration
     void setDuration(int duration);
 
+    // Function to set the alarm haptic mode
+    void setVibration(QString vibration);
+
 signals:
     // Signal to notify the volume change to QML
     void volumeChanged();
@@ -60,6 +72,9 @@
     // Signal to notify the duration change to QML
     void durationChanged();
 
+    // Signal to notify the vibration mode change to QML
+    void vibrationChanged();
+
 private:
     // Keep a store of the alarm volume
     int m_volume;
@@ -67,6 +82,9 @@
     // Keep a store of the alarm duration
     int m_duration;
 
+    // Keep a store of the alarm haptic mode
+    QString m_vibration;
+
     // Function to retrieve all the settings from dBus and update the properties
     void refreshProperties();