diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:18 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:18 +0800 |
| commit | 00fca409398172811e71158e0ca9f6229e0f815b (patch) | |
| tree | 8f7dc62676e519236b69a977c7af00d81b1e0406 /cmd/mist/assets | |
| parent | 5c251b69282b3992512d0c17ed0063f294a0e663 (diff) | |
| parent | 8a0f23915e4feb9aabe21bd075416bc0f32bbc43 (diff) | |
| download | go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.gz go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.bz2 go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.lz go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.xz go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.zst go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.zip | |
Merge branch 'miner' into develop
Diffstat (limited to 'cmd/mist/assets')
| -rw-r--r-- | cmd/mist/assets/examples/coin.html | 1 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 4 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/miner.qml | 24 |
3 files changed, 27 insertions, 2 deletions
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 99e0c7643..ca7a9c0dd 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -117,7 +117,6 @@ refresh(); </script> - </html> <!-- 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 |