Moved qml files, conform to the new server model.

QML files got moved to their own directories. QML now has a ui helper
which should find assets in the correct resource directory

5 files changed, 27 insertions, 27 deletions

diff --git a/ethereum.go b/ethereum.go
index 07a40b10f..36cd75e47 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -144,7 +144,7 @@ func main() {
 	}
 
 	if ShowGenesis {
-		fmt.Println(ethereum.BlockManager.BlockChain().Genesis())
+		fmt.Println(ethereum.BlockChain().Genesis())
 		os.Exit(0)
 	}
 
@@ -183,23 +183,24 @@ func main() {
 				addr := keyRing.Get(1).Bytes()
 
 				for {
-					txs := ethereum.TxPool.Flush()
+					txs := ethereum.TxPool().Flush()
 					// Create a new block which we're going to mine
-					block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
+					block := ethereum.BlockChain().NewBlock(addr, txs)
 					log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions")
 					// Apply all transactions to the block
-					ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
+					ethereum.StateManager().ApplyTransactions(block, block.Transactions())
 
-					ethereum.BlockManager.AccumelateRewards(block, block)
+					ethereum.StateManager().AccumelateRewards(block, block)
 
 					// Search the nonce
 					block.Nonce = pow.Search(block)
 					ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
-					err := ethereum.BlockManager.ProcessBlock(block)
+					err := ethereum.StateManager().ProcessBlock(block)
 					if err != nil {
 						log.Println(err)
 					} else {
-						log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
+						//log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock)
+						log.Printf("🔨  Mined block %x\n", block.Hash())
 					}
 				}
 			}()
