diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-26 19:47:47 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-26 19:47:47 +0800 |
| commit | 41ae6f298e079a073282de001e6b1eaa51472638 (patch) | |
| tree | 498105565b63558018ff284ebf31932dbf1cf0ef /mist/assets | |
| parent | cf999c46220829a5b240e09f11e29748fe94ec35 (diff) | |
| parent | 2b8eae9810d67136812a4e9e9a822db47cc45a54 (diff) | |
| download | go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.gz go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.bz2 go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.lz go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.xz go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.zst go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.zip | |
Merge branch 'release/0.6.7' into develop
Diffstat (limited to 'mist/assets')
| -rw-r--r-- | mist/assets/qml/main.qml (renamed from mist/assets/qml/wallet.qml) | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/main.qml index 885d09116..0ee063f17 100644 --- a/mist/assets/qml/wallet.qml +++ b/mist/assets/qml/main.qml @@ -739,7 +739,7 @@ ApplicationWindow { function addPeer(peer) { // We could just append the whole peer object but it cries if you try to alter them - peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version}) + peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version, caps: peer.caps}) } function resetPeers(){ @@ -782,10 +782,11 @@ ApplicationWindow { id: peerTable model: peerModel TableViewColumn{width: 100; role: "ip" ; title: "IP" } - TableViewColumn{width: 60; role: "port" ; title: "Port" } + TableViewColumn{width: 60; role: "port" ; title: "Port" } TableViewColumn{width: 140; role: "lastResponse"; title: "Last event" } TableViewColumn{width: 100; role: "latency"; title: "Latency" } TableViewColumn{width: 260; role: "version" ; title: "Version" } + TableViewColumn{width: 80; role: "caps" ; title: "Capabilities" } } } } |