cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from ethersphere/master

Browse Source 
assetPath configurable on command line for ethereal GUI
This commit is contained in:
Jeffrey Wilcke 2014-03-27 15:24:36 +01:00
commit 1323f60c07
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereal/config.go
View File

@ -16,6 +16,7 @@ var UseSeed bool
var ImportKey string var ImportKey string
var ExportKey bool var ExportKey bool
var DataDir string var DataDir string
var AssetPath string
func Init() { func Init() {
flag.BoolVar(&StartConsole, "c", false, "debug and testing console") flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
@ -29,6 +30,7 @@ func Init() {
flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory") flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory")
flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
flag.IntVar(&MaxPeer, "x", 5, "maximum desired peers") flag.IntVar(&MaxPeer, "x", 5, "maximum desired peers")
flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory")
flag.Parse() flag.Parse()
} }

4
ethereal/ethereum.go
View File

@ -100,11 +100,11 @@ func main() {
os.Exit(0) os.Exit(0)
} }
log.Printf("Starting Ethereum v%s\n", ethutil.Config.Ver) log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver)
// Set the max peers // Set the max peers
ethereum.MaxPeers = MaxPeer ethereum.MaxPeers = MaxPeer
gui := ethui.New(ethereum) gui := ethui.New(ethereum)
gui.Start() gui.Start(AssetPath)
} }

11
ethereal/ui/gui.go
View File

@ -53,6 +53,7 @@ type Gui struct {
txDb *ethdb.LDBDatabase txDb *ethdb.LDBDatabase
addr []byte addr []byte
} }
// Create GUI, but doesn't start it // 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} return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr}
} }
func (ui *Gui) Start() { func (ui *Gui) Start(assetPath string) {
defer ui.txDb.Close() defer ui.txDb.Close()
// Register ethereum functions // Register ethereum functions
@ -89,14 +90,16 @@ func (ui *Gui) Start() {
// Expose the eth library and the ui library to QML // Expose the eth library and the ui library to QML
context.SetVar("eth", ui.lib) 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 // 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 { 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) panic(err)
} }
ui.engine.LoadFile(AssetPath("qml/transactions.qml")) ui.engine.LoadFile(uiLib.AssetPath("qml/transactions.qml"))
ui.win = component.CreateWindow(nil) ui.win = component.CreateWindow(nil)

14
ethereal/ui/ui_lib.go
View File

@ -16,6 +16,14 @@ type UiLib struct {
engine *qml.Engine engine *qml.Engine
eth *eth.Ethereum eth *eth.Ethereum
connected bool connected bool
assetPath string
}
func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
if assetPath == "" {
assetPath = DefaultAssetPath()
}
return &UiLib{engine: engine, eth: eth, assetPath: assetPath}
} }
// Opens a QML file (external application) // Opens a QML file (external application)
@ -45,10 +53,10 @@ func (ui *UiLib) ConnectToPeer(addr string) {
} }
func (ui *UiLib) AssetPath(p string) string { func (ui *UiLib) AssetPath(p string) string {
return AssetPath(p) return path.Join(ui.assetPath, p)
} }
func AssetPath(p string) string { func DefaultAssetPath() string {
var base string var base string
// If the current working directory is the go-ethereum dir // If the current working directory is the go-ethereum dir
@ -72,5 +80,5 @@ func AssetPath(p string) string {
} }
} }
return path.Join(base, p) return base
} }