diff --git a/test_app.qml b/qml/test_app.qml
index aace4e881..aace4e881 100644
--- a/test_app.qml
+++ b/qml/test_app.qml
diff --git a/transactions.qml b/qml/transactions.qml
index e9a035a85..e9a035a85 100644
--- a/transactions.qml
+++ b/qml/transactions.qml
diff --git a/wallet.qml b/qml/wallet.qml
index 39bc21f39..7fc7f5447 100644
--- a/wallet.qml
+++ b/qml/wallet.qml
@@ -85,7 +85,7 @@ ApplicationWindow {
 				anchors.right: parent.right
 				height: 200
 				Image {
-					source: "tx.png"
+					source: ui.assetPath("tx.png")
 					anchors.horizontalCenter: parent.horizontalCenter
 					MouseArea {
 						anchors.fill: parent
@@ -95,7 +95,7 @@ ApplicationWindow {
 					}
 				}
 				Image {
-					source: "new.png"
+					source: ui.assetPath("new.png")
 					anchors.horizontalCenter: parent.horizontalCenter
 					MouseArea {
 						anchors.fill: parent
@@ -105,7 +105,7 @@ ApplicationWindow {
 					}
 				}
 				Image {
-					source: "net.png"
+					source: ui.assetPath("net.png")
 					anchors.horizontalCenter: parent.horizontalCenter
 					MouseArea {
 						anchors.fill: parent
@@ -300,7 +300,7 @@ ApplicationWindow {
 				id: peerImage
 				anchors.right: parent.right
 				width: 10; height: 10
-				source: "network.png"
+				source: ui.assetPath("network.png")
 			}
 		}
 	}
@@ -365,7 +365,7 @@ ApplicationWindow {
 			width: 150
 			fillMode: Image.PreserveAspectFit
 			smooth: true
-			source: "facet.png"
+			source: ui.assetPath("facet.png")
 			x: 10
 			y: 10
 		}
diff --git a/ui/gui.go b/ui/gui.go
index 196d2cd76..fa65ea4f6 100644
--- a/ui/gui.go
+++ b/ui/gui.go
@@ -57,7 +57,7 @@ type Gui struct {
 
 // Create GUI, but doesn't start it
 func New(ethereum *eth.Ethereum) *Gui {
-	lib := &EthLib{blockManager: ethereum.BlockManager, blockChain: ethereum.BlockManager.BlockChain(), txPool: ethereum.TxPool}
+	lib := &EthLib{blockManager: ethereum.StateManager(), blockChain: ethereum.BlockChain(), txPool: ethereum.TxPool()}
 	db, err := ethdb.NewLDBDatabase("tx_database")
 	if err != nil {
 		panic(err)
@@ -66,7 +66,7 @@ func New(ethereum *eth.Ethereum) *Gui {
 	key := ethutil.Config.Db.GetKeys()[0]
 	addr := key.Address()
 
-	ethereum.BlockManager.WatchAddr(addr)
+	ethereum.StateManager().WatchAddr(addr)
 
 	return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr}
 }
@@ -84,24 +84,23 @@ func (ui *Gui) Start() {
 	ethutil.Config.Log.Infoln("[GUI] Starting GUI")
 	// Create a new QML engine
 	ui.engine = qml.NewEngine()
+	context := ui.engine.Context()
+
+	// Expose the eth library and the ui library to QML
+	context.SetVar("eth", ui.lib)
+	context.SetVar("ui", &UiLib{engine: ui.engine, eth: ui.eth})
 
 	// Load the main QML interface
-	component, err := ui.engine.LoadFile(AssetPath("wallet.qml"))
+	component, err := ui.engine.LoadFile(AssetPath("qml/wallet.qml"))
 	if err != nil {
 		panic(err)
 	}
-	ui.engine.LoadFile(AssetPath("transactions.qml"))
+	ui.engine.LoadFile(AssetPath("qml/transactions.qml"))
 
 	ui.win = component.CreateWindow(nil)
 
-	context := ui.engine.Context()
-
-	// Expose the eth library and the ui library to QML
-	context.SetVar("eth", ui.lib)
-	context.SetVar("ui", &UiLib{engine: ui.engine, eth: ui.eth})
-
 	// Register the ui as a block processor
-	ui.eth.BlockManager.SecondaryBlockProcessor = ui
+	//ui.eth.BlockManager.SecondaryBlockProcessor = ui
 	//ui.eth.TxPool.SecondaryProcessor = ui
 
 	// Add the ui as a log system so we can log directly to the UGI
@@ -120,7 +119,7 @@ func (ui *Gui) Start() {
 
 func (ui *Gui) setInitialBlockChain() {
 	// Load previous 10 blocks
-	chain := ui.eth.BlockManager.BlockChain().GetChain(ui.eth.BlockManager.BlockChain().CurrentBlock.Hash(), 10)
+	chain := ui.eth.BlockChain().GetChain(ui.eth.BlockChain().CurrentBlock.Hash(), 10)
 	for _, block := range chain {
 		ui.ProcessBlock(block)
 	}
@@ -144,9 +143,9 @@ func (ui *Gui) ProcessBlock(block *ethchain.Block) {
 // Simple go routine function that updates the list of peers in the GUI
 func (ui *Gui) update() {
 	txChan := make(chan ethchain.TxMsg, 1)
-	ui.eth.TxPool.Subscribe(txChan)
+	ui.eth.TxPool().Subscribe(txChan)
 
-	account := ui.eth.BlockManager.GetAddrState(ui.addr).Account
+	account := ui.eth.StateManager().GetAddrState(ui.addr).Account
 	unconfirmedFunds := new(big.Int)
 	ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(account.Amount)))
 	for {
@@ -159,7 +158,7 @@ func (ui *Gui) update() {
 					ui.win.Root().Call("addTx", NewTxFromTransaction(tx))
 					ui.txDb.Put(tx.Hash(), tx.RlpEncode())
 
-					ui.eth.BlockManager.GetAddrState(ui.addr).Nonce += 1
+					ui.eth.StateManager().GetAddrState(ui.addr).Nonce += 1
 					unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
 				} else if bytes.Compare(tx.Recipient, ui.addr) == 0 {
 					ui.win.Root().Call("addTx", NewTxFromTransaction(tx))