From: Christiaan Janssen <christiaan.janssen@digia.com>
Date: Fri, 23 Nov 2012 15:28:38 +0000 (+0100)
Subject: Declarative Examples: improved buttons in particles/wander example
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7508e71f0d4e88d180cf602b0fdc5484ef0b684e;p=konrad%2Fqtdeclarative.git

Declarative Examples: improved buttons in particles/wander example

Change-Id: I5c8019e702d848c8ec61ea850502c68f378c44fe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---

diff --git a/examples/particles/affectors/content/GreyButton.qml b/examples/particles/affectors/content/GreyButton.qml
new file mode 100644
index 0000000..e3d3daa
--- /dev/null
+++ b/examples/particles/affectors/content/GreyButton.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Item {
+    id: container
+
+    property string text: "Button"
+    property string subText: ""
+    signal clicked
+
+    width: buttonLabel.width + 20; height: col.height + 12
+
+    MouseArea {
+        id: mouseArea;
+        anchors.fill: parent;
+        onClicked: container.clicked();
+        onPressed: background.color = Qt.darker("lightgrey");
+        onReleased: background.color="lightgrey";
+    }
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: "lightgrey"
+        radius: 4
+        border.width: 1
+        border.color: Qt.darker(color)
+    }
+
+    Column {
+        spacing: 2
+        id: col
+        x: 10
+        y: 6
+        Text {
+            id: buttonLabel; text: container.text; color: "black"; font.pixelSize: 24
+        }
+        Text {
+            id: buttonLabel2; text: container.subText; color: "black"; font.pixelSize: 12
+        }
+    }
+}
diff --git a/examples/particles/affectors/content/wander.qml b/examples/particles/affectors/content/wander.qml
index 0077ffd..f8ac7ba 100644
--- a/examples/particles/affectors/content/wander.qml
+++ b/examples/particles/affectors/content/wander.qml
@@ -81,15 +81,16 @@ Rectangle {
     Row {
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
-        UI.Button {
+        spacing: 4
+        GreyButton {
             text:"dx/dt"
             onClicked: wanderer.affectedParameter = Wander.Position;
         }
-        UI.Button {
+        GreyButton {
             text:"dv/dt"
             onClicked: wanderer.affectedParameter = Wander.Velocity;
         }
-        UI.Button {
+        GreyButton {
             text:"da/dt"
             onClicked: wanderer.affectedParameter = Wander.Acceleration;
         }