From 05c353eca0c4e01457412dd643529200816ab159 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 21 Feb 2014 12:37:40 +0100
Subject: Added a basic <UNSTABLE> UI

---
 ethereum.go | 86 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 50 insertions(+), 36 deletions(-)

(limited to 'ethereum.go')

diff --git a/ethereum.go b/ethereum.go
index 36700a6d4..5eda09a44 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -5,6 +5,8 @@ import (
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/ethereum/go-ethereum/ui"
+	"github.com/niemeyer/qml"
 	"github.com/obscuren/secp256k1-go"
 	"log"
 	"os"
@@ -76,9 +78,16 @@ pubk: %x
 }
 
 func main() {
-	runtime.GOMAXPROCS(runtime.NumCPU())
 	Init()
 
+	// Qt has to be initialized in the main thread or it will throw errors
+	// It has to be called BEFORE setting the maximum procs.
+	if UseGui {
+		qml.Init(nil)
+	}
+
+	runtime.GOMAXPROCS(runtime.NumCPU())
+
 	ethchain.InitFees()
 	ethutil.ReadConfig(".ethereum")
 	ethutil.Config.Seed = UseSeed
@@ -156,41 +165,46 @@ func main() {
 		go console.Start()
 	}
 
-	RegisterInterupts(ethereum)
-
-	ethereum.Start()
-
-	if StartMining {
-		log.Printf("Miner started\n")
-
-		// Fake block mining. It broadcasts a new block every 5 seconds
-		go func() {
-			pow := &ethchain.EasyPow{}
-			data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
-			keyRing := ethutil.NewValueFromBytes(data)
-			addr := keyRing.Get(1).Bytes()
-
-			for {
-				txs := ethereum.TxPool.Flush()
-				// Create a new block which we're going to mine
-				block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
-				// Apply all transactions to the block
-				ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
-
-				ethereum.BlockManager.AccumelateRewards(block, block)
-
-				// Search the nonce
-				block.Nonce = pow.Search(block)
-				err := ethereum.BlockManager.ProcessBlock(block)
-				if err != nil {
-					log.Println(err)
-				} else {
-					log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
+	if UseGui {
+		gui := ethui.New(ethereum)
+		gui.Start()
+		//ethereum.Stop()
+	} else {
+		RegisterInterupts(ethereum)
+		ethereum.Start()
+
+		if StartMining {
+			log.Printf("Miner started\n")
+
+			// Fake block mining. It broadcasts a new block every 5 seconds
+			go func() {
+				pow := &ethchain.EasyPow{}
+				data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
+				keyRing := ethutil.NewValueFromBytes(data)
+				addr := keyRing.Get(1).Bytes()
+
+				for {
+					txs := ethereum.TxPool.Flush()
+					// Create a new block which we're going to mine
+					block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
+					// Apply all transactions to the block
+					ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
+
+					ethereum.BlockManager.AccumelateRewards(block, block)
+
+					// Search the nonce
+					block.Nonce = pow.Search(block)
+					err := ethereum.BlockManager.ProcessBlock(block)
+					if err != nil {
+						log.Println(err)
+					} else {
+						log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
+					}
 				}
-			}
-		}()
-	}
+			}()
+		}
 
-	// Wait for shutdown
-	ethereum.WaitForShutdown()
+		// Wait for shutdown
+		ethereum.WaitForShutdown()
+	}
 }
-- 
cgit