diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-16 22:36:46 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-16 22:36:46 +0800 |
| commit | 15ded0bea9600f489d7f9fb5430c26a84a021bd2 (patch) | |
| tree | c1a9ea4622a2062d0d4b904b7ee67fb620e101d7 /ethereal/assets/qml/wallet.qml | |
| parent | b89d9f6e90a561725899dd9bffb670efbf766386 (diff) | |
| download | go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar.gz go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar.bz2 go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar.lz go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar.xz go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.tar.zst go-tangerine-15ded0bea9600f489d7f9fb5430c26a84a021bd2.zip | |
Integrate web app in to the main client
Diffstat (limited to 'ethereal/assets/qml/wallet.qml')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 0b4953972..4867c6833 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 { |