Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-07 18:07:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #368

Browse Source 
94e8f3a Add mining screen (moneromooo.monero)
1cd7dd6 StandardDropdown: fix for empty model (moneromooo.monero)
This commit is contained in:
Riccardo Spagni
2017-01-14 10:41:13 -05:00
parent a1c5e7fed2 94e8f3ac4c
commit b5ade0d9d1
7 changed files with 235 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.qml
View File

@@ -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();
}
}