monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #382

Browse source 
427d9e2 wizard: store settings before opening from file (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:57:59 -08:00
commit 1532c5638f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wizard/WizardMain.qml
View file

@ -105,25 +105,19 @@ Rectangle {
function openCreateWalletPage() {
print ("show create wallet page");
pages[currentPage].opacity = 0;
createWalletPage.opacity = 1
currentPath = "create_wallet"
pages = paths[currentPath]
currentPage = pages.indexOf(createWalletPage)
createWalletPage.createWallet(settings)
wizard.nextButton.visible = true
createWalletPage.onPageOpened(settings);
// goto next page
switchPage(true);
}
function openRecoveryWalletPage() {
print ("show recovery wallet page");
pages[currentPage].opacity = 0
recoveryWalletPage.opacity = 1
currentPath = "recovery_wallet"
pages = paths[currentPath]
currentPage = pages.indexOf(recoveryWalletPage)
wizard.nextButton.visible = true
recoveryWalletPage.onPageOpened(settings);
// goto next page
switchPage(true);
}
function openOpenWalletPage() {
@ -132,8 +126,8 @@ Rectangle {
settings.wallet.destroy();
delete wizard.settings['wallet'];
}
wizard.openWalletFromFileClicked();
optionsPage.onPageClosed(settings)
wizard.openWalletFromFileClicked();
}
function createWalletPath(folder_path,account_name){

20
wizard/WizardOptions.qml
View file

@ -40,6 +40,17 @@ Item {
visible: false
property var buttonSize: 190
function onPageClosed() {
// Save settings used in open from file.
// other wizard settings are saved on last page in applySettings()
appWindow.persistentSettings.testnet = wizard.settings["testnet"]
appWindow.persistentSettings.daemon_address = wizard.settings["daemon_address"]
appWindow.persistentSettings.language = wizard.settings.language
appWindow.persistentSettings.locale = wizard.settings.locale
return true;
}
function saveDaemonAddress() {
wizard.settings["daemon_address"] = daemonAddress.text
wizard.settings["testnet"] = testNet.checked
@ -261,7 +272,12 @@ Item {
Layout.alignment: Qt.AlignCenter
width: 200
fontSize: 14
text: testNet.checked ? d.daemonAddressTestnet : d.daemonAddressMainnet
text: {
if(appWindow.persistentSettings.daemon_address)
return appWindow.persistentSettings.daemon_address;
return testNet.checked ? d.daemonAddressTestnet : d.daemonAddressMainnet
}
}
CheckBox {
@ -274,7 +290,7 @@ Item {
fontSize: 16
checkedIcon: "../images/checkedVioletIcon.png"
uncheckedIcon: "../images/uncheckedIcon.png"
checked: false
checked: appWindow.persistentSettings.testnet;
}
}
}