Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / VideoColorFilterButton.qml

diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml
index 4d26b56..60f702a 100644 (file)
--- a/qml/VideoColorFilterButton.qml
+++ b/qml/VideoColorFilterButton.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 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
@@ -20,62 +20,62 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 
-ToolIcon {
-        id: button
+CameraToolIcon {
+    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: [
+        CameraLabel {
+            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
+        }
+    ]
 }