diff options
| author | obscuren <geffobscura@gmail.com> | 2014-08-25 18:53:17 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-08-25 18:53:17 +0800 |
| commit | e68c502f7a0a3affffe889e3453151cdd1ef451e (patch) | |
| tree | 3a01b8039dd501df259b75d4872b0424302be5e4 | |
| parent | 997e92191de5a7eeca2d9759c7b2aa0ee6b8aab9 (diff) | |
| download | dexon-e68c502f7a0a3affffe889e3453151cdd1ef451e.tar.gz dexon-e68c502f7a0a3affffe889e3453151cdd1ef451e.tar.zst dexon-e68c502f7a0a3affffe889e3453151cdd1ef451e.zip | |
Display block size
| -rw-r--r-- | ethereal/assets/qml/views/chain.qml | 7 | ||||
| -rw-r--r-- | ethereal/gui.go | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ethereal/assets/qml/views/chain.qml b/ethereal/assets/qml/views/chain.qml index 9eaa49db1..ed019acf1 100644 --- a/ethereal/assets/qml/views/chain.qml +++ b/ethereal/assets/qml/views/chain.qml @@ -10,7 +10,6 @@ Rectangle { id: root property var title: "Network" property var iconSource: "../net.png" - property var secondary: "Hi" property var menuItem objectName: "chainView" @@ -110,9 +109,9 @@ Rectangle { } if(initial){ - blockModel.append({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)}) + blockModel.append({size: block.size, 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)}) } 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)}) + blockModel.insert(0, {size: block.size, 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; @@ -137,7 +136,7 @@ Rectangle { anchors.top: parent.top anchors.left: parent.left Text { text: '<h3>Block details</h3>'; color: "#F2F2F2"} - Text { text: '<b>Block number:</b> ' + number; color: "#F2F2F2"} + Text { text: '<b>Block number:</b> ' + number + " (Size: " + size + ")"; color: "#F2F2F2"} Text { text: '<b>Hash:</b> ' + hash; color: "#F2F2F2"} Text { text: '<b>Coinbase:</b> <' + name + '> ' + coinbase; color: "#F2F2F2"} Text { text: '<b>Block found at:</b> ' + prettyTime; color: "#F2F2F2"} diff --git a/ethereal/gui.go b/ethereal/gui.go index 1fb6c05e6..bd1466e8b 100644 --- a/ethereal/gui.go +++ b/ethereal/gui.go @@ -279,7 +279,7 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { ptx.Address = r if window == "post" { - gui.getObjectByName("transactionView").Call("addTx", ptx, inout) + //gui.getObjectByName("transactionView").Call("addTx", ptx, inout) } else { gui.getObjectByName("pendingTxView").Call("addTx", ptx, inout) } @@ -393,12 +393,12 @@ func (gui *Gui) update() { if bytes.Compare(tx.Sender(), gui.address()) == 0 { object.SubAmount(tx.Value) - gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "send") + //gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "send") gui.txDb.Put(tx.Hash(), tx.RlpEncode()) } else if bytes.Compare(tx.Recipient, gui.address()) == 0 { object.AddAmount(tx.Value) - gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "recv") + //gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "recv") gui.txDb.Put(tx.Hash(), tx.RlpEncode()) } |