aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/assets/qml/views
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/assets/qml/views')
-rw-r--r--ethereal/assets/qml/views/chain.qml7
-rw-r--r--ethereal/assets/qml/views/history.qml1
-rw-r--r--ethereal/assets/qml/views/info.qml1
-rw-r--r--ethereal/assets/qml/views/javascript.qml2
-rw-r--r--ethereal/assets/qml/views/pending_tx.qml1
-rw-r--r--ethereal/assets/qml/views/transaction.qml1
6 files changed, 12 insertions, 1 deletions
diff --git a/ethereal/assets/qml/views/chain.qml b/ethereal/assets/qml/views/chain.qml
index 9fbc02954..b94d9edca 100644
--- a/ethereal/assets/qml/views/chain.qml
+++ b/ethereal/assets/qml/views/chain.qml
@@ -7,8 +7,11 @@ import QtQuick.Controls.Styles 1.1
import Ethereum 1.0
Rectangle {
+ id: root
property var title: "Network"
property var iconFile: "../net.png"
+ property var secondary: "Hi"
+ property var menuItem
objectName: "chainView"
visible: false
@@ -93,6 +96,8 @@ Rectangle {
}
}
+
+
function addBlock(block, initial) {
var txs = JSON.parse(block.transactions);
var amount = 0
@@ -109,6 +114,8 @@ Rectangle {
} else {
blockModel.insert(0, {number: block.number, name: block.name, gasLimit: block.gasLimit, gasUsed: block.gasUsed, coinbase: block.coinbase, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)})
}
+
+ //root.secondary.text = "#" + block.number;
}
Window {
diff --git a/ethereal/assets/qml/views/history.qml b/ethereal/assets/qml/views/history.qml
index a73b7367d..94ea29e61 100644
--- a/ethereal/assets/qml/views/history.qml
+++ b/ethereal/assets/qml/views/history.qml
@@ -9,6 +9,7 @@ import Ethereum 1.0
Rectangle {
property var iconFile: "../tx.png"
property var title: "Transactions"
+ property var menuItem
property var txModel: ListModel {
id: txModel
diff --git a/ethereal/assets/qml/views/info.qml b/ethereal/assets/qml/views/info.qml
index 60b6a62ec..c12977cbe 100644
--- a/ethereal/assets/qml/views/info.qml
+++ b/ethereal/assets/qml/views/info.qml
@@ -9,6 +9,7 @@ import Ethereum 1.0
Rectangle {
property var title: "Information"
property var iconFile: "../heart.png"
+ property var menuItem
objectName: "infoView"
visible: false
diff --git a/ethereal/assets/qml/views/javascript.qml b/ethereal/assets/qml/views/javascript.qml
index 376397130..aa5f93547 100644
--- a/ethereal/assets/qml/views/javascript.qml
+++ b/ethereal/assets/qml/views/javascript.qml
@@ -9,6 +9,7 @@ import Ethereum 1.0
Rectangle {
property var title: "JavaScript"
property var iconFile: "../tx.png"
+ property var menuItem
objectName: "javascriptView"
visible: false
@@ -33,7 +34,6 @@ Rectangle {
TextArea {
id: output
- verticalAlignment: TextEdit.AlignBottom
text: "> JSRE Ready..."
anchors {
top: parent.top
diff --git a/ethereal/assets/qml/views/pending_tx.qml b/ethereal/assets/qml/views/pending_tx.qml
index 5c5c496d6..8e3690cb9 100644
--- a/ethereal/assets/qml/views/pending_tx.qml
+++ b/ethereal/assets/qml/views/pending_tx.qml
@@ -9,6 +9,7 @@ import Ethereum 1.0
Rectangle {
property var title: "Pending Transactions"
property var iconFile: "../tx.png"
+ property var menuItem
objectName: "pendingTxView"
anchors.fill: parent
diff --git a/ethereal/assets/qml/views/transaction.qml b/ethereal/assets/qml/views/transaction.qml
index ac38ebe0c..640e02a4e 100644
--- a/ethereal/assets/qml/views/transaction.qml
+++ b/ethereal/assets/qml/views/transaction.qml
@@ -9,6 +9,7 @@ import Ethereum 1.0
Rectangle {
property var iconFile: "../new.png"
property var title: "New transaction"
+ property var menuItem
objectName: "newTxView"
visible: false