diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-10 00:55:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-10 00:55:01 +0800 |
| commit | 8560004f380dc688a1171ad5aeffa593aae41193 (patch) | |
| tree | fea395acf042b51e97a86e2c4cbcf8c16b2912b7 /cmd/mist/gui.go | |
| parent | 9723191b19f6ddc12f0c3376ede7529b2d72e6a2 (diff) | |
| parent | 676a0de58d3d7c508b0eeeff192d2095a46f7382 (diff) | |
| download | dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar.gz dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar.bz2 dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar.lz dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar.xz dexon-8560004f380dc688a1171ad5aeffa593aae41193.tar.zst dexon-8560004f380dc688a1171ad5aeffa593aae41193.zip | |
wip
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 4af0cff43..53ca35574 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -32,7 +32,6 @@ import ( "path" "runtime" "sort" - "strconv" "time" "github.com/ethereum/go-ethereum/core" @@ -89,7 +88,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session st panic(err) } - xeth := xeth.New(ethereum) + xeth := xeth.New(ethereum, nil) gui := &Gui{eth: ethereum, txDb: db, xeth: xeth, @@ -100,7 +99,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session st plugins: make(map[string]plugin), serviceEvents: make(chan ServEv, 1), } - data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "plugins.json")) + data, _ := ethutil.ReadAllFile(path.Join(ethereum.DataDir, "plugins.json")) json.Unmarshal([]byte(data), &gui.plugins) return gui @@ -159,8 +158,6 @@ func (gui *Gui) Stop() { gui.win.Hide() } - gui.uiLib.jsEngine.Stop() - guilogger.Infoln("Stopped") } @@ -388,7 +385,7 @@ func (gui *Gui) update() { statsUpdateTicker := time.NewTicker(5 * time.Second) lastBlockLabel := gui.getObjectByName("lastBlockLabel") - miningLabel := gui.getObjectByName("miningLabel") + //miningLabel := gui.getObjectByName("miningLabel") events := gui.eth.EventMux().Subscribe( core.ChainEvent{}, @@ -419,8 +416,7 @@ func (gui *Gui) update() { case <-generalUpdateTicker.C: statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number().String() lastBlockLabel.Set("text", statusText) - miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.Miner().HashRate(), 10)+"/Khash") - + //miningLabel.Set("text", strconv.FormatInt(gui.uiLib.Miner().HashRate(), 10)) case <-statsUpdateTicker.C: gui.setStatsPane() } |