Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

1 files changed, 35 insertions, 21 deletions

diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index fdadc6ebb..37224c7b4 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -167,7 +167,7 @@ ApplicationWindow {
 						var newContract = component.createObject("newContract")
 
 						addTab("Simple send", newTransaction)
-						addTab("Create contract", newContract)
+						addTab("Contracts", newContract)
 					}
 				}
 			}
@@ -401,26 +401,36 @@ ApplicationWindow {
 					orientation: Qt.Vertical
 					anchors.fill: parent
 
-					TableView {
-						property var memModel: ListModel {
-							id: memModel
-						}
-						height: parent.height/2
-						width: parent.width
-						TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
-						TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
-						model: memModel
-					}
-
-					TableView {
-						property var stackModel: ListModel {
-							id: stackModel
-						}
-						height: parent.height/2
-						width: parent.width
-						TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
-						model: stackModel
-					}
+          TableView {
+            property var memModel: ListModel {
+              id: memModel
+            }
+            height: parent.height/2
+            width: parent.width
+            TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
+            TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
+            model: memModel
+          }
+
+          SplitView {
+            orientation: Qt.Horizontal
+            TableView {
+              property var debuggerLog: ListModel {
+                id: debuggerLog
+              }
+              TableViewColumn{ role: "value"; title: "Debug messages" }
+              model: debuggerLog
+            }
+            TableView {
+              property var stackModel: ListModel {
+                id: stackModel
+              }
+              height: parent.height/2
+              width: parent.width
+              TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
+              model: stackModel
+            }
+          }
 				}
 			}
 		}
@@ -449,6 +459,10 @@ ApplicationWindow {
 	function setStack(stack) {
 		stackModel.append({value: stack})
 	}
+	function addDebugMessage(message){
+		console.log("WOOP:")
+		debuggerLog.append({value: message})
+	}
 
 	function clearStack() {
 		stackModel.clear()