fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel type for gui

This commit is contained in:
zelig
2014-06-23 12:38:23 +01:00
parent 34284b7532
commit 6f09a3e820
4 changed files with 17 additions and 11 deletions

View File

@ -40,7 +40,7 @@ type Gui struct {
}
// Create GUI, but doesn't start it
func New(ethereum *eth.Ethereum, logLevel ethlog.LogLevel) *Gui {
func New(ethereum *eth.Ethereum, logLevel int) *Gui {
lib := &EthLib{stateManager: ethereum.StateManager(), blockChain: ethereum.BlockChain(), txPool: ethereum.TxPool()}
db, err := ethdb.NewLDBDatabase("tx_database")
if err != nil {
@ -56,7 +56,7 @@ func New(ethereum *eth.Ethereum, logLevel ethlog.LogLevel) *Gui {
pub := ethpub.NewPEthereum(ethereum)
return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: logLevel}
return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: ethlog.LogLevel(logLevel)}
}
func (gui *Gui) Start(assetPath string) {

View File

@ -1,14 +1,10 @@
package ethui
import (
"bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"os"
"path"
"path/filepath"
"runtime"
)
type memAddr struct {