From 5053ec21902727864d77664556fee144514bfa85 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 2 Oct 2014 01:37:23 +0200 Subject: Added download label --- mist/gui.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mist/gui.go') diff --git a/mist/gui.go b/mist/gui.go index 45ef66624..7d851243f 100644 --- a/mist/gui.go +++ b/mist/gui.go @@ -466,12 +466,17 @@ func (gui *Gui) update() { var ( pct float64 = 1.0 / float64(chainLength) * float64(blockLength) dlWidget = gui.win.Root().ObjectByName("downloadIndicator") + dlLabel = gui.win.Root().ObjectByName("downloadLabel") ) if pct < 1.0 { dlWidget.Set("visible", true) dlWidget.Set("value", pct) + + dlLabel.Set("visible", true) + dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength)) } else { dlWidget.Set("visible", false) + dlLabel.Set("visible", false) } case <-statsUpdateTicker.C: -- cgit v1.2.3 From e100aa3c6c6a9e4da858812b7ed8392ec2e3954a Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 2 Oct 2014 17:35:57 +0200 Subject: Changed to new "created address" --- mist/gui.go | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'mist/gui.go') diff --git a/mist/gui.go b/mist/gui.go index 7d851243f..de051737c 100644 --- a/mist/gui.go +++ b/mist/gui.go @@ -271,7 +271,8 @@ func (gui *Gui) loadAddressBook() { } func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { - nameReg := ethpipe.New(gui.eth).World().Config().Get("NameReg") + pipe := ethpipe.New(gui.eth) + nameReg := pipe.World().Config().Get("NameReg") addr := gui.address() var inout string @@ -282,14 +283,14 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { } var ( - ptx = ethpipe.NewJSTx(tx) + ptx = ethpipe.NewJSTx(tx, pipe.World().State()) send = nameReg.Storage(tx.Sender()) rec = nameReg.Storage(tx.Recipient) s, r string ) if tx.CreatesContract() { - rec = nameReg.Storage(tx.CreationAddress()) + rec = nameReg.Storage(tx.CreationAddress(pipe.World().State())) } if send.Len() != 0 { @@ -301,7 +302,7 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { r = strings.Trim(rec.Str(), "\x00") } else { if tx.CreatesContract() { - r = ethutil.Bytes2Hex(tx.CreationAddress()) + r = ethutil.Bytes2Hex(tx.CreationAddress(pipe.World().State())) } else { r = ethutil.Bytes2Hex(tx.Recipient) } @@ -468,16 +469,9 @@ func (gui *Gui) update() { dlWidget = gui.win.Root().ObjectByName("downloadIndicator") dlLabel = gui.win.Root().ObjectByName("downloadLabel") ) - if pct < 1.0 { - dlWidget.Set("visible", true) - dlWidget.Set("value", pct) - dlLabel.Set("visible", true) - dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength)) - } else { - dlWidget.Set("visible", false) - dlLabel.Set("visible", false) - } + dlWidget.Set("value", pct) + dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength)) case <-statsUpdateTicker.C: gui.setStatsPane() -- cgit v1.2.3 From a9b857769dfd843b70563c5abd5727285ebc9608 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 7 Oct 2014 11:19:42 +0200 Subject: bump --- mist/gui.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mist/gui.go') diff --git a/mist/gui.go b/mist/gui.go index de051737c..80d4a1fc3 100644 --- a/mist/gui.go +++ b/mist/gui.go @@ -499,7 +499,7 @@ func (gui *Gui) setStatsPane() { runtime.ReadMemStats(&memStats) statsPane := gui.getObjectByName("statsPane") - statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.7 (%s) ####### + statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.8 (%s) ####### eth %d (p2p = %d) -- cgit v1.2.3