X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FImageColorFilterButton.qml;h=1af5b3ee560d4efbff8dc1b86db0accfa4e16776;hp=c28a54ebabe1098b671cf3b1c7e70dd52448d6a7;hb=b37d0ab04228a193a8302417f0657a73c8fdbd3f;hpb=bb079e0dff5557e811af63194a86a5d6548b4cfd;ds=sidebyside

diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml
index c28a54e..1af5b3e 100644
--- a/qml/ImageColorFilterButton.qml
+++ b/qml/ImageColorFilterButton.qml
@@ -20,62 +20,38 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
-ToolIcon {
+CameraToolIcon {
     id: button
-    iconSource: "image://theme/" + Data.cfIcon(settings.imageColorFilter)
 
-    property list<Item> items: [
-        Label {
+    iconSource: cameraTheme.colorFilterIcon(settings.imageColorFilter)
+
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.colorFilterNormalIconId; value: ColorTone.Normal },
+        ToolsModelItem {icon: cameraTheme.colorFilterGrayScaleIconId; value: ColorTone.GrayScale },
+        ToolsModelItem {icon: cameraTheme.colorFilterSepiaIconId; value: ColorTone.Sepia },
+        ToolsModelItem {icon: cameraTheme.colorFilterVividIconId; value: ColorTone.Vivid },
+        ToolsModelItem {icon: cameraTheme.colorFilterNegativeIconId; value: ColorTone.Negative },
+        ToolsModelItem {icon: cameraTheme.colorFilterSolarizeIconId; value: ColorTone.Solarize }
+    ]
+
+    property CameraToolBarTools tools: CameraToolBarTools {
+        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
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageColorFilter = value
+                checked: settings.imageColorFilter == value
+            }
+        }
+    }
 }