Merge lp:~jonas-drange/ubuntu-system-settings/sound-other-vibrations into lp:ubuntu-system-settings

[Jonas G. Drange]

[sound] let user toggle other vibrate setting

[sound] let user toggle other vibrate setting

[Sebastien Bacher (seb128)]

Thanks, could you drop the whitespace changes? Could you also give details on why is the Item{} needed, shouldn't a Divider{} be used there instead?

[Jonas G. Drange (jonas-drange)]

> Thanks, could you drop the whitespace changes? Could you also give details on
> why is the Item{} needed, shouldn't a Divider{} be used there instead?
Dropped the whitespace. Divider was not used because I misinterpreted the design. Thanks!

[Sebastien Bacher (seb128)]

Thanks, sorry I didn't catch that during the first review but it looks like you should update the code with changes similar to the ones in https://code.launchpad.net/~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync/+merge/239494

24 + checked: backendInfo.otherVibrate
25 +
26 + onClicked: backendInfo.otherVibrate = checked

is likely to have some backend/ui being out of sync issues

the new item should also probably not have "showDivider: false", the design has a separator after the bottom item it seems

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1158
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1765/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/107/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/35
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/163
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15752
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/98/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/111
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/111/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1159
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1771/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/178
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/178
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15773
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/105/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/120/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1159
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1776/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/185
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/123/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/46
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/185
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15786
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/108/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/127/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1159
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1785/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/207
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/146
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/146/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

the bottom item should also not use "showDivider: false", the design has a line after it

do we need to update a recommends to the schemas for the new property used as well?

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

Thanks, @seb128. We indeed do. I've been told that we would land the schema, this branch as well as the UITK branch together. How would we determine what to recommend? gsettings-ubuntu-touch-schemas version + 1 ?

[Sebastien Bacher (seb128)]

the usual way would be to update the gsettings-ubuntu-touch-schemas version from 0.0.3 to 0.0.4 and adjust the depends there to be >= 0.0.4, which makes it not depends on the snapshot version

[Sebastien Bacher (seb128)]

looks good, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1163
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1942/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1043/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/212
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/923/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1041
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1041/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17558

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/sound-other-vibrations]

1164. By Jonas G. Drange on 2015-02-11

hide othervibrate

=== modified file 'debian/control'
--- debian/control	2015-02-05 14:30:24 +0000
+++ debian/control	2015-02-11 16:05:14 +0000
@@ -63,7 +63,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),
          indicator-power (>= 12.10.6+15.04.20150130),

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2015-01-29 10:16:17 +0000
+++ plugins/sound/PageComponent.qml	2015-02-11 16:05:14 +0000
@@ -231,6 +231,22 @@
                 text: i18n.tr("Lock sound")
                 visible: showAllUI
             }
+
+            ListItem.Divider {
+                visible: showAllUI
+            }
+
+            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
+                }
+                visible: showAllUI
+            }
         }
     }
 }

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2014-11-13 17:02:24 +0000
+++ plugins/sound/sound.cpp	2015-02-11 16:05:14 +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-13 17:02:24 +0000
+++ plugins/sound/sound.h	2015-02-11 16:05:14 +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);