Indented

diff --git a/qml/CheckButton.qml b/qml/CheckButton.qml
index ae37d9d..573a301 100644 (file)
--- a/qml/CheckButton.qml
+++ b/qml/CheckButton.qml
@@ -24,11 +24,11 @@ import QtQuick 1.1
 import com.nokia.meego 1.1
 
 ToolIcon {
-        id: button
-        property string normalIcon: ""
-        property string checkedIcon: ""
-        property int value: -1
-        property int savedValue: -1
+    id: button
+    property string normalIcon: ""
+    property string checkedIcon: ""
+    property int value: -1
+    property int savedValue: -1
 
-        iconSource: savedValue == value ? checkedIcon : normalIcon
+    iconSource: savedValue == value ? checkedIcon : normalIcon
 }

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 9582323..2f5497b 100644 (file)
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -26,42 +26,43 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode)
+    iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Flash");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.flashIcon(value)
-                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-                        onClicked: settings.imageFlashMode = value;
-                        value: Flash.Auto
-                        savedValue: settings.imageFlashMode
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.flashIcon(value)
-                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-                        onClicked: settings.imageFlashMode = value;
-                        value: Flash.On
-                        savedValue: settings.imageFlashMode
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.flashIcon(value)
-                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-                        onClicked: settings.imageFlashMode = value;
-                        value: Flash.Off
-                        savedValue: settings.imageFlashMode
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.flashIcon(value)
-                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-                        onClicked: settings.imageFlashMode = value;
-                        value: Flash.RedEye
-                        savedValue: settings.imageFlashMode
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("Flash")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.flashIcon(value)
+            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+            onClicked: settings.imageFlashMode = value
+            value: Flash.Auto
+            savedValue: settings.imageFlashMode
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.flashIcon(value)
+            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+            onClicked: settings.imageFlashMode = value
+            value: Flash.On
+            savedValue: settings.imageFlashMode
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.flashIcon(value)
+            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+            onClicked: settings.imageFlashMode = value
+            value: Flash.Off
+            savedValue: settings.imageFlashMode
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.flashIcon(value)
+            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+            onClicked: settings.imageFlashMode = value
+            value: Flash.RedEye
+            savedValue: settings.imageFlashMode
+        }
+    ]
 }

diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml
index d3c9ed3..75680dd 100644 (file)
--- a/qml/ImageColorFilterButton.qml
+++ b/qml/ImageColorFilterButton.qml
@@ -26,55 +26,56 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
-        iconSource: "image://theme/" + Data.cfIcon(settings.imageColorFilter);
+    id: button
+    iconSource: "image://theme/" + Data.cfIcon(settings.imageColorFilter)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Filter");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Normal
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.GrayScale
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Sepia
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Vivid
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Negative
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Solarize
-                        savedValue: settings.imageColorFilter
-                        onClicked: settings.imageColorFilter = value;
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("Filter")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Normal
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.GrayScale
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Sepia
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Vivid
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Negative
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Solarize
+            savedValue: settings.imageColorFilter
+            onClicked: settings.imageColorFilter = value
+        }
+    ]
 }

diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml
index b237ddd..b916be0 100644 (file)
--- a/qml/ImageIsoButton.qml
+++ b/qml/ImageIsoButton.qml
@@ -26,54 +26,55 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.isoIcon(settings.imageIso);
+    iconSource: "image://theme/" + Data.isoIcon(settings.imageIso)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("ISO");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                Button {
-                        property int value: 0
-                        onClicked: settings.imageIso = value;
-                        text: qsTr("Auto")
-                        width: 100
-                        checked: settings.imageIso == value
-                        anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-                },
-                Button {
-                        property int value: 100
-                        onClicked: settings.imageIso = value;
-                        text: value
-                        width: 100
-                        checked: settings.imageIso == value
-                        anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-                },
-                Button {
-                        property int value: 200
-                        onClicked: settings.imageIso = value;
-                        text: value
-                        width: 100
-                        checked: settings.imageIso == value
-                        anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-                },
-                Button {
-                        property int value: 400
-                        onClicked: settings.imageIso = value;
-                        text: value
-                        width: 100
-                        checked: settings.imageIso == value
-                        anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-                },
-                Button {
-                        property int value: 800
-                        onClicked: settings.imageIso = value;
-                        text: value
-                        width: 100
-                        checked: settings.imageIso == value
-                        anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("ISO")
+            verticalAlignment: Text.AlignVCenter
+        },
+        Button {
+            property int value: 0
+            onClicked: settings.imageIso = value
+            text: qsTr("Auto")
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        Button {
+            property int value: 100
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        Button {
+            property int value: 200
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        Button {
+            property int value: 400
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        Button {
+            property int value: 800
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        }
+    ]
 }

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index f30716b..5cae56c 100644 (file)
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -26,56 +26,57 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.ismIcon(settings.imageSceneMode);
+    iconSource: "image://theme/" + Data.ismIcon(settings.imageSceneMode)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Scene");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Auto
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Closeup
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Landscape
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Portrait
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Night
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Sport
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("Scene")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Auto
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Closeup
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Landscape
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Portrait
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Night
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.ismIcon(value)
+            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
+            savedValue: settings.imageSceneMode
+            onClicked: settings.imageSceneMode = value
+            value: Scene.Sport
+        }
+    ]
 }

diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index 8c3fc91..6d60392 100644 (file)
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -26,49 +26,50 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.wbIcon(settings.imageWhiteBalance);
+    iconSource: "image://theme/" + Data.wbIcon(settings.imageWhiteBalance)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("WB");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        onClicked: settings.imageWhiteBalance = value;
-                        value: WhiteBalance.Auto
-                        savedValue: settings.imageWhiteBalance
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        onClicked: settings.imageWhiteBalance = value;
-                        value: WhiteBalance.Sunset
-                        savedValue: settings.imageWhiteBalance
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        onClicked: settings.imageWhiteBalance = value;
-                        value: WhiteBalance.Cloudy
-                        savedValue: settings.imageWhiteBalance
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        onClicked: settings.imageWhiteBalance = value;
-                        value: WhiteBalance.Flourescent
-                        savedValue: settings.imageWhiteBalance
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        onClicked: settings.imageWhiteBalance = value;
-                        value: WhiteBalance.Tungsten
-                        savedValue: settings.imageWhiteBalance
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("WB")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            onClicked: settings.imageWhiteBalance = value
+            value: WhiteBalance.Auto
+            savedValue: settings.imageWhiteBalance
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            onClicked: settings.imageWhiteBalance = value
+            value: WhiteBalance.Sunset
+            savedValue: settings.imageWhiteBalance
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            onClicked: settings.imageWhiteBalance = value
+            value: WhiteBalance.Cloudy
+            savedValue: settings.imageWhiteBalance
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            onClicked: settings.imageWhiteBalance = value
+            value: WhiteBalance.Flourescent
+            savedValue: settings.imageWhiteBalance
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            onClicked: settings.imageWhiteBalance = value
+            value: WhiteBalance.Tungsten
+            savedValue: settings.imageWhiteBalance
+        }
+    ]
 }

diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml
index 8ce290e..886d2ab 100644 (file)
--- a/qml/VideoColorFilterButton.qml
+++ b/qml/VideoColorFilterButton.qml
@@ -26,56 +26,57 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.cfIcon(settings.videoColorFilter);
+    iconSource: "image://theme/" + Data.cfIcon(settings.videoColorFilter)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Filter");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Normal
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.GrayScale
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Sepia
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Vivid
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Negative
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.cfIcon(value);
-                        checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
-                        value: ColorTone.Solarize
-                        savedValue: settings.videoColorFilter
-                        onClicked: settings.videoColorFilter = value;
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("Filter")
+            verticalAlignment: Text.AlignVCenter
+            },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Normal
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.GrayScale
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Sepia
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Vivid
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Negative
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.cfIcon(value)
+            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
+            value: ColorTone.Solarize
+            savedValue: settings.videoColorFilter
+            onClicked: settings.videoColorFilter = value
+        }
+    ]
 }

