diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 01:22:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 01:22:53 +0800 |
| commit | 45e15f62f594d6f5191e60a54aead33602838e98 (patch) | |
| tree | 5b82273df6a23c219d1e97dbb86b4bdcb620374a /cmd/mist/assets | |
| parent | fb7c03ff4dc759f7dd2fc5cee65b46111cbb7375 (diff) | |
| parent | 7f638f0b2d8d989be25e660178d79df3278e4c84 (diff) | |
| download | go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar.gz go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar.bz2 go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar.lz go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar.xz go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.tar.zst go-tangerine-45e15f62f594d6f5191e60a54aead33602838e98.zip | |
merge jsonrpc
Diffstat (limited to 'cmd/mist/assets')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 1 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/info.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/wallet.qml | 13 |
3 files changed, 3 insertions, 13 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index c88873795..bc579ddfa 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -47,7 +47,6 @@ ApplicationWindow { console.log("starting browser") newBrowserTab("http://etherian.io"); - console.log("done") // Command setup gui.sendCommand(0) diff --git a/cmd/mist/assets/qml/views/info.qml b/cmd/mist/assets/qml/views/info.qml index 3ff551b05..f694f1e7a 100644 --- a/cmd/mist/assets/qml/views/info.qml +++ b/cmd/mist/assets/qml/views/info.qml @@ -28,7 +28,7 @@ Rectangle { text: "Address" } TextField { - text: eth.key().address + text: ""//eth.key().address width: 500 } diff --git a/cmd/mist/assets/qml/views/wallet.qml b/cmd/mist/assets/qml/views/wallet.qml index 23f32378d..d6160740d 100644 --- a/cmd/mist/assets/qml/views/wallet.qml +++ b/cmd/mist/assets/qml/views/wallet.qml @@ -22,7 +22,8 @@ Rectangle { function setBalance() { //balance.text = "<b>Balance</b>: " + eth.numberToHuman(eth.balanceAt(eth.key().address)) if(menuItem) - menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address)) + menuItem.secondaryTitle = eth.numberToHuman("0") + //menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address)) } ListModel { @@ -155,16 +156,6 @@ Rectangle { model: ListModel { id: txModel Component.onCompleted: { - /* - var me = eth.key().address; - var filterTo = ethx.watch({latest: -1, to: me}); - var filterFrom = ethx.watch({latest: -1, from: me}); - filterTo.changed(addTxs) - filterFrom.changed(addTxs) - - addTxs(filterTo.messages()) - addTxs(filterFrom.messages()) - */ } function addTxs(messages) { |