Kill com.nokia.meego importing in the ui.

[harmattan/cameraplus] / qml / ImageColorFilterButton.qml

diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml
index d3c9ed3..2b9eb5a 100644 (file)
--- a/qml/ImageColorFilterButton.qml
+++ b/qml/ImageColorFilterButton.qml
@@ -20,61 +20,61 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+@IMPORT_QT_QUICK@
 import QtCamera 1.0
 import "data.js" as Data
 
-ToolIcon {
-        id: button
-        iconSource: "image://theme/" + Data.cfIcon(settings.imageColorFilter);
+CameraToolIcon {
+    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: [
+        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.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
+        }
+    ]
 }