Merge branch 'release/0.6.7' into develop

obscuren · obscuren · commit 41ae6f298e07 · 2014-09-26T13:47:47.000+02:00
diff --git 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
@@ -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/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" }
                  }
              }
          }
diff --git 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
@@ -12,7 +12,7 @@ import (
 
 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.6.6"
+	Version          = "0.6.7"
 )
 
 var ethereum *eth.Ethereum

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`const (`
`15`	`15`	`ClientIdentifier = "Ethereum(G)"`
`16`		`- Version = "0.6.6"`
	`16`	`+ Version = "0.6.7"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`var logger = ethlog.NewLogger("CLI")`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ ApplicationWindow {`
`739`	`739`
`740`	`740`	`function addPeer(peer) {`
`741`	`741`	`// We could just append the whole peer object but it cries if you try to alter them`
`742`		`- peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version})`
	`742`	`+ peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version, caps: peer.caps})`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`function resetPeers(){`
`@@ -782,10 +782,11 @@ ApplicationWindow {`
`782`	`782`	`id: peerTable`
`783`	`783`	`model: peerModel`
`784`	`784`	`TableViewColumn{width: 100; role: "ip" ; title: "IP" }`
`785`		`- TableViewColumn{width: 60; role: "port" ; title: "Port" }`
	`785`	`+ TableViewColumn{width: 60; role: "port" ; title: "Port" }`
`786`	`786`	`TableViewColumn{width: 140; role: "lastResponse"; title: "Last event" }`
`787`	`787`	`TableViewColumn{width: 100; role: "latency"; title: "Latency" }`
`788`	`788`	`TableViewColumn{width: 260; role: "version" ; title: "Version" }`
	`789`	`+ TableViewColumn{width: 80; role: "caps" ; title: "Capabilities" }`
`789`	`790`	`}`
`790`	`791`	`}`
`791`	`792`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func (gui *Gui) Stop() {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`func (gui Gui) showWallet(context qml.Context) (*qml.Window, error) {`
`175`		`- component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml"))`
	`175`	`+ component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/main.qml"))`
`176`	`176`	`if err != nil {`
`177`	`177`	`return nil, err`
`178`	`178`	`}`
`@@ -500,7 +500,7 @@ func (gui *Gui) setStatsPane() {`
`500`	`500`	`runtime.ReadMemStats(&memStats)`
`501`	`501`
`502`	`502`	`statsPane := gui.getObjectByName("statsPane")`
`503`		- statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.5 (%s) #######
	`503`	+ statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.7 (%s) #######
`504`	`504`
`505`	`505`	`eth %d (p2p = %d)`
`506`	`506`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`const (`
`14`	`14`	`ClientIdentifier = "Mist"`
`15`		`- Version = "0.6.6"`
	`15`	`+ Version = "0.6.7"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var ethereum *eth.Ethereum`