diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-27 22:23:59 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-27 22:23:59 +0800 |
| commit | 87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e (patch) | |
| tree | 746adb494e1a01b5222e4af75c0ea562f0404016 | |
| parent | 0dda955f90b674090066d3621b40eabba14f8559 (diff) | |
| parent | 969b4a4a36c2f465de3ab980d13ec513ec6db780 (diff) | |
| download | go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar.gz go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar.bz2 go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar.lz go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar.xz go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.tar.zst go-tangerine-87a669aeda0e5e1e5d27ab1e30f6ffd7bf31bf4e.zip | |
Merge branch 'develop'
| -rw-r--r-- | ethereal/assets/debugger/debugger.qml | 23 | ||||
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 10 |
2 files changed, 32 insertions, 1 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 9ea131d7d..7c3ffbceb 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/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}) } diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 5e0904a20..e5a2bc249 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/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 { |