From 7c65560f20d31f4b56cce3d3f8aee918c03dba14 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 20 Aug 2014 23:52:33 +0200
Subject: [PATCH] Changed icon source
---
ethereal/assets/qml/views/chain.qml | 2 +-
ethereal/assets/qml/views/history.qml | 2 +-
ethereal/assets/qml/views/info.qml | 2 +-
ethereal/assets/qml/views/javascript.qml | 2 +-
ethereal/assets/qml/views/pending_tx.qml | 2 +-
ethereal/assets/qml/views/transaction.qml | 2 +-
ethereal/assets/qml/views/wallet.qml | 4 ++--
ethereal/assets/qml/wallet.qml | 10 +++++-----
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ethereal/assets/qml/views/chain.qml b/ethereal/assets/qml/views/chain.qml
index b94d9edca..9eaa49db1 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 d8c932f8f..9eee883e3 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 c4486aa6c..ca6ca077e 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 aa5f93547..ea05c4148 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 8e3690cb9..abfa25790 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 640e02a4e..fb8ba8a6d 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 b626ff678..5e10a7022 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 d732f2ec8..094349bab 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
--
GitLab