Reworked ModeButton to use a Switch

[harmattan/cameraplus] / qml / ImageSettingsPage.qml

diff --git a/qml/ImageSettingsPage.qml b/qml/ImageSettingsPage.qml
index 7b192ab..3678f24 100644 (file)
--- a/qml/ImageSettingsPage.qml
+++ b/qml/ImageSettingsPage.qml
@@ -1,4 +1,25 @@
 // -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
@@ -11,6 +32,7 @@ CameraPage {
         controlsVisible: false
         policyMode: CameraResources.Image
         needsPipeline: false
+        standbyVisible: !Qt.application.active
 
         Rectangle {
                 color: "black"
@@ -32,7 +54,7 @@ CameraPage {
                         spacing: 10
 
                         Label {
-                                // TODO:
+                                font.pixelSize: 36
                                 text: qsTr("Image settings");
                         }
 
@@ -42,6 +64,7 @@ CameraPage {
 
                         ButtonRow {
                                 anchors.horizontalCenter: parent.horizontalCenter
+                                // TODO:
                                 Button { text: qsTr("Normal"); }
                                 Button { text: qsTr("Self timer"); }
                                 Button { text: qsTr("Fast capture"); }
@@ -75,6 +98,7 @@ CameraPage {
 
                         ButtonRow {
                                 anchors.horizontalCenter: parent.horizontalCenter
+                                // TODO:
                                 Button { text: qsTr("2 seconds"); }
                                 Button { text: qsTr("10 seconds"); }
                         }
@@ -85,11 +109,36 @@ CameraPage {
 
                         ButtonRow {
                                 anchors.horizontalCenter: parent.horizontalCenter
-                                Button { text: qsTr("Automatic"); }
-                                Button { text: qsTr("ISO 100"); }
-                                Button { text: qsTr("ISO 200"); }
-                                Button { text: qsTr("ISO 400"); }
-                                Button { text: qsTr("ISO 800"); }
+
+                                Button {
+                                        text: qsTr("Automatic");
+                                        checked: settings.imageIso == 0;
+                                        onClicked: settings.imageIso = 0;
+                                }
+
+                                Button {
+                                        text: qsTr("ISO 100");
+                                        checked: settings.imageIso == 100;
+                                        onClicked: settings.imageIso = 100;
+                                }
+
+                                Button {
+                                        text: qsTr("ISO 200");
+                                        checked: settings.imageIso == 200;
+                                        onClicked: settings.imageIso = 200;
+                                }
+
+                                Button {
+                                        text: qsTr("ISO 400");
+                                        checked: settings.imageIso == 400;
+                                        onClicked: settings.imageIso = 400;
+                                }
+
+                                Button {
+                                        text: qsTr("ISO 800");
+                                        checked: settings.imageIso == 800;
+                                        onClicked: settings.imageIso = 800;
+                                }
                         }
 
                         SectionHeader {
@@ -98,9 +147,31 @@ CameraPage {
 
                         ButtonRow {
                                 anchors.horizontalCenter: parent.horizontalCenter
-                                Button { text: qsTr("16:9"); }
-                                Button { text: qsTr("4:3"); }
-                                Button { text: qsTr("3:2"); }
+                                exclusive: false
+                                onCheckedButtonChanged: {
+                                        // This is needed to initially setup the
+                                        // resolutions buttons
+                                        imageSettings.resolutions.aspectRatio = checkedButton.aspect;
+                                        settings.imageAspectRatio = imageSettings.resolutions.aspectRatio;
+                                }
+
+                                Repeater {
+                                        model: imageSettings.aspectRatios
+                                        delegate: Button {
+                                                property string aspect: modelData;
+                                                text: qsTr(modelData);
+                                                checked: settings.imageAspectRatio == modelData;
+                                                onClicked: {
+                                                        if (!cam.idle) {
+                                                                showError(qsTr("Camera is busy saving."));
+                                                                return;
+                                                        }
+
+                                                        settings.imageAspectRatio = modelData;
+                                                        imageSettings.resolutions.aspectRatio = modelData;
+                                                }
+                                        }
+                                }
                         }
 
                         SectionHeader {
@@ -108,10 +179,34 @@ CameraPage {
                         }
 
                         ButtonRow {
+                                id: resolutionsRow
                                 anchors.horizontalCenter: parent.horizontalCenter
-                                Button {}
-                                Button {}
-                                Button {}
+                                exclusive: false
+
+                                Repeater {
+                                        id: resolutions
+                                        model: imageSettings.resolutions
+
+                                        // http://stackoverflow.com/questions/1026069/capitalize-the-first-letter-of-string-in-javascript
+                                        function name(name, mp) {
+                                                return name.charAt(0).toUpperCase() + name.slice(1) + " " + mp + " Mpx";
+                                        }
+
+                                        delegate: Button {
+                                                property string resolution: resolutionName
+                                                property string aspectRatio: resolutionAspectRatio
+                                                text: resolutions.name(resolutionName, megaPixels);
+                                                checked: settings.imageResolution == resolutionName
+                                                onClicked: {
+                                                        if (!cam.idle) {
+                                                                showError(qsTr("Camera is busy saving."));
+                                                                return;
+                                                        }
+
+                                                        settings.imageResolution = resolutionName;
+                                                }
+                                        }
+                                }
                         }
 
                         CameraSettings {