diff --git a/ethereal/assets/qml/views/chain.qml b/ethereal/assets/qml/views/chain.qml index b94d9edca7fafbe50f5cccb4ee04e5ca2cecdbe8..9eaa49db18016a35f81e93c4d91445bddd0aca4c 100644 --- a/ethereal/assets/qml/views/chain.qml +++ b/ethereal/assets/qml/views/chain.qml @@ -9,7 +9,7 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Network" - property var iconFile: "../net.png" + property var iconSource: "../net.png" property var secondary: "Hi" property var menuItem diff --git a/ethereal/assets/qml/views/history.qml b/ethereal/assets/qml/views/history.qml index d8c932f8f949a5da1e1210726c9509caddb79476..9eee883e3edd832704d4651bece73eaf499403b9 100644 --- a/ethereal/assets/qml/views/history.qml +++ b/ethereal/assets/qml/views/history.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.1 import Ethereum 1.0 Rectangle { - property var iconFile: "../tx.png" + property var iconSource: "../tx.png" property var title: "Transactions" property var menuItem diff --git a/ethereal/assets/qml/views/info.qml b/ethereal/assets/qml/views/info.qml index c4486aa6c7f64cf2245b91284253e17120ed9723..ca6ca077e0d310838a11775d42e0d58ce44d1c3f 100644 --- a/ethereal/assets/qml/views/info.qml +++ b/ethereal/assets/qml/views/info.qml @@ -8,7 +8,7 @@ import Ethereum 1.0 Rectangle { property var title: "Information" - property var iconFile: "../heart.png" + property var iconSource: "../heart.png" property var menuItem objectName: "infoView" diff --git a/ethereal/assets/qml/views/javascript.qml b/ethereal/assets/qml/views/javascript.qml index aa5f93547f40e342aea4d4189e2dff11d558c830..ea05c41485ec7314f049c26fefd99d0053f37232 100644 --- a/ethereal/assets/qml/views/javascript.qml +++ b/ethereal/assets/qml/views/javascript.qml @@ -8,7 +8,7 @@ import Ethereum 1.0 Rectangle { property var title: "JavaScript" - property var iconFile: "../tx.png" + property var iconSource: "../tx.png" property var menuItem objectName: "javascriptView" diff --git a/ethereal/assets/qml/views/pending_tx.qml b/ethereal/assets/qml/views/pending_tx.qml index 8e3690cb93e19c311a99f1f697f9583b932bb972..abfa257907676c8d151020a3e15e61c961544c34 100644 --- a/ethereal/assets/qml/views/pending_tx.qml +++ b/ethereal/assets/qml/views/pending_tx.qml @@ -8,7 +8,7 @@ import Ethereum 1.0 Rectangle { property var title: "Pending Transactions" - property var iconFile: "../tx.png" + property var iconSource: "../tx.png" property var menuItem objectName: "pendingTxView" diff --git a/ethereal/assets/qml/views/transaction.qml b/ethereal/assets/qml/views/transaction.qml index 640e02a4e3efcd4d500a700b27e7f2c5ced10051..fb8ba8a6d75efd2d7558625bdf31d21fc38ec2e5 100644 --- a/ethereal/assets/qml/views/transaction.qml +++ b/ethereal/assets/qml/views/transaction.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.1 import Ethereum 1.0 Rectangle { - property var iconFile: "../new.png" + property var iconSource: "../new.png" property var title: "New transaction" property var menuItem diff --git a/ethereal/assets/qml/views/wallet.qml b/ethereal/assets/qml/views/wallet.qml index b626ff678f13fd71a88f6ed5aa2ee9b8ef23eb13..5e10a70224f78e43dc218e1b64ce19ebdd770233 100644 --- a/ethereal/assets/qml/views/wallet.qml +++ b/ethereal/assets/qml/views/wallet.qml @@ -9,14 +9,14 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Wallet" - property var iconFile: "../wallet.png" + property var iconSource: "../wallet.png" property var menuItem objectName: "walletView" anchors.fill: parent function onReady() { - menuItem.secondary = eth.numberToHuman(eth.balanceAt(eth.key().address)) + menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address)) } ListModel { diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index d732f2ec83c1ba648c0584d489af8351cd994cc6..094349bab8e3e631d9b163f2143d2f42dfecd597 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -292,12 +292,12 @@ ApplicationWindow { view.visible = false view.anchors.fill = mainView - if( !view.hasOwnProperty("iconFile") ) { - console.log("Could not load plugin. Property 'iconFile' not found on view."); + if( !view.hasOwnProperty("iconSource") ) { + console.log("Could not load plugin. Property 'iconSourc' not found on view."); return; } - var menuItem = menu.createMenuItem(view.iconFile, view, options); + var menuItem = menu.createMenuItem(view.iconSource, view, options); if( view.hasOwnProperty("menuItem") ) { view.menuItem = menuItem; } @@ -333,7 +333,7 @@ ApplicationWindow { property alias title: label.text property alias icon: icon.source - property alias secondary: secondary.text + property alias secondaryTitle: secondary.text width: 180 height: 28 @@ -429,7 +429,7 @@ ApplicationWindow { comp.view = view comp.title = view.title - comp.icon = view.iconFile + comp.icon = view.iconSource /* if(view.secondary !== undefined) { comp.secondary = view.secondary