diff --git a/qml/VideoMuteButton.qml b/qml/VideoMuteButton.qml
index 214e7b2..7df6aa6 100644 (file)
--- a/qml/VideoMuteButton.qml
+++ b/qml/VideoMuteButton.qml
@@ -24,6 +24,7 @@ import QtQuick 1.1
 import com.nokia.meego 1.1
 
 ToolIcon {
-        iconSource: settings.videoMuted ? "image://theme/icon-m-toolbar-volume-off-white-selected" : "image://theme/icon-m-toolbar-volume-white-selected"
-        onClicked: settings.videoMuted = !settings.videoMuted;
+    iconSource: settings.videoMuted ? "image://theme/icon-m-toolbar-volume-off-white-selected" :
+        "image://theme/icon-m-toolbar-volume-white-selected"
+    onClicked: settings.videoMuted = !settings.videoMuted
 }

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index ceb4a44..d87d483 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -26,27 +26,29 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode);
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Scene");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.vsmIcon(value);
-                        checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value);
-                        savedValue: settings.videoSceneMode
-                        onClicked: settings.videoSceneMode = value;
-                        value: Scene.Auto
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.vsmIcon(value);
-                        checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value);
-                        savedValue: settings.videoSceneMode
-                        onClicked: settings.videoSceneMode = value;
-                        value: Scene.Night
-                }]
+    iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode)
+
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("Scene")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.vsmIcon(value)
+            checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value)
+            savedValue: settings.videoSceneMode
+            onClicked: settings.videoSceneMode = value
+            value: Scene.Auto
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.vsmIcon(value)
+            checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value)
+            savedValue: settings.videoSceneMode
+            onClicked: settings.videoSceneMode = value
+            value: Scene.Night
+        }
+    ]
 }

diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml
index f98ec4a..33ab5eb 100644 (file)
--- a/qml/VideoWhiteBalanceButton.qml
+++ b/qml/VideoWhiteBalanceButton.qml
@@ -26,49 +26,50 @@ import QtCamera 1.0
 import "data.js" as Data
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: "image://theme/" + Data.wbIcon(settings.videoWhiteBalance);
+    iconSource: "image://theme/" + Data.wbIcon(settings.videoWhiteBalance)
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("WB");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        value: WhiteBalance.Auto
-                        savedValue: settings.videoWhiteBalance
-                        onClicked: settings.videoWhiteBalance = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        value: WhiteBalance.Sunset
-                        savedValue: settings.videoWhiteBalance
-                        onClicked: settings.videoWhiteBalance = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        value: WhiteBalance.Cloudy
-                        savedValue: settings.videoWhiteBalance
-                        onClicked: settings.videoWhiteBalance = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        value: WhiteBalance.Flourescent
-                        savedValue: settings.videoWhiteBalance
-                        onClicked: settings.videoWhiteBalance = value;
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.wbIcon(value);
-                        checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
-                        value: WhiteBalance.Tungsten
-                        savedValue: settings.videoWhiteBalance
-                        onClicked: settings.videoWhiteBalance = value;
-                }]
+    property list<Item> items: [
+        Label {
+            height: parent ? parent.height : 0
+            text: qsTr("WB")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            value: WhiteBalance.Auto
+            savedValue: settings.videoWhiteBalance
+            onClicked: settings.videoWhiteBalance = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            value: WhiteBalance.Sunset
+            savedValue: settings.videoWhiteBalance
+            onClicked: settings.videoWhiteBalance = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            value: WhiteBalance.Cloudy
+            savedValue: settings.videoWhiteBalance
+            onClicked: settings.videoWhiteBalance = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            value: WhiteBalance.Flourescent
+            savedValue: settings.videoWhiteBalance
+            onClicked: settings.videoWhiteBalance = value
+        },
+        CheckButton {
+            normalIcon: "image://theme/" + Data.wbIcon(value)
+            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
+            value: WhiteBalance.Tungsten
+            savedValue: settings.videoWhiteBalance
+            onClicked: settings.videoWhiteBalance = value
+        }
+    ]
 }

diff --git a/qml/qml.qrc b/qml/qml.qrc
index f6a8f99..1f94dd8 100644 (file)
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -35,17 +35,17 @@
        <file>ImageEvCompButton.qml</file>
        <file>VideoEvCompButton.qml</file>
        <file>VideoTorchButton.qml</file>
-
-       <file>CameraPage.qml</file>
        <file>FlashButton.qml</file>
        <file>ImageSceneButton.qml</file>
-       <file>ImageWhiteBalanceButton.qml</file>
-       <file>ImageColorFilterButton.qml</file>
-       <file>ImageIsoButton.qml</file>
+       <file>VideoMuteButton.qml</file>
        <file>CheckButton.qml</file>
+       <file>ImageIsoButton.qml</file>
+       <file>ImageWhiteBalanceButton.qml</file>
        <file>VideoSceneButton.qml</file>
+       <file>ImageColorFilterButton.qml</file>
        <file>VideoWhiteBalanceButton.qml</file>
        <file>VideoColorFilterButton.qml</file>
-       <file>VideoMuteButton.qml</file>
+
+       <file>CameraPage.qml</file>
     </qresource>
 </RCC>