diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 02:00:34 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 02:00:34 +0800 |
| commit | 8c2940a98b8dc2163b8baea367680e1d9e249365 (patch) | |
| tree | f4284066dcab719aa37958c374722b5acac49d1a | |
| parent | 21c373b55dc8543fb97ebf3c66128506d4f74d0a (diff) | |
| download | dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar.gz dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar.bz2 dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar.lz dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar.xz dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.tar.zst dexon-8c2940a98b8dc2163b8baea367680e1d9e249365.zip | |
updating to new network health page
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/network.qml | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index f8c01e25c..edf253418 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -759,7 +759,7 @@ ApplicationWindow { Rectangle { height: 55 color: "transparent" - visible:false + visible: true Text { text: "DEBUG" font.family: sourceSansPro.name diff --git a/cmd/mist/assets/qml/views/network.qml b/cmd/mist/assets/qml/views/network.qml index a628cc157..cb28a79f0 100644 --- a/cmd/mist/assets/qml/views/network.qml +++ b/cmd/mist/assets/qml/views/network.qml @@ -92,16 +92,17 @@ Rectangle { // Check if it's mining and set it accordingly if (miningSliderValue > 0 && !eth.miner().mining()) { + // If the eth.setGasPrice("10000000000000"); - eth.miner().start(); } else if (miningSliderValue == 0 && eth.miner().mining()) { eth.miner().stop(); } else if (eth.miner().mining()) { - webview.runJavaScript('console.log(localStorage.timeSpent); Miner.timeSpentMining++; Miner.hashrate = ' + eth.miner().hashRate() ); - + webview.runJavaScript('var miningData = MiningData.findOne(); MiningData.update(miningData._id, {$inc: {totalTimeSpent: 1}}); Miner.hashrate = ' + eth.miner().hashRate() ); + //var miningData = MiningData.findOne(); MiningData.update(miningData._id, {$inc: {totalTimeSpent: 1}}); + } else if (miningSliderValue == "undefined") { webview.runJavaScript('Miner.mining = 0' ); |