diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-17 21:32:44 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-17 21:32:44 +0800 |
| commit | c9517024237de781cdc450bca89907217e5a8cef (patch) | |
| tree | 9ed398ca6ddbc019917b96a6e14988d89fbef15a /ethereal/assets | |
| parent | fc8bd7229ee25e214130df98875ecc13e4650911 (diff) | |
| parent | 7d64b589b4cf3f71125d5bd0f0a8f6a560e909db (diff) | |
| download | go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.gz go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.bz2 go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.lz go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.xz go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.zst go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.zip | |
Merge branch 'develop'0.5.17
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/debugger/debugger.qml | 8 | ||||
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index f204647c8..34fe01253 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -19,7 +19,7 @@ ApplicationWindow { property alias dataText: rawDataField.text onClosing: { - compileTimer.stop() + //compileTimer.stop() } MenuBar { @@ -86,7 +86,7 @@ ApplicationWindow { TableView { id: asmTableView width: 200 - TableViewColumn{ role: "value" ; title: "" ; width: 200 } + TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 } model: asmModel } @@ -112,13 +112,15 @@ ApplicationWindow { anchors.right: settings.left focus: true + /* Timer { id: compileTimer interval: 500 ; running: true ; repeat: true onTriggered: { - dbg.compile(codeEditor.text) + dbg.autoComp(codeEditor.text) } } + */ } Column { diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 401267511..5e4c035d8 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -191,6 +191,7 @@ ApplicationWindow { inspector.visible = false }else{ inspector.visible = true + inspector.url = webview.experimental.remoteInspectorUrl } } onDoubleClicked: { @@ -224,7 +225,6 @@ ApplicationWindow { WebView { id: inspector visible: false - url: webview.experimental.remoteInspectorUrl anchors { left: root.left right: root.right @@ -238,7 +238,6 @@ ApplicationWindow { name: "inspectorShown" PropertyChanges { target: inspector - url: webview.experimental.remoteInspectorUrl } } ] |