camera-app

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

  1. video-disable-hdr
  2. Merge into staging
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 606
Merged at revision: 608
Proposed branch: lp:~uriboni/camera-app/video-disable-hdr
Merge into: lp:camera-app/staging
Diff against target: 21 lines (+2/-2)
1 file modified
ViewFinderOverlay.qml (+2/-2)
To merge this branch: bzr merge lp:~uriboni/camera-app/video-disable-hdr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+278611@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ViewFinderOverlay.qml'
2--- ViewFinderOverlay.qml 2015-10-22 12:21:14 +0000
3+++ ViewFinderOverlay.qml 2015-11-25 16:52:15 +0000
4@@ -280,7 +280,7 @@
5 property bool isToggle: true
6 property int selectedIndex: bottomEdge.indexForValue(hdrOptionsModel, settings.hdrEnabled)
7 property bool available: camera.advanced.hasHdr
8- property bool visible: true
9+ property bool visible: camera.captureMode === Camera.CaptureStillImage
10 property bool showInIndicators: true
11
12 ListElement {
13@@ -582,7 +582,7 @@
14 id: shootingTimer
15 repeat: true
16 triggeredOnStart: true
17-
18+
19 property int remainingSecs: 0
20
21 onTriggered: {

Subscribers

People subscribed via source and target branches