From 9e38ca555dccd6b9a4a3fa0eb9eb749d2dc3c82c Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 4 Jul 2014 15:31:13 +0200 Subject: [PATCH] Visual updates --- ethereal/assets/debugger/debugger.qml | 12 +----------- ethereal/debugger.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 579e8be3a..f204647c8 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -231,7 +231,7 @@ ApplicationWindow { } height: parent.height width: parent.width - TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width -1 } + TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 } model: logModel } } @@ -258,16 +258,6 @@ ApplicationWindow { exec() } } - - Button { - anchors { - left: dbgCommand.right - } - text: "Exec" - onClicked: { - exec() - } - } } toolBar: ToolBar { diff --git a/ethereal/debugger.go b/ethereal/debugger.go index f649857b2..89e0f36eb 100644 --- a/ethereal/debugger.go +++ b/ethereal/debugger.go @@ -73,6 +73,10 @@ func (self *DebuggerWindow) Compile(code string) { } } +func (self *DebuggerWindow) ClearLog() { + self.win.Root().Call("clearLog") +} + func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) { if !self.Db.done { self.Db.Q <- true @@ -188,8 +192,8 @@ func (self *DebuggerWindow) ExecCommand(command string) { switch cmd[0] { case "help": self.Logln("Debugger commands:") - self.Logln("break, bp Set breakpoint on instruction") - self.Logln("clear [break, bp] Clears previous set sub-command(s)") + self.Logln("break, bp Set breakpoint on instruction") + self.Logln("clear [log, break, bp] Clears previous set sub-command(s)") case "break", "bp": if len(cmd) > 1 { lineNo, err := strconv.Atoi(cmd[1]) @@ -211,6 +215,8 @@ func (self *DebuggerWindow) ExecCommand(command string) { self.vm.BreakPoints = nil self.Logln("Breakpoints cleared") + case "log": + self.ClearLog() default: self.Logf("clear '%s' is not valid", cmd[1]) }