diff options
author | obscuren <geffobscura@gmail.com> | 2014-09-22 20:54:27 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-09-22 20:54:27 +0800 |
commit | b4bd70c402e75f933e694e9f9df14912df468e69 (patch) | |
tree | 99bb9d0219a9ed9f4a617e01db4eb5c84a0a34b3 /mist/assets/qml/wallet.qml | |
parent | 8585e59718e6b75a38833801f1725730c1b9fb01 (diff) | |
download | dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar.gz dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar.bz2 dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar.lz dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar.xz dexon-b4bd70c402e75f933e694e9f9df14912df468e69.tar.zst dexon-b4bd70c402e75f933e694e9f9df14912df468e69.zip |
Re-wrote ethereum.js
Diffstat (limited to 'mist/assets/qml/wallet.qml')
-rw-r--r-- | mist/assets/qml/wallet.qml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml index 5b402a214..c4379cd47 100644 --- a/mist/assets/qml/wallet.qml +++ b/mist/assets/qml/wallet.qml @@ -14,20 +14,22 @@ ApplicationWindow { property alias miningButtonText: miningButton.text property var ethx : Eth.ethx + property var web - width: 900 - height: 600 + width: 1024 + height: 750 minimumHeight: 300 title: "Mist" // This signal is used by the filter API. The filter API connects using this signal handler from // the different QML files and plugins. - signal message(var callback, int seed); + signal messages(var messages, int id); function invokeFilterCallback(data, receiverSeed) { //var messages = JSON.parse(data) // Signal handler - message(data, receiverSeed); + messages(data, receiverSeed); + root.web.messages(data, receiverSeed); } TextField { @@ -44,7 +46,7 @@ ApplicationWindow { // Takes care of loading all default plugins Component.onCompleted: { addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true}); - addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true}); + root.web = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true}); addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"}); |