Merge master into miner branch

1 files changed, 35 insertions, 0 deletions

diff --git a/ethereal/assets/qml/test_app.qml b/ethereal/assets/qml/test_app.qml
new file mode 100644
index 000000000..aace4e881
--- /dev/null
+++ b/ethereal/assets/qml/test_app.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0;
+import QtQuick.Layouts 1.0;
+import Ethereum 1.0
+
+ApplicationWindow {
+	minimumWidth: 500
+	maximumWidth: 500
+	maximumHeight: 100
+	minimumHeight: 100
+
+	title: "Ethereum Dice"
+
+	TextField {
+		id: textField
+		anchors.verticalCenter: parent.verticalCenter
+		anchors.horizontalCenter: parent.horizontalCenter
+		placeholderText: "Amount"
+	}
+	Label {
+		id: txHash
+		anchors.bottom: textField.top
+		anchors.bottomMargin: 5
+		anchors.horizontalCenter: parent.horizontalCenter
+	}
+	Button {
+		anchors.top: textField.bottom
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.topMargin: 5
+		text: "Place bet"
+		onClicked: {
+			txHash.text = eth.createTx("e6716f9544a56c530d868e4bfbacb172315bdead", textField.text)
+		}
+	}
+}