Merge lp:~ted/ubuntu-system-settings/silent-mode into lp:ubuntu-system-settings/rtm-14.09

[Ted Gould]

Make silent mode use the action state in the sound user service

Make silent mode use the action state in the sound user service

[lp:~ted/ubuntu-system-settings/silent-mode]

1115. By Ted Gould on 2014-11-12

Remove headers, not for RTM

1116. By Ted Gould on 2014-11-12

A couple more divider designations

1117. By Ted Gould on 2014-11-12

Switch to a binding which is supposed to be better for two way stuff.

1118. By Ted Gould on 2014-11-12

Activate on clicked

1119. By Ted Gould on 2014-11-12

Removing warning testing, as we removed it

1120. By Ted Gould on 2014-11-13

Drop silent mode from the list of properties

1121. By Ted Gould on 2014-11-13

Adding in an indicator sound action mock

1122. By Ted Gould on 2014-11-13

Make sure to shutdown our isound

1123. By Ted Gould on 2014-11-13

Try to check the calls to the sound mock

1124. By Ted Gould on 2014-11-13

PEP8 Fixes

1125. By Ted Gould on 2014-11-13

Session bus seems to be 'False'

1126. By Ted Gould on 2014-11-13

Check the activate signal is using silent mode

1127. By Ted Gould on 2014-11-13

Moving defines to reduce conflicts

1128. By Ted Gould on 2014-11-13

No clue why this is better, but PEP8 makes the code look like this. Enjoy.

1129. By Ted Gould on 2014-11-18

Merge rtm-14.09 branch

[Ken VanDine (ken-vandine)]

This reverts part of the fix that recently landed for keeping the switches in sync with the indicators. Please double check the switch and make sure this is what we want.

review: Needs Fixing

[lp:~ted/ubuntu-system-settings/silent-mode]

1130. By Ted Gould on 2014-11-20

Switching from a binding to a shadow property

1131. By Ted Gould on 2014-11-24

Start a session bus

[Ken VanDine (ken-vandine)]

Thanks, looks good now

review: Approve

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2014-11-12 16:28:12 +0000
+++ plugins/sound/PageComponent.qml	2014-11-24 15:17:41 +0000
@@ -65,15 +65,14 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            SilentModeWarning { visible: backendInfo.silentMode }
-
             ListItem.Standard {
                 control: Switch {
+                    id: silentModeSwitch
                     objectName: "silentMode"
-                    property bool serverChecked: backendInfo.silentMode
+                    property bool serverChecked: soundActionGroup.silentMode.state
                     onServerCheckedChanged: checked = serverChecked
                     Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.silentMode = checked
+                    onTriggered: soundActionGroup.silentMode.activate()
                 }
                 text: i18n.tr("Silent Mode")
             }
@@ -89,6 +88,8 @@
                 objectPath: "/com/canonical/indicator/sound"
 
                 property variant volume: action("volume")
+                property variant silentMode: action("silent-mode")
+                property variant highVolume: action("high-volume")
 
                 Component.onCompleted: start()
             }
@@ -98,7 +99,7 @@
                 property: "value"
                 value: soundActionGroup.volume.state
             }
- 
+
             Menus.SliderMenu {
                 id: sliderMenu
                 objectName: "sliderMenu"
@@ -110,6 +111,12 @@
                 onUpdated: soundActionGroup.volume.updateState(value);
             }
 
+            ListItem.Standard {
+                id: highVolumeWarning
+                visible: soundActionGroup.highVolume.state == true
+                text: i18n.tr("High volume can damage your hearing.")
+            }
+
             SettingsItemTitle {
                 text: i18n.tr("Phone calls:")
             }
@@ -217,6 +224,7 @@
             }
 
             ListItem.Standard {
+                id: lockSound
                 control: Switch {
                     checked: false
                 }

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2014-10-16 17:05:01 +0000
+++ plugins/sound/SoundsList.qml	2014-11-24 15:17:41 +0000
@@ -5,6 +5,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.Sound 1.0
+import QMenuModel 0.1
 
 import "utilities.js" as Utilities
 
@@ -40,6 +41,17 @@
         schema.id: "com.ubuntu.touch.sound"
     }
 
+    QDBusActionGroup {
+        id: soundActionGroup
+        busType: DBus.SessionBus
+        busName: "com.canonical.indicator.sound"
+        objectPath: "/com/canonical/indicator/sound"
+
+        property variant silentMode: action("silent-mode")
+
+        Component.onCompleted: start()
+    }
+
     Audio {
         id: soundEffect
         audioRole: MediaPlayer.alert
@@ -50,7 +62,7 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        SilentModeWarning { visible: backendInfo.silentMode }
+        SilentModeWarning { visible: soundActionGroup.silentMode.state }
 
         ListItem.SingleControl {
             id: listId
@@ -61,7 +73,7 @@
                     soundEffect.stop()
             }
             enabled: soundEffect.playbackState == Audio.PlayingState
-            visible: showStopButton && !backendInfo.silentMode
+            visible: showStopButton && !soundActionGroup.silentMode.state
         }
     }
 
