diff options
| author | obscuren <geffobscura@gmail.com> | 2014-03-27 22:24:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-03-27 22:24:56 +0800 |
| commit | 1257e8b4b30293784d24011ab6f9d8b4498ecfa4 (patch) | |
| tree | 779f8dd12e7a58b2025d5d55431fdccf966756db /ethereal/ui/gui.go | |
| parent | e65c4ee93e9dad629997c7839df7a8a0e7cff353 (diff) | |
| parent | 1323f60c074297c97397d20dd275124da2f5b531 (diff) | |
| download | go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar.gz go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar.bz2 go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar.lz go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar.xz go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.tar.zst go-tangerine-1257e8b4b30293784d24011ab6f9d8b4498ecfa4.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ethereal/ui/gui.go')
| -rw-r--r-- | ethereal/ui/gui.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index c8f4bedab..89736ac29 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -53,6 +53,7 @@ type Gui struct { txDb *ethdb.LDBDatabase addr []byte + } // Create GUI, but doesn't start it @@ -71,7 +72,7 @@ func New(ethereum *eth.Ethereum) *Gui { return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr} } -func (ui *Gui) Start() { +func (ui *Gui) Start(assetPath string) { defer ui.txDb.Close() // Register ethereum functions @@ -89,14 +90,16 @@ func (ui *Gui) Start() { // Expose the eth library and the ui library to QML context.SetVar("eth", ui.lib) - context.SetVar("ui", &UiLib{engine: ui.engine, eth: ui.eth}) + uiLib := NewUiLib(ui.engine, ui.eth, assetPath) + context.SetVar("ui", uiLib) // Load the main QML interface - component, err := ui.engine.LoadFile(AssetPath("qml/wallet.qml")) + component, err := ui.engine.LoadFile(uiLib.AssetPath("qml/wallet.qml")) if err != nil { + 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(AssetPath("qml/transactions.qml")) + ui.engine.LoadFile(uiLib.AssetPath("qml/transactions.qml")) ui.win = component.CreateWindow(nil) |