diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-23 23:56:50 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-23 23:56:50 +0800 |
| commit | acfb5b85fbd48e2096652552e65c3c7000faca8f (patch) | |
| tree | b8bd5760a3c3e6002aeaf55fd16941f7be774e57 /mist/assets/qml/wallet.qml | |
| parent | 8516e748ca3528157064ff4a370f2cce3e1d787c (diff) | |
| parent | a4007f3b686b16e73b4cb9ebceb63f3755d31ff3 (diff) | |
| download | go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar.gz go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar.bz2 go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar.lz go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar.xz go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.tar.zst go-tangerine-acfb5b85fbd48e2096652552e65c3c7000faca8f.zip | |
Merge branch 'hotfix/0.6.5-2' into develop
Diffstat (limited to 'mist/assets/qml/wallet.qml')
| -rw-r--r-- | mist/assets/qml/wallet.qml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml index 8f4d9ba43..6075b621b 100644 --- a/mist/assets/qml/wallet.qml +++ b/mist/assets/qml/wallet.qml @@ -14,7 +14,7 @@ ApplicationWindow { property alias miningButtonText: miningButton.text property var ethx : Eth.ethx - property var web + property var browser width: 1200 height: 820 @@ -29,7 +29,7 @@ ApplicationWindow { //var messages = JSON.parse(data) // Signal handler messages(data, receiverSeed); - root.web.messages(data, receiverSeed); + root.browser.view.messages(data, receiverSeed); } TextField { @@ -47,7 +47,7 @@ ApplicationWindow { Component.onCompleted: { var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true}); var browser = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true}); - root.web = browser.view; + root.browser = browser; addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"}); @@ -648,7 +648,12 @@ ApplicationWindow { } Keys.onReturnPressed: { - addPlugin(this.text, {close: true, section: "apps"}) + if(/^https?/.test(this.text)) { + root.browser.view.open(this.text); + mainSplit.setView(root.browser.view, root.browser.menuItem); + } else { + addPlugin(this.text, {close: true, section: "apps"}) + } } } |