aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-03-03 07:54:41 +0800
committerobscuren <geffobscura@gmail.com>2014-03-03 07:54:41 +0800
commit3d2c3b0107d438dd081c57ef74036f4c5a03855f (patch)
treebdb4070b3a46caf5b3ce5facd8a3dfe3a4e43230 /ui
parenta482b0cc1b7ddbeae00988c7dd10391df01b0009 (diff)
downloadgo-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar.gz
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar.bz2
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar.lz
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar.xz
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.tar.zst
go-tangerine-3d2c3b0107d438dd081c57ef74036f4c5a03855f.zip
Using asset path helper (includes a debug path atm)
Diffstat (limited to 'ui')
-rw-r--r--ui/gui.go9
-rw-r--r--ui/ui_lib.go27
2 files changed, 29 insertions, 7 deletions
diff --git a/ui/gui.go b/ui/gui.go
index 389fe4f68..196d2cd76 100644
--- a/ui/gui.go
+++ b/ui/gui.go
@@ -9,8 +9,6 @@ import (
"github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethutil"
"github.com/niemeyer/qml"
- "bitbucket.org/kardianos/osext"
- "path/filepath"
"math/big"
"strings"
)
@@ -87,15 +85,12 @@ func (ui *Gui) Start() {
// Create a new QML engine
ui.engine = qml.NewEngine()
- // Get Binary Directory
- exedir , _ := osext.ExecutableFolder()
-
// Load the main QML interface
- component, err := ui.engine.LoadFile(filepath.Join(exedir, "wallet.qml"))
+ component, err := ui.engine.LoadFile(AssetPath("wallet.qml"))
if err != nil {
panic(err)
}
- ui.engine.LoadFile(filepath.Join(exedir, "transactions.qml"))
+ ui.engine.LoadFile(AssetPath("transactions.qml"))
ui.win = component.CreateWindow(nil)
diff --git a/ui/ui_lib.go b/ui/ui_lib.go
index c956fd032..2a1abee23 100644
--- a/ui/ui_lib.go
+++ b/ui/ui_lib.go
@@ -1,9 +1,13 @@
package ethui
import (
+ "bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethutil"
"github.com/niemeyer/qml"
+ "path"
+ "path/filepath"
+ "runtime"
)
// UI Library that has some basic functionality exposed
@@ -38,3 +42,26 @@ func (ui *UiLib) Connect(button qml.Object) {
func (ui *UiLib) ConnectToPeer(addr string) {
ui.eth.ConnectToPeer(addr)
}
+
+func (ui *UiLib) AssetPath(p string) string {
+ return AssetPath(p)
+}
+
+func AssetPath(p string) string {
+ var base string
+ switch runtime.GOOS {
+ case "darwin":
+ // Get Binary Directory
+ exedir, _ := osext.ExecutableFolder()
+ base = filepath.Join(exedir, "../Resources")
+ base = "/Users/jeffrey/go/src/github.com/ethereum/go-ethereum"
+ case "linux":
+ base = "/usr/share/ethereal"
+ case "window":
+ fallthrough
+ default:
+ base = "."
+ }
+
+ return path.Join(base, p)
+}