diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-24 15:39:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-24 15:39:25 +0800 |
| commit | a13aa873c205f35d3d90adf9da4c6355499fff1b (patch) | |
| tree | fc7b241407a121702e0bea03e1a65cabf8b2b8b6 /ethereal/ui/ui_lib.go | |
| parent | 17e8d7519b1aac322db08b857e63db82a322d6cf (diff) | |
| parent | bcb88e73528777ac0de489449a8d9045654447d5 (diff) | |
| download | dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar.gz dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar.bz2 dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar.lz dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar.xz dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.tar.zst dexon-a13aa873c205f35d3d90adf9da4c6355499fff1b.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal/ui/ui_lib.go')
| -rw-r--r-- | ethereal/ui/ui_lib.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 791d4fe09..908497be3 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -35,18 +35,11 @@ func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { return &UiLib{engine: engine, eth: eth, assetPath: assetPath} } -// Opens a QML file (external application) -func (ui *UiLib) Open(path string) { - component, err := ui.engine.LoadFile(path[7:]) - if err != nil { - ethutil.Config.Log.Debugln(err) - } - win := component.CreateWindow(nil) +func (ui *UiLib) OpenQml(path string) { + container := NewQmlApplication(path[7:], ui) + app := NewExtApplication(container, ui) - go func() { - win.Show() - win.Wait() - }() + go app.run() } func (ui *UiLib) OpenHtml(path string) { |