From 4387b91df7e73ac824feafefc6cce16353b3145f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Mon, 30 Sep 2013 10:17:05 +0300
Subject: Replaced buttons with QtQuick.Controls buttons

Task-number: QTRD-2344

Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 examples/qmlscatter/qml/qmlscatter/button.qml | 59 ---------------------------
 examples/qmlscatter/qml/qmlscatter/main.qml   | 13 +-----
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 examples/qmlscatter/qml/qmlscatter/button.qml

(limited to 'examples/qmlscatter/qml/qmlscatter')

diff --git a/examples/qmlscatter/qml/qmlscatter/button.qml b/examples/qmlscatter/qml/qmlscatter/button.qml
deleted file mode 100644
index 6da582b4..00000000
--- a/examples/qmlscatter/qml/qmlscatter/button.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-import QtQuick 2.1
-
-Item {
-    id: button
-
-    property alias text: buttonText.text
-    property alias color: buttonRectangle.color
-    property alias radius: buttonRectangle.radius
-
-    property color defaultColor: "lightgray"
-    property color pressedColor: "gray"
-    property color borderColor: "silver"
-
-    signal clicked
-
-    height: 90
-
-    Rectangle {
-        id: buttonRectangle
-        width: parent.width
-        height: parent.height
-        color: defaultColor
-        radius: 5
-        border.color: borderColor
-
-        Text {
-            id: buttonText
-            wrapMode: Text.WordWrap
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            anchors.fill: parent
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onPressed: buttonRectangle.color = pressedColor
-            onReleased: buttonRectangle.color = defaultColor
-            onClicked: button.clicked()
-        }
-    }
-}
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index ec049dd3..d3a650db 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -17,6 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
+import QtQuick.Controls 1.0
 import com.digia.QtDataVisualization 1.0
 import "."
 
@@ -31,7 +32,7 @@ Item {
     Item {
         id: dataView
         width: parent.width
-        height: parent.height - shadowToggle.height - 3
+        height: parent.height - shadowToggle.height
         anchors.bottom: parent.bottom
 
         Scatter3D {
@@ -75,7 +76,6 @@ Item {
     Button {
         id: smoothToggle
         width: parent.width / 6
-        defaultColor: "gainsboro"
         text: "Use Smooth Dots"
         anchors.left: shadowToggle.right
         onClicked: {
@@ -106,7 +106,6 @@ Item {
     Button {
         id: themeToggle
         width: parent.width / 6
-        defaultColor: "gainsboro"
         text: "Change Theme"
         anchors.left: cameraToggle.right
         onClicked: {
@@ -136,16 +135,8 @@ Item {
     Button {
         id: exitButton
         width: parent.width / 6
-        defaultColor: "lightsteelblue"
         text: "Quit"
         anchors.left: backgroundToggle.right
         onClicked: Qt.quit(0);
     }
-
-    Rectangle {
-        width: parent.width
-        height: 3
-        anchors.top: shadowToggle.bottom
-        anchors.bottom: dataView.top
-    }
 }
-- 
cgit v1.2.3