aboutsummaryrefslogtreecommitdiff
path: root/main.qml
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-01-14 10:41:13 -0500
committerRiccardo Spagni <ric@spagni.net>2017-01-14 10:41:13 -0500
commitb5ade0d9d1ef4bda22a930d2563729bbe7a87f06 (patch)
tree610ea5d6e7c5741cfee2ba966ce294c557c86a2b /main.qml
parenta1c5e7fed213d88c677d62c6ec0197275b9d9553 (diff)
parent94e8f3ac4c158f0f022bb18ac5b88ba7279615e8 (diff)
downloadmonzero-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.qml5
1 files changed, 2 insertions, 3 deletions
diff --git a/main.qml b/main.qml
index 3144a70e..663f9005 100644
--- a/main.qml
+++ b/main.qml
@@ -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();
}
}