Merge lp:~uriboni/camera-app/shutter-sound-settings into lp:camera-app

[Ugo Riboni]

Add option to disable shutter sound

Add option to disable shutter sound.

Requires lp:~uriboni/qtubuntu-camera/shutter-sound-settings for the setting to actually take effect.

[lp:~uriboni/camera-app/shutter-sound-settings]

607. By Ugo Riboni on 2015-11-24

Fix OptionButton so that toggles can also have icons

608. By Ugo Riboni on 2015-11-24

Make shutter sound a toggle and display it only when taking still pictures

609. By Ugo Riboni on 2015-11-24

Fix mistake

Unmerged revisions

=== modified file 'OptionButton.qml'
--- OptionButton.qml	2015-10-22 12:21:14 +0000
+++ OptionButton.qml	2015-11-24 16:18:26 +0000
@@ -23,7 +23,7 @@
     property var model
     property string settingsProperty: model.settingsProperty
 
-    iconName: model.isToggle || !model.get(model.selectedIndex).icon ? model.icon : model.get(model.selectedIndex).icon
+    iconName: !model.get(model.selectedIndex).icon ? model.icon : model.get(model.selectedIndex).icon
     iconSource: (model && model.iconSource) ? model.iconSource : ""
     on: model.isToggle ? model.get(model.selectedIndex).value : true
     enabled: model.available
 
=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderOverlay.qml	2015-11-24 16:18:26 +0000
@@ -50,6 +50,7 @@
         property bool gridEnabled: false
         property bool preferRemovableStorage: false
         property string videoResolution: "1920x1080"
+        property bool playShutterSound: true
 
         onFlashModeChanged: if (flashMode != Camera.FlashOff) hdrEnabled = false;
         onHdrEnabledChanged: if (hdrEnabled) flashMode = Camera.FlashOff
@@ -404,6 +405,29 @@
                     property bool available: true
                     property bool visible: camera.captureMode == Camera.CaptureVideo
                     property bool showInIndicators: false
+                },
+                ListModel {
+                    id: shutterSoundOptionsModel
+
+                    property string settingsProperty: "playShutterSound"
+                    property string icon: ""
+                    property string label: ""
+                    property bool isToggle: true
+                    property int selectedIndex: bottomEdge.indexForValue(shutterSoundOptionsModel, settings.playShutterSound)
+                    property bool available: true
+                    property bool visible: camera.captureMode === Camera.CaptureStillImage
+                    property bool showInIndicators: false
+
+                    ListElement {
+                        icon: "audio-volume-high"
+                        label: QT_TR_NOOP("On")
+                        value: true
+                    }
+                    ListElement {
+                        icon: "audio-volume-muted"
+                        label: QT_TR_NOOP("Off")
+                        value: false
+                    }
                 }
             ]
 
@@ -582,7 +606,7 @@
             id: shootingTimer
             repeat: true
             triggeredOnStart: true
-            
+
             property int remainingSecs: 0
 
             onTriggered: {