Replaced buttons with QtQuick.Controls buttons

Task-number: QTRD-2344

Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

8 files changed, 21 insertions, 210 deletions

diff --git a/examples/qmlbarchart/qml/qmlbarchart/button.qml b/examples/qmlbarchart/qml/qmlbarchart/button.qml
deleted file mode 100644
index ac7d1be4..00000000
--- a/examples/qmlbarchart/qml/qmlbarchart/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: "wheat"
-    property color pressedColor: "tan"
-    property color borderColor: "sienna"
-
-    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/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index 17dc5562..8159aff8 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -80,25 +80,6 @@ Item {
         }
     }
 
-    TableView {
-        id: tableView
-        x: 0
-        y: 0
-        width: 298
-        height: parent.height - mappingToggle.height - shadowToggle.height - dataToggle.height
-        TableViewColumn{ role: "year"  ; title: "Year" ; width: 80 }
-        TableViewColumn{ role: "month" ; title: "Month" ; width: 80 }
-        TableViewColumn{ role: "expenses" ; title: "Expenses" ; width: 60 }
-        TableViewColumn{ role: "income" ; title: "Income" ; width: 60 }
-        model: chartData.model
-
-        onCurrentRowChanged: {
-            var rowIndex = chartData.proxy.activeMapping.rowCategoryIndex(chartData.model.get(currentRow).year)
-            var colIndex = chartData.proxy.activeMapping.columnCategoryIndex(chartData.model.get(currentRow).month)
-            testChart.selectedBarPos = Qt.point(rowIndex, colIndex)
-        }
-    }
-
     Button {
         id: mappingToggle
         anchors.bottom: parent.bottom
@@ -151,4 +132,23 @@ Item {
             }
         }
     }
+
+    TableView {
+        id: tableView
+        x: 0
+        y: 0
+        width: 298
+        height: parent.height - mappingToggle.height - shadowToggle.height - dataToggle.height
+        TableViewColumn{ role: "year"  ; title: "Year" ; width: 80 }
+        TableViewColumn{ role: "month" ; title: "Month" ; width: 80 }
+        TableViewColumn{ role: "expenses" ; title: "Expenses" ; width: 60 }
+        TableViewColumn{ role: "income" ; title: "Income" ; width: 60 }
+        model: chartData.model
+
+        onCurrentRowChanged: {
+            var rowIndex = chartData.proxy.activeMapping.rowCategoryIndex(chartData.model.get(currentRow).year)
+            var colIndex = chartData.proxy.activeMapping.columnCategoryIndex(chartData.model.get(currentRow).month)
+            testChart.selectedBarPos = Qt.point(rowIndex, colIndex)
+        }
+    }
 }
diff --git a/examples/qmlbarchart/qmlbarchart.qrc b/examples/qmlbarchart/qmlbarchart.qrc
index 999cc888..a2c7d75b 100644
--- a/examples/qmlbarchart/qmlbarchart.qrc
+++ b/examples/qmlbarchart/qmlbarchart.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/qml">
         <file alias="main.qml">qml/qmlbarchart/main.qml</file>
-        <file alias="Button.qml">qml/qmlbarchart/button.qml</file>
         <file alias="Data.qml">qml/qmlbarchart/data.qml</file>
         <file alias="Axes.qml">qml/qmlbarchart/axes.qml</file>
     </qresource>
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
-    }
 }
diff --git a/examples/qmlscatter/qmlscatter.qrc b/examples/qmlscatter/qmlscatter.qrc
index 365dec1f..3746e6b3 100644
--- a/examples/qmlscatter/qmlscatter.qrc
+++ b/examples/qmlscatter/qmlscatter.qrc
@@ -2,6 +2,5 @@
     <qresource prefix="/qml">
         <file alias="main.qml">qml/qmlscatter/main.qml</file>
         <file alias="Data.qml">qml/qmlscatter/data.qml</file>
-        <file alias="Button.qml">qml/qmlscatter/button.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmlsurface/qml/qmlsurface/button.qml b/examples/qmlsurface/qml/qmlsurface/button.qml
deleted file mode 100644
index 761bd1e1..00000000
--- a/examples/qmlsurface/qml/qmlsurface/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: "steelblue"
-    property color pressedColor: "lightsteelblue"
-    property color borderColor: "darkblue"
-
-    signal clicked
-
-    height: 75
-
-    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/qmlsurface/qmlsurface.qrc b/examples/qmlsurface/qmlsurface.qrc
index 66527608..9c2e9108 100644
--- a/examples/qmlsurface/qmlsurface.qrc
+++ b/examples/qmlsurface/qmlsurface.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/qml">
         <file alias="main.qml">qml/qmlsurface/main.qml</file>
-        <file alias="Button.qml">qml/qmlsurface/button.qml</file>
         <file alias="Data.qml">qml/qmlsurface/data.qml</file>
     </qresource>
     <qresource prefix="/heightmaps">