roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Integrate web app in to the main client

Browse Source
This commit is contained in:
obscuren 2014-09-16 16:36:46 +02:00
parent b89d9f6e90
commit 15ded0bea9
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ethereal/assets/browser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

17
ethereal/assets/qml/wallet.qml
View File

@ -44,6 +44,7 @@ ApplicationWindow {
// Takes care of loading all default plugins // Takes care of loading all default plugins
Component.onCompleted: { Component.onCompleted: {
addPlugin("./views/wallet.qml", {noAdd: true, section: "ethereum", active: true}); 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/transaction.qml", {noAdd: true, section: "legacy"});
addPlugin("./views/chain.qml", {noAdd: true, section: "legacy"}); addPlugin("./views/chain.qml", {noAdd: true, section: "legacy"});
@ -111,10 +112,12 @@ ApplicationWindow {
} }
} }
/*
MenuItem { MenuItem {
text: "Browser" text: "Browser"
onTriggered: eth.openBrowser() onTriggered: eth.openBrowser()
} }
*/
MenuItem { MenuItem {
text: "Add plugin" text: "Add plugin"
@ -145,6 +148,7 @@ ApplicationWindow {
}) })
} }
} }
} }
Menu { Menu {
@ -225,6 +229,17 @@ ApplicationWindow {
} }
} }
Menu {
title: "GLOBAL SHORTCUTS"
visible: false
MenuItem {
visible: false
shortcut: "Ctrl+l"
onTriggered: {
url.focus = true
}
}
}
} }
statusBar: StatusBar { statusBar: StatusBar {
@ -238,6 +253,7 @@ ApplicationWindow {
} }
} }
/*
Button { Button {
id: importAppButton id: importAppButton
text: "Browser" text: "Browser"
@ -245,6 +261,7 @@ ApplicationWindow {
eth.openBrowser() eth.openBrowser()
} }
} }
*/
RowLayout { RowLayout {
Label { Label {

19
ethereal/assets/qml/webapp.qml
View File

@ -7,16 +7,24 @@ import QtQuick.Layouts 1.0;
import QtQuick.Window 2.1; import QtQuick.Window 2.1;
import Ethereum 1.0 import Ethereum 1.0
ApplicationWindow { //ApplicationWindow {
Rectangle {
id: window id: window
title: "Ethereum" property var title: "Browser"
width: 1000 property var iconSource: "../browser.png"
height: 800 property var menuItem
minimumHeight: 300
//width: 1000
//height: 800
//minimumHeight: 300
property alias url: webview.url property alias url: webview.url
property alias webView: webview property alias webView: webview
Component.onCompleted: {
webview.url = "http://etherian.io"
}
Item { Item {
objectName: "root" objectName: "root"
id: root id: root
@ -53,6 +61,7 @@ ApplicationWindow {
leftMargin: 5 leftMargin: 5
rightMargin: 5 rightMargin: 5
} }
text: "http://etherian.io"
id: uriNav id: uriNav
y: parent.height / 2 - this.height / 2 y: parent.height / 2 - this.height / 2