Merge lp:~seb128/ubuntu-system-settings/sound-silent-mode-handling into lp:ubuntu-system-settings

[Sebastien Bacher]

[sound] don't display silent mode warnings, sounds should just be played
when user selected

[sound] don't display silent mode warnings, sounds should just be played
when user selected

[lp:~seb128/ubuntu-system-settings/sound-silent-mode-handling]

1507. By Sebastien Bacher on 2015-08-24

[sound] don't display silent mode warnings, sounds should just be played
when user selected

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2341/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/525
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3834
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22785

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2378/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/562
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22953

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/sound/CMakeLists.txt'
--- plugins/sound/CMakeLists.txt	2014-01-13 18:08:04 +0000
+++ plugins/sound/CMakeLists.txt	2015-08-24 17:05:44 +0000
@@ -1,6 +1,5 @@
 set(QML_SOURCES
     PageComponent.qml
-    SilentModeWarning.qml
     SoundsList.qml
 )
 

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2015-04-07 10:46:52 +0000
+++ plugins/sound/PageComponent.qml	2015-08-24 17:05:44 +0000
@@ -95,7 +95,6 @@
                 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()

=== removed file 'plugins/sound/SilentModeWarning.qml'
--- plugins/sound/SilentModeWarning.qml	2014-07-28 15:14:46 +0000
+++ plugins/sound/SilentModeWarning.qml	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-import QtQuick 2.0
-import SystemSettings 1.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-ListItem.Base {
-    objectName: "silentModeWarning"
-    height: itemId.height + units.gu(4)
-
-    Item {
-        id: itemId
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.centerIn: parent
-
-        height: silentIcon.height + silentLabel.height
-        Icon {
-            id: silentIcon
-            anchors.horizontalCenter: parent.horizontalCenter
-            height: units.gu(3)
-            width: height
-            /* TODO: need a different icon */
-            name: "speaker-mute"
-        }
-        Label {
-            id: silentLabel
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                top: silentIcon.bottom
-            }
-            text: i18n.tr("The phone is in Silent Mode.")
-        }
-    }
-
-    showDivider: false
-}

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2014-11-13 17:02:24 +0000
+++ plugins/sound/SoundsList.qml	2015-08-24 17:05:44 +0000
@@ -47,8 +47,6 @@
         busName: "com.canonical.indicator.sound"
         objectPath: "/com/canonical/indicator/sound"
 
-        property variant silentMode: action("silent-mode")
-
         Component.onCompleted: start()
     }
 
@@ -62,8 +60,6 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        SilentModeWarning { visible: soundActionGroup.silentMode.state }
-
         ListItem.SingleControl {
             id: listId
             control: Button {
@@ -73,7 +69,7 @@
                     soundEffect.stop()
             }
             enabled: soundEffect.playbackState == Audio.PlayingState
-            visible: showStopButton && !soundActionGroup.silentMode.state
+            visible: showStopButton
         }
     }
 
@@ -103,11 +99,8 @@
                 soundSettings.incomingMessageSound = soundFileNames[index]
                 backendInfo.incomingMessageSound = soundFileNames[index]
             }
-            /* Only preview the file if not in silent mode */
-            if (!soundActionGroup.silentMode.state) {
-                soundEffect.source = soundFileNames[index]
-                soundEffect.play()
-            }
+            soundEffect.source = soundFileNames[index]
+            soundEffect.play()
         }
     }
 }