summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--basicsuite/Camera/Controls.qml42
-rw-r--r--basicsuite/Camera/description.txt2
-rw-r--r--basicsuite/Camera/main.qml6
3 files changed, 25 insertions, 25 deletions
diff --git a/basicsuite/Camera/Controls.qml b/basicsuite/Camera/Controls.qml
index 63f750b..7f5e82d 100644
--- a/basicsuite/Camera/Controls.qml
+++ b/basicsuite/Camera/Controls.qml
@@ -5,7 +5,7 @@ Item {
id: controlsRoot
anchors.fill: parent
- property alias cameraMode: cameraModeControl.selectedValue
+// property alias cameraMode: cameraModeControl.selectedValue
property alias requestedZoom: zoomControl.requestedZoom
property alias actualZoom: zoomControl.actualZoom
@@ -37,26 +37,26 @@ Item {
anchors.bottomMargin: 50
}
- CameraSetting {
- id: cameraModeControl
- anchors.right: parent.right
- anchors.rightMargin: 20
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 20
- title: "MODE"
- model: ListModel {
- ListElement {
- name: "Picture"
- value: Camera.CaptureStillImage
- }
- ListElement {
- name: "Video"
- value: Camera.CaptureVideo
- }
- }
- onCountChanged: currentIndex = 0
- enabled: controlsRoot.captureReady
- }
+// CameraSetting {
+// id: cameraModeControl
+// anchors.right: parent.right
+// anchors.rightMargin: 20
+// anchors.bottom: parent.bottom
+// anchors.bottomMargin: 20
+// title: "MODE"
+// model: ListModel {
+// ListElement {
+// name: "Picture"
+// value: Camera.CaptureStillImage
+// }
+// ListElement {
+// name: "Video"
+// value: Camera.CaptureVideo
+// }
+// }
+// onCountChanged: currentIndex = 0
+// enabled: controlsRoot.captureReady
+// }
RecordingTime {
anchors.right: parent.right
diff --git a/basicsuite/Camera/description.txt b/basicsuite/Camera/description.txt
index 7e94e89..71c3c44 100644
--- a/basicsuite/Camera/description.txt
+++ b/basicsuite/Camera/description.txt
@@ -1,5 +1,5 @@
This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick.
-It can take pictures and record videos. Files are saved inside the 'DCIM' folder on the external storage.
+Demo can be used to take pictures. Files are saved inside the /data/images/ folder and can be viewed with the "Photo Gallery" application.
Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides.
diff --git a/basicsuite/Camera/main.qml b/basicsuite/Camera/main.qml
index a1cc89c..6a428e4 100644
--- a/basicsuite/Camera/main.qml
+++ b/basicsuite/Camera/main.qml
@@ -43,7 +43,7 @@ Rectangle {
onLockStatusChanged: {
if (camera.lockStatus === Camera.Locked && captureWhenLocked) {
- camera.imageCapture.capture();
+ camera.imageCapture.captureToLocation("/data/images/");
captureWhenLocked = false;
}
}
@@ -160,7 +160,7 @@ Rectangle {
actualZoom: camera.digitalZoom
maximumZoom: camera.maximumDigitalZoom
- onCameraModeChanged: camera.captureMode = controls.cameraMode
+ //onCameraModeChanged: camera.captureMode = controls.cameraMode
onFlashModeChanged: if (visible) camera.flash.mode = controls.flashMode
onFocusModeChanged: if (visible) camera.focus.focusMode = controls.focusMode
@@ -195,7 +195,7 @@ Rectangle {
camera.captureWhenLocked = true;
camera.searchAndLock();
} else {
- camera.imageCapture.capture();
+ camera.imageCapture.captureToLocation("/data/images/");
}
}
}