Merge lp:~ted/ubuntu-system-settings/extreme-volume-warning into lp:ubuntu-system-settings

[Ted Gould]

Show high volume warning

Using the indicator-sound action to determine whether we should show a warning on high volume. Also, cleaned up the dividers to match the spec while I was there. It was hard to read as a flat list.

[Michał Sawicz (saviq)]

We'll need this targetting lp:ubuntu-system-settings/rtm-14.09 as well.

[Ted Gould (ted)]

We dropped for RTM, but would like it go through the normal landing process. And get there through that.

[Ted Gould (ted)]

For Utopic it needs this MR to land in indicator-sound to make the action available.

https://code.launchpad.net/~ted/indicator-sound/extreme-volume-warning/+merge/238168

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1640/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5977/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/832
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5618/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7229
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4435
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4435/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2014-09-10 09:48:31 +0000
+++ plugins/sound/PageComponent.qml	2014-10-15 04:46:19 +0000
@@ -74,9 +74,13 @@
                     onCheckedChanged: backendInfo.silentMode = checked
                 }
                 text: i18n.tr("Silent Mode")
-            }
-
-            ListItem.Standard {
+                showDivider: false
+            }
+
+            ListItem.Divider {
+            }
+
+            ListItem.Header {
                 text: i18n.tr("Ringer:")
             }
 
@@ -87,6 +91,7 @@
                 objectPath: "/com/canonical/indicator/sound"
 
                 property variant volume: action("volume")
+                property variant highVolume: action("high-volume")
 
                 Component.onCompleted: start()
             }
@@ -96,7 +101,7 @@
                 property: "value"
                 value: soundActionGroup.volume.state
             }
- 
+
             Menus.SliderMenu {
                 id: sliderMenu
                 objectName: "sliderMenu"
@@ -106,9 +111,20 @@
                 minIcon: "image://theme/audio-volume-low" 
                 maxIcon: "image://theme/audio-volume-high" 
                 onUpdated: soundActionGroup.volume.updateState(value);
+                showDivider: highVolumeWarning.visible
             }
 
             ListItem.Standard {
+                id: highVolumeWarning
+                visible: soundActionGroup.highVolume.state == true
+                text: i18n.tr("High volume can damage your hearing.")
+                showDivider: false
+            }
+
+            ListItem.Divider {
+            }
+
+            ListItem.Header {
                 text: i18n.tr("Phone calls:")
             }
 
@@ -151,9 +167,13 @@
                     onCheckedChanged: backendInfo.dialpadSoundsEnabled = checked
                 }
                 text: i18n.tr("Dialpad sounds")
-            }
-
-            ListItem.Standard {
+                showDivider: false
+            }
+
+            ListItem.Divider {
+            }
+
+            ListItem.Header {
                 text: i18n.tr("Messages:")
             }
 
@@ -186,9 +206,13 @@
                     onCheckedChanged: backendInfo.incomingMessageVibrateSilentMode = checked
                 }
                 text: i18n.tr("Vibrate in Silent Mode")
-            }
-
-            ListItem.Standard {
+                showDivider: false
+            }
+
+            ListItem.Divider {
+            }
+
+            ListItem.Header {
                 text: i18n.tr("Other sounds:")
             }
 
@@ -201,9 +225,12 @@
 
                     onClicked: keyboardSettings.keyPressFeedback = checked
                 }
+
+                showDivider: lockSound.visible
             }
 
             ListItem.Standard {
+                id: lockSound
                 control: Switch {
                     checked: false
                 }