aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ui
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-06-23 19:38:23 +0800
committerzelig <viktor.tron@gmail.com>2014-06-23 19:38:23 +0800
commit6f09a3e8200ba2eeeeb296141d6644d04078a9c4 (patch)
tree516540d7a13bb60c4bf35d03782a1b2f0df9400f /ethereal/ui
parent34284b7532e753b7fe67a11d8fe19ba4afd9066f (diff)
downloaddexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar.gz
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar.bz2
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar.lz
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar.xz
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.tar.zst
dexon-6f09a3e8200ba2eeeeb296141d6644d04078a9c4.zip
fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel type for gui
Diffstat (limited to 'ethereal/ui')
-rw-r--r--ethereal/ui/gui.go4
-rw-r--r--ethereal/ui/ui_lib.go4
2 files changed, 2 insertions, 6 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index ed29e2485..f3a918ea0 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -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) {
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 156d55157..5f6a9ef0b 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -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 {