From 9a11a948943d285b22a3a5e508fadc0c346990f4 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 28 Jan 2015 14:02:36 +0100 Subject: Updated assets & moved messages --- cmd/mist/html_container.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/mist/html_container.go') diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index f2ba6fbe2..3e3613e9a 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -21,7 +21,6 @@ package main import ( - "encoding/json" "errors" "fmt" "io/ioutil" @@ -32,7 +31,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" "github.com/howeyc/fsnotify" @@ -147,6 +145,7 @@ func (app *HtmlApplication) NewBlock(block *types.Block) { } func (self *HtmlApplication) Messages(messages state.Messages, id string) { + /* TODO remove me var msgs []javascript.JSMessage for _, m := range messages { msgs = append(msgs, javascript.NewJSMessage(m)) @@ -155,6 +154,7 @@ func (self *HtmlApplication) Messages(messages state.Messages, id string) { b, _ := json.Marshal(msgs) self.webView.Call("onWatchedCb", string(b), id) + */ } func (app *HtmlApplication) Destroy() { -- cgit v1.2.3 From fb7c03ff4dc759f7dd2fc5cee65b46111cbb7375 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 28 Jan 2015 14:51:54 +0100 Subject: switched to obscuren/qml --- cmd/mist/html_container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/mist/html_container.go') diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index 3e3613e9a..afc29382a 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -34,7 +34,7 @@ import ( "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" "github.com/howeyc/fsnotify" - "gopkg.in/qml.v1" + "github.com/obscuren/qml" ) type HtmlApplication struct { -- cgit v1.2.3 From 872b2497114209119becf2e8a4d4a5818e2084ee Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 28 Jan 2015 18:35:49 +0100 Subject: further cleaned up xeth interface --- cmd/mist/html_container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/mist/html_container.go') diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index f2ba6fbe2..516dcb6b3 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -142,7 +142,7 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *types.Block) { - b := &xeth.JSBlock{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} + b := &xeth.Block{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } -- cgit v1.2.3 From 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 12 Feb 2015 17:06:15 +0100 Subject: removed messages --- cmd/mist/html_container.go | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'cmd/mist/html_container.go') diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index 0909a6abd..e4ea57b9b 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -31,7 +31,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" "github.com/howeyc/fsnotify" "github.com/obscuren/qml" @@ -144,19 +143,6 @@ func (app *HtmlApplication) NewBlock(block *types.Block) { app.webView.Call("onNewBlockCb", b) } -func (self *HtmlApplication) Messages(messages state.Messages, id string) { - /* TODO remove me - var msgs []javascript.JSMessage - for _, m := range messages { - msgs = append(msgs, javascript.NewJSMessage(m)) - } - - b, _ := json.Marshal(msgs) - - self.webView.Call("onWatchedCb", string(b), id) - */ -} - func (app *HtmlApplication) Destroy() { app.engine.Destroy() } -- cgit v1.2.3