Using asset path helper (includes a debug path atm)

This commit is contained in:
obscuren
2014-03-03 00:54:41 +01:00
parent a482b0cc1b
commit 3d2c3b0107
3 changed files with 153 additions and 93 deletions

View File

@ -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)

View File

@ -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)
}