diff options
| author | obscuren <geffobscura@gmail.com> | 2014-04-05 17:20:37 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-04-05 17:20:37 +0800 |
| commit | 5da03f2e3683361b6e725d96a1fbcc0d4d42613c (patch) | |
| tree | ac24a57bcbfc3e6ef3a3f6612ba29b479d5a1898 /ethereal/assets/qml/wallet.qml | |
| parent | ee5e7f2b350202ed2d2e64265d18d0462bd21c91 (diff) | |
| parent | 5660d598df3d86f892975fcf9628133529598221 (diff) | |
| download | go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar.gz go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar.bz2 go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar.lz go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar.xz go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.tar.zst go-tangerine-5da03f2e3683361b6e725d96a1fbcc0d4d42613c.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'ethereal/assets/qml/wallet.qml')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 17 |
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>" } } |