diff --git a/ethereal/assets/browser.png b/ethereal/assets/browser.png new file mode 100644 index 0000000000..1d7348170f Binary files /dev/null and b/ethereal/assets/browser.png differ diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 0b49539722..4867c68332 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -44,6 +44,7 @@ ApplicationWindow { // Takes care of loading all default plugins Component.onCompleted: { addPlugin("./views/wallet.qml", {noAdd: true, section: "ethereum", active: true}); + addPlugin("./webapp.qml", {noAdd: true, section: "ethereum", active: true}); addPlugin("./views/transaction.qml", {noAdd: true, section: "legacy"}); addPlugin("./views/chain.qml", {noAdd: true, section: "legacy"}); @@ -111,10 +112,12 @@ ApplicationWindow { } } + /* MenuItem { text: "Browser" onTriggered: eth.openBrowser() } + */ MenuItem { text: "Add plugin" @@ -145,6 +148,7 @@ ApplicationWindow { }) } } + } Menu { @@ -225,6 +229,17 @@ ApplicationWindow { } } + Menu { + title: "GLOBAL SHORTCUTS" + visible: false + MenuItem { + visible: false + shortcut: "Ctrl+l" + onTriggered: { + url.focus = true + } + } + } } statusBar: StatusBar { @@ -238,6 +253,7 @@ ApplicationWindow { } } + /* Button { id: importAppButton text: "Browser" @@ -245,6 +261,7 @@ ApplicationWindow { eth.openBrowser() } } + */ RowLayout { Label { diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index ca68600367..f1b1842ea5 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -7,16 +7,24 @@ import QtQuick.Layouts 1.0; import QtQuick.Window 2.1; import Ethereum 1.0 -ApplicationWindow { +//ApplicationWindow { +Rectangle { id: window - title: "Ethereum" - width: 1000 - height: 800 - minimumHeight: 300 + property var title: "Browser" + property var iconSource: "../browser.png" + property var menuItem + + //width: 1000 + //height: 800 + //minimumHeight: 300 property alias url: webview.url property alias webView: webview + Component.onCompleted: { + webview.url = "http://etherian.io" + } + Item { objectName: "root" id: root @@ -53,6 +61,7 @@ ApplicationWindow { leftMargin: 5 rightMargin: 5 } + text: "http://etherian.io" id: uriNav y: parent.height / 2 - this.height / 2