From 5660d598df3d86f892975fcf9628133529598221 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 1 Apr 2014 10:40:34 +0200
Subject: Added tx output

---
 ethereal/assets/qml/wallet.qml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'ethereal/assets/qml')

diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 9093e3ca8..b22e82f9a 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -199,9 +199,22 @@ ApplicationWindow {
 						text: "Send"
 						onClicked: {
 							//this.enabled = false
-							console.log(eth.createTx(txRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text))
+							var res = eth.createTx(txRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text)
+							if(res[1]) {
+								txOutput.text = "Output:\n" + res[1].error()
+							} else {
+								txOutput.text = "Output:\n" + res[0]
+							}
+							txOutput.visible = true
 						}
 					}
+					TextArea {
+						id: txOutput
+						visible: false
+						Layout.fillWidth: true
+						height: 40
+						anchors.bottom: parent.bottom
+					}
 				}
 			}
 
@@ -391,7 +404,7 @@ ApplicationWindow {
 			anchors.left: aboutIcon.right
 			anchors.leftMargin: 10
 			font.pointSize: 12
-			text: "<h2>Ethereum(Go)</h2><br><h3>Development</h3>Jeffrey Wilcke<br><h3>Binary Distribution</h3>Jarrad Hope<br>"
+			text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br><h3>Binary Distribution</h3>Jarrad Hope<br>"
 		}
 
 	}
-- 
cgit v1.2.3