diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-14 10:41:13 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-14 10:41:13 -0500 |
| commit | b5ade0d9d1ef4bda22a930d2563729bbe7a87f06 (patch) | |
| tree | 610ea5d6e7c5741cfee2ba966ce294c557c86a2b /main.qml | |
| parent | a1c5e7fed213d88c677d62c6ec0197275b9d9553 (diff) | |
| parent | 94e8f3ac4c158f0f022bb18ac5b88ba7279615e8 (diff) | |
| download | monzero-gui-b5ade0d9d1ef4bda22a930d2563729bbe7a87f06.tar.gz monzero-gui-b5ade0d9d1ef4bda22a930d2563729bbe7a87f06.tar.xz monzero-gui-b5ade0d9d1ef4bda22a930d2563729bbe7a87f06.zip | |
Merge pull request #368
94e8f3a Add mining screen (moneromooo.monero)
1cd7dd6 StandardDropdown: fix for empty model (moneromooo.monero)
Diffstat (limited to 'main.qml')
| -rw-r--r-- | main.qml | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -379,7 +379,6 @@ ApplicationWindow { daemonRunning = false; } - function onWalletNewBlock(blockHeight) { // Update progress bar var currHeight = blockHeight @@ -867,7 +866,7 @@ ApplicationWindow { onTxkeyClicked: middlePanel.state = "TxKey" onHistoryClicked: middlePanel.state = "History" onAddressBookClicked: middlePanel.state = "AddressBook" - onMiningClicked: middlePanel.state = "Minning" + onMiningClicked: middlePanel.state = "Mining" onSignClicked: middlePanel.state = "Sign" onSettingsClicked: middlePanel.state = "Settings" } @@ -1149,7 +1148,7 @@ ApplicationWindow { onClosing: { // Close wallet non async on exit walletManager.closeWallet(); - // Stop daemon + // Stop daemon and pool miner daemonManager.stop(); } } |
