Switch toolbar animation to opacity

[harmattan/cameraplus] / qml / CaptureButton.qml

diff --git a/qml/CaptureButton.qml b/qml/CaptureButton.qml
index 38e1f0e..2c6d4fc 100644 (file)
--- a/qml/CaptureButton.qml
+++ b/qml/CaptureButton.qml
@@ -20,14 +20,13 @@
  * 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
 
 Item {
     id: button
 
-    property url iconSource
-    property Style platformStyle: ButtonStyle {}
+    property alias iconSource: icon.source
+    property CameraButtonStyle platformStyle: CameraButtonStyle {}
 
     property alias pressed: mouse.pressed
     property alias mouseX: mouse.mouseX
@@ -50,7 +49,7 @@ Item {
         border.top: button.platformStyle.backgroundMarginTop
         border.right: button.platformStyle.backgroundMarginRight
         border.bottom: button.platformStyle.backgroundMarginBottom
-        source:  pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
+        source: pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
     }
 
     Image {
@@ -58,7 +57,6 @@ Item {
         anchors.centerIn: parent
         anchors.verticalCenter: parent.verticalCenter
         anchors.verticalCenterOffset: -1
-        source: button.iconSource
         visible: source != ""
     }
-}
\ No newline at end of file
+}