diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-15 01:48:15 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-15 01:48:15 +0800 |
| commit | 28a48f1d9a751c00f6bf6be198fc30ad792abf6f (patch) | |
| tree | 262468da60af1205bd2d0ce5ccf0ba9944297216 /ethereal/ui/gui.go | |
| parent | 8a2698ad5e3d47db9175e838b0a16c3f59b6e071 (diff) | |
| parent | d092d05a31554c37f4d7594d96ce9409082b5b20 (diff) | |
| download | go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar.gz go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar.bz2 go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar.lz go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar.xz go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.tar.zst go-tangerine-28a48f1d9a751c00f6bf6be198fc30ad792abf6f.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal/ui/gui.go')
| -rw-r--r-- | ethereal/ui/gui.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index c09c5954f..1065b716e 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -115,10 +115,12 @@ func (ui *Gui) Start(assetPath string) { ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'") panic(err) } - ui.engine.LoadFile(uiLib.AssetPath("qml/transactions.qml")) ui.win = component.CreateWindow(nil) uiLib.win = ui.win + db := &Debugger{ui.win, make(chan bool)} + ui.lib.Db = db + uiLib.Db = db // Register the ui as a block processor //ui.eth.BlockManager.SecondaryBlockProcessor = ui |