Merge branch 'develop'

ethereal/assets/debugger/debugger.qml

@@ -14,6 +14,23 @@ ApplicationWindow {
     width: 1290
     height: 900
 
+	MenuBar {
+		Menu {
+			title: "Debugger"
+			MenuItem {
+				text: "Run"
+				shortcut: "Ctrl+r"
+				onTriggered: debugCurrent()
+			}
+
+			MenuItem {
+				text: "Next"
+				shortcut: "Ctrl+n"
+				onTriggered: dbg.next()
+			}
+		}
+    }
+
     SplitView {
         anchors.fill: parent
         property var asmModel: ListModel {
@@ -158,7 +175,7 @@ ApplicationWindow {
                 property var enabled: true
                 id: debugStart
                 onClicked: {
-                    dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
+                    debugCurrent()
                 }
                 text: "Debug"
             }
@@ -174,6 +191,10 @@ ApplicationWindow {
         }
     }
 
+    function debugCurrent() {
+        dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
+    }
+
     function setAsm(asm) {
         asmModel.append({asm: asm})
     }

ethereal/assets/qml/wallet.qml

@@ -24,11 +24,21 @@ ApplicationWindow {
 				shortcut: "Ctrl+o"
 				onTriggered: openAppDialog.open()
 			}
+		}
+
+		Menu {
+			title: "Tools"
 			MenuItem {
 				text: "Muted"
 				shortcut: "Ctrl+e"
 				onTriggered: ui.muted("")
 			}
+
+			MenuItem {
+				text: "Debugger"
+				shortcut: "Ctrl+d"
+				onTriggered: ui.startDebugger()
+			}
 		}
 
 		Menu {