diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
| commit | ee5e7f2b350202ed2d2e64265d18d0462bd21c91 (patch) | |
| tree | 8ea2a6305d58e8d56b16e9869850961b61b7d25c /ethereal/ui/gui.go | |
| parent | a30f5730b384bf99d23f6e83b356e27a14f961d1 (diff) | |
| parent | e403b28eea6959c1d0ed003d955df3dee586083b (diff) | |
| download | dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.bz2 dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.lz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.xz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip | |
Fix merge conflict
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) |