aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/assets
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-14 00:23:09 +0800
committerobscuren <geffobscura@gmail.com>2015-02-14 00:23:09 +0800
commit8a0f23915e4feb9aabe21bd075416bc0f32bbc43 (patch)
tree8f7dc62676e519236b69a977c7af00d81b1e0406 /cmd/mist/assets
parent8305d409d2ca83583d9fa7e837ec0a46ce6ba78e (diff)
downloadgo-tangerine-8a0f23915e4feb9aabe21bd075416bc0f32bbc43.tar.gz
go-tangerine-8a0f23915e4feb9aabe21bd075416bc0f32bbc43.tar.zst
go-tangerine-8a0f23915e4feb9aabe21bd075416bc0f32bbc43.zip
Fixed a few issues in the miner and updated hash rate title
* Sometimes old nonces were set by "old" agents * Added the hash rate to the miner
Diffstat (limited to 'cmd/mist/assets')
-rw-r--r--cmd/mist/assets/qml/main.qml4
-rw-r--r--cmd/mist/assets/qml/views/miner.qml24
2 files changed, 27 insertions, 1 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 2b56b7236..dce279518 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -289,6 +289,7 @@ ApplicationWindow {
styleColor: "#797979"
}
+ /*
Label {
//y: 6
objectName: "miningLabel"
@@ -307,6 +308,7 @@ ApplicationWindow {
anchors.right: peerGroup.left
anchors.rightMargin: 5
}
+ */
ProgressBar {
visible: false
@@ -1101,4 +1103,4 @@ ApplicationWindow {
addrField.focus = true
}
}
- } \ No newline at end of file
+ }
diff --git a/cmd/mist/assets/qml/views/miner.qml b/cmd/mist/assets/qml/views/miner.qml
index 193ce37be..0938644b9 100644
--- a/cmd/mist/assets/qml/views/miner.qml
+++ b/cmd/mist/assets/qml/views/miner.qml
@@ -14,6 +14,30 @@ Rectangle {
color: "#00000000"
+ Label {
+ visible: false
+ id: lastBlockLabel
+ objectName: "lastBlockLabel"
+ text: "---"
+ font.pixelSize: 10
+ anchors.right: peerGroup.left
+ anchors.rightMargin: 5
+ onTextChanged: {
+ //menuItem.secondaryTitle = text
+ }
+ }
+
+ Label {
+ objectName: "miningLabel"
+ visible: false
+ font.pixelSize: 10
+ anchors.right: lastBlockLabel.left
+ anchors.rightMargin: 5
+ onTextChanged: {
+ menuItem.secondaryTitle = text
+ }
+ }
+
ColumnLayout {
spacing: 10
anchors.fill: parent