diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-21 20:30:37 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-21 20:30:37 +0800 |
| commit | 4d5a890b46a75fb644277bbf2a8c034cf2a13424 (patch) | |
| tree | 7d37fddbcdbd218fe6e0e216aa3554380229d133 /ethereal/assets | |
| parent | 75a7a4c97c350e911f4d721e940a59c0740ae967 (diff) | |
| parent | f702e27485981562ed7b88ecd3f8485af4c61b62 (diff) | |
| download | dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar.gz dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar.bz2 dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar.lz dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar.xz dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.tar.zst dexon-4d5a890b46a75fb644277bbf2a8c034cf2a13424.zip | |
merge upstream
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/debugger/debugger.qml | 2 | ||||
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 70 | ||||
| m--------- | ethereal/assets/samplecoin | 0 |
3 files changed, 49 insertions, 23 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index fa56737a2..34fe01253 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -86,7 +86,7 @@ ApplicationWindow { TableView { id: asmTableView width: 200 - TableViewColumn{ role: "value" ; title: "" ; width: 200 } + TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 } model: asmModel } diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index c783cde83..a79e4708c 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -419,30 +419,54 @@ ApplicationWindow { } } - Label { - y: 7 - anchors.right: peerImage.left - anchors.rightMargin: 5 - id: peerLabel - font.pixelSize: 8 - text: "0 / 0" - } - Image { - y: 7 - id: peerImage - anchors.right: parent.right - width: 10; height: 10 - MouseArea { - onDoubleClicked: peerWindow.visible = true - anchors.fill: parent - } - source: "../network.png" - } + Label { + y: 6 + id: lastBlockLabel + objectName: "lastBlockLabel" + visible: true + text: "" + font.pixelSize: 10 + anchors.right: peerGroup.left + anchors.rightMargin: 5 + } + + ProgressBar { + id: syncProgressIndicator + visible: false + objectName: "syncProgressIndicator" + y: 3 + width: 140 + indeterminate: true + anchors.right: peerGroup.left + anchors.rightMargin: 5 + } + + RowLayout { + id: peerGroup + y: 7 + anchors.right: parent.right + MouseArea { + onDoubleClicked: peerWindow.visible = true + anchors.fill: parent + } + + Label { + id: peerLabel + font.pixelSize: 8 + text: "0 / 0" + } + Image { + id: peerImage + width: 10; height: 10 + source: "../network.png" + } + } } Window { id: popup visible: false + //flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint property var block width: root.width height: 300 @@ -460,7 +484,7 @@ ApplicationWindow { Text { text: '<h3>Block details</h3>'; color: "#F2F2F2"} Text { text: '<b>Block number:</b> ' + number; color: "#F2F2F2"} Text { text: '<b>Hash:</b> ' + hash; color: "#F2F2F2"} - Text { text: '<b>Coinbase:</b> ' + coinbase; color: "#F2F2F2"} + Text { text: '<b>Coinbase:</b> <' + name + '> ' + coinbase; color: "#F2F2F2"} Text { text: '<b>Block found at:</b> ' + prettyTime; color: "#F2F2F2"} Text { text: '<b>Gas used:</b> ' + gasUsed + " / " + gasLimit; color: "#F2F2F2"} } @@ -577,6 +601,7 @@ ApplicationWindow { Window { id: addPeerWin + //flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint visible: false minimumWidth: 230 maximumWidth: 230 @@ -686,9 +711,9 @@ ApplicationWindow { } if(initial){ - blockModel.append({number: block.number, 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({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, 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, {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)}) } } @@ -743,6 +768,7 @@ ApplicationWindow { // ****************************************** Window { id: peerWindow + //flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint height: 200 width: 700 Rectangle { diff --git a/ethereal/assets/samplecoin b/ethereal/assets/samplecoin deleted file mode 160000 -Subproject 944fbaa31d51328b522c0cd55113716630b4cbc |