From: Mohammed Sameer <msameer@foolab.org>
Date: Sun, 9 Sep 2012 01:59:31 +0000 (+0300)
Subject: More widgets added to the image settings page and added CameraSettings.qml but nothin... 
X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=6eac9383b1e7179f768df5276c51305cdbf0c7a1

More widgets added to the image settings page and added CameraSettings.qml but nothing really works
---

diff --git a/qml/CameraSettings.qml b/qml/CameraSettings.qml
new file mode 100644
index 0000000..6d63c78
--- /dev/null
+++ b/qml/CameraSettings.qml
@@ -0,0 +1,64 @@
+// -*- qml -*-
+import QtQuick 1.1
+import com.nokia.meego 1.1
+
+Column {
+        id: col
+        spacing: 10
+
+        Label {
+                // TODO:
+                text: qsTr("Camera settings");
+        }
+
+        SectionHeader {
+                text: qsTr("Show captured content");
+        }
+
+        ButtonRow {
+                anchors.horizontalCenter: parent.horizontalCenter
+                Button { text: qsTr("Disabled"); }
+                Button { text: qsTr("2 seconds"); }
+                Button { text: qsTr("5 seconds"); }
+                Button { text: qsTr("No timeout"); }
+        }
+
+        SectionHeader {
+                text: qsTr("Creator name");
+        }
+
+        TextField {
+                placeholderText: qsTr("Name or copyright");
+                width: parent.width
+        }
+
+        Item {
+                width: parent.width
+                height: 40 // TODO: hardcoded
+
+                Label {
+                        id: gpsLabel
+                        anchors.left: parent.left
+                        text: qsTr("Use GPS");
+                }
+
+                Switch {
+                        anchors.right: parent.right
+                }
+        }
+
+        Item {
+                width: parent.width
+                height: 40 // TODO: hardcoded
+
+                Label {
+                        id: geotagsLabel
+                        anchors.left: parent.left
+                        text: qsTr("Use geotags");
+                }
+
+                Switch {
+                        anchors.right: parent.right
+                }
+        }
+}
diff --git a/qml/ImageSettingsPage.qml b/qml/ImageSettingsPage.qml
index aca5b74..407612a 100644
--- a/qml/ImageSettingsPage.qml
+++ b/qml/ImageSettingsPage.qml
@@ -19,15 +19,31 @@ Page {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: toolBar.top
+                anchors.margins: 10
+                contentHeight: col.height
 
                 Column {
+                        id: col
+
                         width: parent.width
+                        spacing: 10
 
                         Label {
                                 // TODO:
                                 text: qsTr("Image settings");
                         }
 
+                        SectionHeader {
+                                text: qsTr("Capture mode");
+                        }
+
+                        ButtonRow {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                Button { text: qsTr("Normal"); }
+                                Button { text: qsTr("Self timer"); }
+                                Button { text: qsTr("Fast capture"); }
+                        }
+
                         Row {
                                 width: parent.width
 
@@ -49,6 +65,55 @@ Page {
                                         onClicked: openFile("ImageColorFilterPage.qml");
                                 }
                         }
+
+                        SectionHeader {
+                                text: qsTr("Self timer");
+                        }
+
+                        ButtonRow {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                Button { text: qsTr("2 seconds"); }
+                                Button { text: qsTr("10 seconds"); }
+                        }
+
+                        SectionHeader {
+                                text: qsTr("Light sensitivity");
+                        }
+
+                        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"); }
+                        }
+
+                        SectionHeader {
+                                text: qsTr("Aspect ratio");
+                        }
+
+                        ButtonRow {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                Button { text: qsTr("16:9"); }
+                                Button { text: qsTr("4:3"); }
+                                Button { text: qsTr("3:2"); }
+                        }
+
+                        SectionHeader {
+                                text: qsTr("Resolution");
+                        }
+
+                        ButtonRow {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                Button {}
+                                Button {}
+                                Button {}
+                        }
+
+                        CameraSettings {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                        }
                 }
         }