@@ -92,7 +104,7 @@
                 backendInfo.incomingMessageSound = soundFileNames[index]
             }
             /* Only preview the file if not in silent mode */
-            if (!backendInfo.silentMode) {
+            if (!soundActionGroup.silentMode.state) {
                 soundEffect.source = soundFileNames[index]
                 soundEffect.play()
             }

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2014-11-10 17:59:34 +0000
+++ plugins/sound/sound.cpp	2014-11-24 15:17:41 +0000
@@ -45,9 +45,7 @@
     if (interface != AS_INTERFACE)
         return;
 
-    if (property == "SilentMode") {
-        Q_EMIT silentModeChanged();
-    } else if (property == "IncomingCallSound") {
+    if (property == "IncomingCallSound") {
         Q_EMIT incomingCallSoundChanged();
     } else if (property == "IncomingMessageSound") {
         Q_EMIT incomingMessageSoundChanged();
@@ -69,7 +67,6 @@
     // Tell QML so that it refreshes its view of the property
     Q_EMIT incomingCallSoundChanged();
     Q_EMIT incomingMessageSoundChanged();
-    Q_EMIT silentModeChanged();
     Q_EMIT incomingCallVibrateChanged();
     Q_EMIT incomingMessageVibrateChanged();
     Q_EMIT incomingCallVibrateSilentModeChanged();
@@ -111,23 +108,6 @@
     Q_EMIT(incomingMessageSoundChanged());
 }
 
-bool Sound::getSilentMode()
-{
-    return m_accountsService.getUserProperty(AS_INTERFACE,
-                                             "SilentMode").toBool();
-}
-
-void Sound::setSilentMode(bool enabled)
-{
-    if (enabled == getSilentMode())
-        return;
-
-    m_accountsService.setUserProperty(AS_INTERFACE,
-                                      "SilentMode",
-                                      QVariant::fromValue(enabled));
-    Q_EMIT(silentModeChanged());
-}
-
 bool Sound::getIncomingCallVibrate()
 {
     return m_accountsService.getUserProperty(AS_INTERFACE,

=== modified file 'plugins/sound/sound.h'
--- plugins/sound/sound.h	2014-10-16 17:05:01 +0000
+++ plugins/sound/sound.h	2014-11-24 15:17:41 +0000
@@ -41,10 +41,6 @@
                 READ getIncomingMessageSound
                 WRITE setIncomingMessageSound
                 NOTIFY incomingMessageSoundChanged)
-    Q_PROPERTY (bool silentMode
-                READ getSilentMode
-                WRITE setSilentMode
-                NOTIFY silentModeChanged)
     Q_PROPERTY (bool incomingCallVibrate
                 READ getIncomingCallVibrate
                 WRITE setIncomingCallVibrate
@@ -75,7 +71,6 @@
 Q_SIGNALS:
     void incomingCallSoundChanged();
     void incomingMessageSoundChanged();
-    void silentModeChanged();
     void incomingCallVibrateChanged();
     void incomingMessageVibrateChanged();
     void incomingCallVibrateSilentModeChanged();
@@ -89,8 +84,6 @@
     void setIncomingCallSound(QString sound);
     QString getIncomingMessageSound();
     void setIncomingMessageSound(QString sound);
-    bool getSilentMode();
-    void setSilentMode(bool enabled);
     bool getIncomingCallVibrate();
     void setIncomingCallVibrate(bool enabled);
     bool getIncomingMessageVibrate();

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-22 21:34:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-11-24 15:17:41 +0000
@@ -28,6 +28,9 @@
 ACCOUNTS_OBJ = '/org/freedesktop/Accounts'
 ACCOUNTS_SERVICE = 'com.canonical.unity.AccountsService'
 ACCOUNTS_SOUND_IFACE = 'com.ubuntu.touch.AccountsService.Sound'
+ISOUND_SERVICE = 'com.canonical.indicator.sound'
+ISOUND_ACTION_PATH = '/com/canonical/indicator/sound'
+GTK_ACTIONS_IFACE = 'org.gtk.Actions'
 MODEM_IFACE = 'org.ofono.Modem'
 CONNMAN_IFACE = 'org.ofono.ConnectionManager'
 RDO_IFACE = 'org.ofono.RadioSettings'
@@ -520,14 +523,15 @@
     @classmethod
     def setUpClass(klass):
         klass.start_system_bus()
+        klass.start_session_bus()
         klass.dbus_con = klass.get_dbus(True)
+        klass.dbus_con_session = klass.get_dbus(False)
 
     def setUp(self, panel='sound'):
 
         user_obj = '/user/foo'
 
         self.accts_snd_props = {
-            'SilentMode': dbus.Boolean(False, variant_level=1),
             'IncomingCallVibrate': dbus.Boolean(False, variant_level=1),
             'IncomingCallVibrateSilentMode': dbus.Boolean(False,
                                                           variant_level=1),
@@ -543,6 +547,12 @@
                                              ACCOUNTS_IFACE, system_bus=True,
                                              stdout=subprocess.PIPE)
 
+        # start isound
+        self.mock_isound = self.spawn_server(ISOUND_SERVICE,
+                                             ISOUND_ACTION_PATH,
+                                             GTK_ACTIONS_IFACE,
+                                             stdout=subprocess.PIPE)
+
         sleep(2)
 
         self.dbus_mock = dbus.Interface(self.dbus_con.get_object(
@@ -550,6 +560,14 @@
                                         ACCOUNTS_OBJ,
                                         ACCOUNTS_IFACE),
                                         dbusmock.MOCK_IFACE)
+
+        self.dbus_mock_isound = dbus.Interface(
+            self.dbus_con_session.get_object(
+                ISOUND_SERVICE,
+                ISOUND_ACTION_PATH,
+                GTK_ACTIONS_IFACE),
+            dbusmock.MOCK_IFACE)
+
         # let accountservice find a user object path
         self.dbus_mock.AddMethod(ACCOUNTS_IFACE, 'FindUserById', 'x', 'o',
                                  'ret = "%s"' % user_obj)
@@ -576,10 +594,6 @@
             user_obj, ACCOUNTS_SOUND_IFACE, self.accts_snd_props,
             [
                 (
-                    'GetSilentMode', '', 'v',
-                    'ret = self.Get("%s", "SilentMode")' %
-                    ACCOUNTS_SOUND_IFACE),
-                (
                     'GetIncomingCallVibrate', '', 'v',
                     'ret = self.Get("%s", "IncomingCallVibrate")' %
                     ACCOUNTS_SOUND_IFACE),
@@ -606,6 +620,36 @@
         self.obj_test = self.dbus_con.get_object(ACCOUNTS_IFACE, user_obj,
                                                  ACCOUNTS_IFACE)
 
+        self.dbus_mock_isound.AddMethods(
+            GTK_ACTIONS_IFACE,
+            [
+                (
+                    'Activate', 'sava{sv}', '',
+                    ''
+                ),
+                (
+                    'Describe', 's', '(bsav)',
+                    'if args[0] == "silent-mode":'
+                    '    ret = [True, "", [False]]'
+                    'if args[0] == "volume":'
+                    '    ret = [True, "i", [0.4]]'
+                ),
+                (
+                    'DescribeAll', 's', 'a{s(bsav)}',
+                    'ret = {'
+                    '"silent-mode": [True, "", [False]],'
+                    '"volume": [True, "i", [0.4]]}'
+                ),
+                (
+                    'List', '', 'as',
+                    'ret = ["silent-mode", "volume"]'
+                ),
+                (
+                    'SetState', 'sva{sv}', '',
+                    ''
+                )
+            ])
+
         super(SoundBaseTestCase, self).setUp(panel)
 
         """ Go to Sound page """
@@ -616,6 +660,8 @@
     def tearDown(self):
         self.mock_server.terminate()
         self.mock_server.wait()
+        self.mock_isound.terminate()
+        self.mock_isound.wait()
         super(SoundBaseTestCase, self).tearDown()
 
 

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_sound.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2014-08-28 17:33:40 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2014-11-24 15:17:41 +0000
@@ -31,24 +31,17 @@
         """ Check that silent_mode is present and clickable"""
         snd = self.system_settings.main_view.sound_page.select_single(
             objectName="silentMode")
-        prev_value = self.obj_test.GetSilentMode()
-        self.system_settings.main_view.scroll_to_and_click(snd)
-        sleep(0.2)
-        self.assertNotEqual(
-            self.obj_test.GetSilentMode(),
-            prev_value)
-
-    def test_silent_mode_warning(self):
-        """ Check that silent_mode warning is shown"""
-        sndwarn = self.system_settings.main_view.sound_page.select_single(
-            objectName="silentModeWarning")
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="silentMode")
-        self.system_settings.main_view.scroll_to_and_click(snd)
-        sleep(0.2)
-        self.assertThat(
-            sndwarn.get_properties()["visible"],
-            Eventually(Equals(True)))
+        self.system_settings.main_view.scroll_to_and_click(snd)
+        sleep(0.2)
+        calls = self.dbus_mock_isound.GetCalls()
+        self.assertThat(
+            calls[0][1],
+            Equals('Activate')
+        )
+        self.assertThat(
+            calls[0][2][0],
+            Equals('silent-mode')
+        )
 
     def test_call_vibrate_sound_switch(self):
         """ Check that call vibrate is present and clickable"""