1
=== modified file 'ViewFinderOverlay.qml'
2
--- ViewFinderOverlay.qml	2014-07-17 13:39:48 +0000
3
+++ ViewFinderOverlay.qml	2014-07-28 12:59:27 +0000
4
@@ -16,7 +16,7 @@
5
16
16
6
17
import QtQuick 2.2
17
import QtQuick 2.2
7
18
import QtQuick.Window 2.0
18
import QtQuick.Window 2.0
9
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
10
20
import QtMultimedia 5.0
20
import QtMultimedia 5.0
11
21
import QtPositioning 5.2
21
import QtPositioning 5.2
12
22
import CameraApp 0.1
22
import CameraApp 0.1
13
@@ -41,6 +41,8 @@
14
41
        property bool gpsEnabled: false
41
        property bool gpsEnabled: false
15
42
        property bool hdrEnabled: false
42
        property bool hdrEnabled: false
16
43
        property int videoFlashMode: Camera.FlashOff
43
        property int videoFlashMode: Camera.FlashOff
17
44
18
45
        StateSaver.properties: "flashMode, gpsEnabled, hdrEnabled, videoFlashMode"
19
44
    }
46
    }
20
45
47
21
46
    Binding {
48
    Binding {
22
@@ -413,6 +415,7 @@
23
413
                bottomMargin: units.gu(6)
415
                bottomMargin: units.gu(6)
24
414
            }
416
            }
25
415
417
26
418
            enabled: !camera.switchInProgress
27
416
            iconName: "camera-flip"
419
            iconName: "camera-flip"
28
417
            onClicked: controls.switchCamera()
420
            onClicked: controls.switchCamera()
29
418
        }
421
        }
30
419
422
31
=== modified file 'ViewFinderView.qml'
32
--- ViewFinderView.qml	2014-07-03 08:49:49 +0000
33
+++ ViewFinderView.qml	2014-07-28 12:59:27 +0000
34
@@ -16,7 +16,7 @@
35
16
16
36
17
import QtQuick 2.2
17
import QtQuick 2.2
37
18
import QtQuick.Window 2.0
18
import QtQuick.Window 2.0
39
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
40
20
import QtMultimedia 5.0
20
import QtMultimedia 5.0
41
21
import CameraApp 0.1
21
import CameraApp 0.1
42
22
import QtGraphicalEffects 1.0
22
import QtGraphicalEffects 1.0
43
@@ -34,6 +34,7 @@
44
34
    Camera {
34
    Camera {
45
35
        id: camera
35
        id: camera
46
36
        captureMode: Camera.CaptureStillImage
36
        captureMode: Camera.CaptureStillImage
47
37
        StateSaver.properties: "captureMode"
48
37
38
49
38
        function manualFocus(x, y) {
39
        function manualFocus(x, y) {
50
39
            viewFinderOverlay.showFocusRing(x, y);
40
            viewFinderOverlay.showFocusRing(x, y);
51
@@ -59,7 +60,9 @@
52
59
        }
60
        }
53
60
61
54
61
        property AdvancedCameraSettings advanced: AdvancedCameraSettings {
62
        property AdvancedCameraSettings advanced: AdvancedCameraSettings {
55
63
            id: advancedCamera
56
62
            camera: camera
64
            camera: camera
57
65
            StateSaver.properties: "activeCameraIndex"
58
63
        }
66
        }
59
64
67
60
65
        Component.onCompleted: {
68
        Component.onCompleted: {
61
66
69
62
=== modified file 'camera-app.qml'
63
--- camera-app.qml	2014-07-03 10:18:06 +0000
64
+++ camera-app.qml	2014-07-28 12:59:27 +0000
65
@@ -137,6 +137,7 @@
66
137
        }
137
        }
67
138
138
68
139
        Row {
139
        Row {
69
140
            id: viewsRow
70
140
            anchors {
141
            anchors {
71
141
                top: parent.top
142
                top: parent.top
72
142
                bottom: parent.bottom
143
                bottom: parent.bottom
Reviewer	Review Type	Date Requested	Status
Ugo Riboni (community)			Approve on 2014-07-30
PS Jenkins bot	continuous-integration		Approve on 2014-07-28
Olivier Tilloy		2014-07-28	Pending
Review via email: mp+228482@code.launchpad.net