diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-30 10:17:05 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-30 10:20:35 +0300 |
commit | 4387b91df7e73ac824feafefc6cce16353b3145f (patch) | |
tree | 4dc77d98da290274bb96989b3faa3612c615b733 /examples/qmlsurface | |
parent | 08e4b647650294d2d365f23b3620019472d8cec1 (diff) |
Replaced buttons with QtQuick.Controls buttons
Task-number: QTRD-2344
Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Change-Id: I5a9e7a920d147ef6645a0d8c1c061b839ece2a1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples/qmlsurface')
-rw-r--r-- | examples/qmlsurface/qml/qmlsurface/button.qml | 59 | ||||
-rw-r--r-- | examples/qmlsurface/qmlsurface.qrc | 1 |
2 files changed, 0 insertions, 60 deletions
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"> |