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 | |
| parent | cf999c46220829a5b240e09f11e29748fe94ec35 (diff) | |
| parent | 2b8eae9810d67136812a4e9e9a822db47cc45a54 (diff) | |
| download | go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.gz go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.tar.zst go-tangerine-41ae6f298e079a073282de001e6b1eaa51472638.zip | |
Merge branch 'release/0.6.7' into develop
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ethereum/main.go | 2 | ||||
| -rw-r--r-- | mist/assets/qml/main.qml (renamed from mist/assets/qml/wallet.qml) | 5 | ||||
| -rw-r--r-- | mist/gui.go | 4 | ||||
| -rw-r--r-- | mist/main.go | 2 |
5 files changed, 8 insertions, 7 deletions
@@ -7,7 +7,7 @@ Status](http://cpt-obvious.ethercasts.com:8010/buildstatusimage?builder=go-ether Ethereum Go Client © 2014 Jeffrey Wilcke. -Current state: Proof of Concept 0.6.6. +Current state: Proof of Concept 0.6.7. For the development package please see the [eth-go package](https://github.com/ethereum/eth-go). diff --git a/ethereum/main.go b/ethereum/main.go index 8cc043a4f..6521188ff 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -13,7 +13,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.6.6" + Version = "0.6.7" ) var logger = ethlog.NewLogger("CLI") 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" } } } } diff --git a/mist/gui.go b/mist/gui.go index 299a441c0..45ef66624 100644 --- a/mist/gui.go +++ b/mist/gui.go @@ -172,7 +172,7 @@ func (gui *Gui) Stop() { } func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) { - component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml")) + component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/main.qml")) if err != nil { return nil, err } @@ -500,7 +500,7 @@ func (gui *Gui) setStatsPane() { runtime.ReadMemStats(&memStats) statsPane := gui.getObjectByName("statsPane") - statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.5 (%s) ####### + statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.7 (%s) ####### eth %d (p2p = %d) diff --git a/mist/main.go b/mist/main.go index 094246c1a..6e4554352 100644 --- a/mist/main.go +++ b/mist/main.go @@ -12,7 +12,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.6.6" + Version = "0.6.7" ) var ethereum *eth.Ethereum |