diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
| commit | 08de13a57b4a59fc4a8ccf9e707ede57cc380a0c (patch) | |
| tree | 94bd0dc4887284c6e0ae57a7b40825dae52eee0e /ethereal/ui/ui_lib.go | |
| parent | 6f09a3e8200ba2eeeeb296141d6644d04078a9c4 (diff) | |
| parent | 9654b809120d1cc3c53ffe268fe47869ef0dc0a8 (diff) | |
| download | dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.gz dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.bz2 dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.lz dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.xz dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.zst dexon-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.zip | |
merge upstream
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 5f6a9ef0b..ddc955176 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -28,18 +28,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 { - logger.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) { |