aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/assets
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-04-01 16:40:34 +0800
committerobscuren <geffobscura@gmail.com>2014-04-01 16:40:34 +0800
commit5660d598df3d86f892975fcf9628133529598221 (patch)
tree6c48acd1594c9e8aae2e62b505ca232ae4c15363 /ethereal/assets
parente403b28eea6959c1d0ed003d955df3dee586083b (diff)
downloadgo-tangerine-5660d598df3d86f892975fcf9628133529598221.tar.gz
go-tangerine-5660d598df3d86f892975fcf9628133529598221.tar.zst
go-tangerine-5660d598df3d86f892975fcf9628133529598221.zip
Added tx output
Diffstat (limited to 'ethereal/assets')
-rw-r--r--ethereal/assets/qml/wallet.qml17
1 files changed, 15 insertions, 2 deletions
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>"
}
}