X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FImageSettingsPage.qml;h=0a97118a4589f625479dcc4903e8f5535a06f20a;hp=c4ceaa33161d096f5d447f542af3f333b2c1d1e9;hb=141837d9a3476042178740eb54a05dcf830c2cbe;hpb=133373505c389750c7d500bebafc872aaa891930

diff --git a/qml/ImageSettingsPage.qml b/qml/ImageSettingsPage.qml
index c4ceaa3..0a97118 100644
--- a/qml/ImageSettingsPage.qml
+++ b/qml/ImageSettingsPage.qml
@@ -31,7 +31,8 @@ CameraPage {
         id: page
         controlsVisible: false
         policyMode: CameraResources.Image
-        needsPipeline: false
+        enableViewfinder: false
+        standbyVisible: !Qt.application.active
 
         Rectangle {
                 color: "black"
@@ -39,6 +40,7 @@ CameraPage {
         }
 
         Flickable {
+                id: flickable
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -53,93 +55,10 @@ CameraPage {
                         spacing: 10
 
                         Label {
-                                // TODO:
+                                font.pixelSize: 36
                                 text: qsTr("Image settings");
                         }
 
-                        SectionHeader {
-                                text: qsTr("Capture mode");
-                        }
-
-                        ButtonRow {
-                                anchors.horizontalCenter: parent.horizontalCenter
-                                // TODO:
-                                Button { text: qsTr("Normal"); }
-                                Button { text: qsTr("Self timer"); }
-                                Button { text: qsTr("Fast capture"); }
-                        }
-
-                        Row {
-                                width: parent.width
-
-                                ListItem {
-                                        id: wb
-                                        width: parent.width / 2
-                                        title: qsTr("White balance");
-                                        subtitle: Data.wbName(settings.imageWhiteBalance);
-                                        iconId: Data.wbSelectedIcon(settings.imageWhiteBalance);
-                                        onClicked: openFile("ImageWhiteBalancePage.qml");
-                                }
-
-                                ListItem {
-                                        id: cf
-                                        width: parent.width / 2
-                                        title: qsTr("Color filter");
-                                        subtitle: Data.cfName(settings.imageColorFilter);
-                                        iconId: Data.cfSelectedIcon(settings.imageColorFilter);
-                                        onClicked: openFile("ImageColorFilterPage.qml");
-                                }
-                        }
-
-                        SectionHeader {
-                                text: qsTr("Self timer");
-                        }
-
-                        ButtonRow {
-                                anchors.horizontalCenter: parent.horizontalCenter
-                                // TODO:
-                                Button { text: qsTr("2 seconds"); }
-                                Button { text: qsTr("10 seconds"); }
-                        }
-
-                        SectionHeader {
-                                text: qsTr("Light sensitivity");
-                        }
-
-                        ButtonRow {
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                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 {
                                 text: qsTr("Aspect ratio");
                         }
@@ -219,7 +138,7 @@ CameraPage {
                 anchors.bottom: parent.bottom
                 tools: ToolBarLayout {
                         id: layout
-                        ToolIcon { iconId: "icon-m-toolbar-back"; onClicked: pageStack.pop(); }
+                        ToolIcon { iconId: "icon-m-toolbar-back-white"; onClicked: pageStack.pop(); }
                 }
         }
 }