diff options
Diffstat (limited to 'cmd/mist/assets/qml')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 6 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/browser2.qml | 31 |
2 files changed, 19 insertions, 18 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index b5f1ac0ee..c88873795 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -45,9 +45,9 @@ ApplicationWindow { mainSplit.setView(wallet.view, wallet.menuItem); - try { - newBrowserTab("http://google.com"); - } catch(e) { console.log(e); } + console.log("starting browser") + newBrowserTab("http://etherian.io"); + console.log("done") // Command setup gui.sendCommand(0) diff --git a/cmd/mist/assets/qml/views/browser2.qml b/cmd/mist/assets/qml/views/browser2.qml index 530dde6b9..53fd72ffd 100644 --- a/cmd/mist/assets/qml/views/browser2.qml +++ b/cmd/mist/assets/qml/views/browser2.qml @@ -1,11 +1,10 @@ import QtQuick 2.0 -import QtWebEngine 1.0 -//import QtWebEngine.experimental 1.0 import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0 import QtQuick.Layouts 1.0; +import QtWebEngine 1.0 +//import QtWebEngine.experimental 1.0 import QtQuick.Window 2.0; -import Ethereum 1.0 Rectangle { id: window @@ -64,17 +63,6 @@ Rectangle { } Component.onCompleted: { - webview.url = "http://etherian.io" - } - - function messages(messages, id) { - // Bit of a cheat to get proper JSON - var m = JSON.parse(JSON.parse(JSON.stringify(messages))) - webview.postEvent("eth_changed", id, m); - } - - function onShhMessage(message, id) { - webview.postEvent("shh_changed", id, message) } Item { @@ -129,6 +117,8 @@ Rectangle { } iconSource: "../../bug.png" onClicked: { + // XXX soon + return if(inspector.visible == true){ inspector.visible = false }else{ @@ -155,13 +145,23 @@ Rectangle { WebEngineView { objectName: "webView" id: webview - // anchors.fill: parent anchors { left: parent.left right: parent.right bottom: parent.bottom top: divider.bottom } + + onLoadingChanged: { + console.log(url) + if (loadRequest.status == WebEngineView.LoadSucceededStatus) { + webview.runJavaScript(eth.readFile("bignumber.min.js")); + webview.runJavaScript(eth.readFile("dist/ethereum.js")); + } + } + onJavaScriptConsoleMessage: { + console.log(sourceID + ":" + lineNumber + ":" + JSON.stringify(message)); + } } Rectangle { @@ -193,6 +193,7 @@ Rectangle { top: sizeGrip.bottom bottom: root.bottom } + } states: [ |