Merge lp:~uriboni/camera-app/video-disable-hdr into lp:camera-app

[Ugo Riboni]

Hide the HDR setting while recording video as it does not apply to this mode

Hide the HDR setting while recording video as it does not apply to this mode

[Florian Boucault (fboucault)]

works as advertised

Unmerged revisions

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderOverlay.qml	2015-11-24 13:13:57 +0000
@@ -280,7 +280,7 @@
                     property bool isToggle: true
                     property int selectedIndex: bottomEdge.indexForValue(hdrOptionsModel, settings.hdrEnabled)
                     property bool available: camera.advanced.hasHdr
-                    property bool visible: true
+                    property bool visible: camera.captureMode === Camera.CaptureStillImage
                     property bool showInIndicators: true
 
                     ListElement {
@@ -582,7 +582,7 @@
             id: shootingTimer
             repeat: true
             triggeredOnStart: true
-            
+
             property int remainingSecs: 0
 
             onTriggered: {