diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-09 22:07:36 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-09 22:07:36 +0800 |
| commit | 52b63459e9aa39020894df44a586453444b70ee0 (patch) | |
| tree | 02e1f578e188c2b897408dd2b1312118fcf3b357 /ethereal/assets | |
| parent | 2edf133b4671287e58c1f8cdb22f0cd342f309f2 (diff) | |
| parent | 1e94cb5286067da80c3227861a836c611f01e32b (diff) | |
| download | dexon-52b63459e9aa39020894df44a586453444b70ee0.tar.gz dexon-52b63459e9aa39020894df44a586453444b70ee0.tar.zst dexon-52b63459e9aa39020894df44a586453444b70ee0.zip | |
Merge branch 'develop' into feature/mnemonic
Diffstat (limited to 'ethereal/assets')
| -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>" } } |