From 7a5b279459d5a52242b88f2e8ffce62c2c30babb Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 26 Sep 2014 13:35:48 +0200 Subject: [PATCH 1/3] Version bump --- README.md | 2 +- ethereum/main.go | 2 +- mist/gui.go | 2 +- mist/main.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 85906d436..364e04c76 100644 --- a/README.md +++ b/README.md @@ -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/gui.go b/mist/gui.go index 299a441c0..299c053d2 100644 --- a/mist/gui.go +++ b/mist/gui.go @@ -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 From b2dc19155f8378f24cf9cc3c31e844b9daf59d84 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 26 Sep 2014 13:38:40 +0200 Subject: [PATCH 2/3] Renamed wallet to main --- mist/assets/qml/{wallet.qml => main.qml} | 0 mist/gui.go | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename mist/assets/qml/{wallet.qml => main.qml} (100%) diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/main.qml similarity index 100% rename from mist/assets/qml/wallet.qml rename to mist/assets/qml/main.qml diff --git a/mist/gui.go b/mist/gui.go index 299c053d2..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 } From 2b8eae9810d67136812a4e9e9a822db47cc45a54 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 26 Sep 2014 13:45:18 +0200 Subject: [PATCH 3/3] Added protocol caps to window --- mist/assets/qml/main.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mist/assets/qml/main.qml b/mist/assets/qml/main.qml index 885d09116..0ee063f17 100644 --- a/mist/assets/qml/main.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" } } } }