Hide post capture toolbar immediately when we start video playback

[harmattan/cameraplus] / qml / VideoColorFilterButton.qml

diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml
index 60f702a..284caaa 100644 (file)
--- a/qml/VideoColorFilterButton.qml
+++ b/qml/VideoColorFilterButton.qml
@@ -27,55 +27,49 @@ import "data.js" as Data
 CameraToolIcon {
     id: button
 
-    iconSource: "image://theme/" + Data.cfIcon(settings.videoColorFilter)
+    iconId: Data.cfIcon(settings.videoColorFilter)
 
-    property list<Item> items: [
+    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.videoColorFilter
-            onClicked: settings.videoColorFilter = value
-        },
+            iconId: Data.cfIcon(ColorTone.Normal)
+            onClicked: settings.videoColorFilter = ColorTone.Normal
+            checked: settings.videoColorFilter == ColorTone.Normal
+        }
+
         CheckButton {
-            normalIcon: "image://theme/" + Data.cfIcon(value)
-            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
-            value: ColorTone.GrayScale
-            savedValue: settings.videoColorFilter
-            onClicked: settings.videoColorFilter = value
-        },
+            iconId: Data.cfIcon(ColorTone.GrayScale)
+            onClicked: settings.videoColorFilter = ColorTone.GrayScale
+            checked: settings.videoColorFilter == ColorTone.GrayScale
+        }
+
         CheckButton {
-            normalIcon: "image://theme/" + Data.cfIcon(value)
-            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
-            value: ColorTone.Sepia
-            savedValue: settings.videoColorFilter
-            onClicked: settings.videoColorFilter = value
-        },
+            iconId: Data.cfIcon(ColorTone.Sepia)
+            onClicked: settings.videoColorFilter = ColorTone.Sepia
+            checked: settings.videoColorFilter == ColorTone.Sepia
+        }
+
         CheckButton {
-            normalIcon: "image://theme/" + Data.cfIcon(value)
-            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
-            value: ColorTone.Vivid
-            savedValue: settings.videoColorFilter
-            onClicked: settings.videoColorFilter = value
-        },
+            iconId: Data.cfIcon(ColorTone.Vivid)
+            onClicked: settings.videoColorFilter = ColorTone.Vivid
+            checked: settings.videoColorFilter == ColorTone.Vivid
+        }
+
         CheckButton {
-            normalIcon: "image://theme/" + Data.cfIcon(value)
-            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
-            value: ColorTone.Negative
-            savedValue: settings.videoColorFilter
-            onClicked: settings.videoColorFilter = value
-        },
+            iconId: Data.cfIcon(ColorTone.Negative)
+            onClicked: settings.videoColorFilter = ColorTone.Negative
+            checked: settings.videoColorFilter == ColorTone.Negative
+        }
+
         CheckButton {
-            normalIcon: "image://theme/" + Data.cfIcon(value)
-            checkedIcon: "image://theme/" + Data.cfSelectedIcon(value)
-            value: ColorTone.Solarize
-            savedValue: settings.videoColorFilter
-            onClicked: settings.videoColorFilter = value
+            iconId: Data.cfIcon(ColorTone.Solarize)
+            onClicked: settings.videoColorFilter = ColorTone.Solarize
+            checked: settings.videoColorFilter == ColorTone.Solarize
         }
-    ]
+    }
 }