Merge lp:~jonas-drange/ubuntu-system-settings/rtm-othervibrate into lp:ubuntu-system-settings/rtm-14.09

[Jonas G. Drange]

[sound] let user toggle other vibrate setting

[sound] let user toggle other vibrate setting

[lp:~jonas-drange/ubuntu-system-settings/rtm-othervibrate]

976. By Jonas G. Drange on 2015-01-28

cherry pick 1163

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:976
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/47/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/26/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/25
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17548

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Ken VanDine (ken-vandine)]

Please link the bug to this branch

=== modified file 'debian/control'
--- debian/control	2015-01-21 12:04:00 +0000
+++ debian/control	2015-01-28 11:50:24 +0000
@@ -58,7 +58,7 @@
          bluez (>= 4.36),
          dbus-property-service [amd64 armhf i386],
          gsettings-desktop-schemas,
-         gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
+         gsettings-ubuntu-schemas (>= 0.0.4),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
          indicator-network (>= 0.5.0+13.10.20130918),
          powerd (>= 0.15) | gnome-settings-daemon,

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2014-11-20 14:26:11 +0000
+++ plugins/sound/PageComponent.qml	2015-01-28 11:50:24 +0000
@@ -213,6 +213,7 @@
 
             ListItem.Standard {
                 text: i18n.tr("Keyboard sound")
+                showDivider: false
 
                 control: Switch {
                     objectName: "keyboardSoundSwitch"
@@ -231,6 +232,19 @@
                 text: i18n.tr("Lock sound")
                 visible: showAllUI
             }
+
+            ListItem.Divider {}
+
+            ListItem.Standard {
+                text: i18n.tr("Other vibrations")
+                control: Switch {
+                    objectName: "otherVibrateSwitch"
+                    property bool serverChecked: backendInfo.otherVibrate
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.otherVibrate = checked
+                }
+            }
         }
     }
 }

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2014-11-18 15:26:42 +0000
+++ plugins/sound/sound.cpp	2015-01-28 11:50:24 +0000
@@ -57,6 +57,8 @@
         Q_EMIT incomingCallVibrateSilentModeChanged();
     } else if (property == "IncomingMessageVibrateSilentMode") {
         Q_EMIT incomingMessageVibrateSilentModeChanged();
+    } else if (property == "OtherVibrate") {
+        Q_EMIT otherVibrateChanged();
     } else if (property == "DialpadSoundsEnabled") {
         Q_EMIT dialpadSoundsEnabledChanged();
     }
@@ -71,6 +73,7 @@
     Q_EMIT incomingMessageVibrateChanged();
     Q_EMIT incomingCallVibrateSilentModeChanged();
     Q_EMIT incomingMessageVibrateSilentModeChanged();
+    Q_EMIT otherVibrateChanged();
     Q_EMIT dialpadSoundsEnabledChanged();
 }
 
@@ -176,6 +179,23 @@
     Q_EMIT(incomingMessageVibrateSilentModeChanged());
 }
 
+bool Sound::getOtherVibrate()
+{
+    return m_accountsService.getUserProperty(AS_INTERFACE,
+                                             "OtherVibrate").toBool();
+}
+
+void Sound::setOtherVibrate(bool enabled)
+{
+    if (enabled == getOtherVibrate())
+        return;
+
+    m_accountsService.setUserProperty(AS_INTERFACE,
+                                      "OtherVibrate",
+                                      QVariant::fromValue(enabled));
+    Q_EMIT(otherVibrateChanged());
+}
+
 bool Sound::getDialpadSoundsEnabled()
 {
     return m_accountsService.getUserProperty(AS_INTERFACE,

=== modified file 'plugins/sound/sound.h'
--- plugins/sound/sound.h	2014-11-18 15:26:42 +0000
+++ plugins/sound/sound.h	2015-01-28 11:50:24 +0000
@@ -57,6 +57,10 @@
                 READ getIncomingMessageVibrateSilentMode
                 WRITE setIncomingMessageVibrateSilentMode
                 NOTIFY incomingMessageVibrateSilentModeChanged)
+    Q_PROPERTY (bool otherVibrate
+                READ getOtherVibrate
+                WRITE setOtherVibrate
+                NOTIFY otherVibrateChanged)
 
     Q_PROPERTY (bool dialpadSoundsEnabled
                 READ getDialpadSoundsEnabled
@@ -75,6 +79,7 @@
     void incomingMessageVibrateChanged();
     void incomingCallVibrateSilentModeChanged();
     void incomingMessageVibrateSilentModeChanged();
+    void otherVibrateChanged();
     void dialpadSoundsEnabledChanged();
 
 private:
@@ -92,6 +97,8 @@
     void setIncomingCallVibrateSilentMode(bool enabled);
     bool getIncomingMessageVibrateSilentMode();
     void setIncomingMessageVibrateSilentMode(bool enabled);
+    bool getOtherVibrate();
+    void setOtherVibrate(bool enabled);
     bool getDialpadSoundsEnabled();
     void setDialpadSoundsEnabled(bool enabled);