Merge pull request #382

427d9e2 wizard: store settings before opening from file (Jaquee)

2 files changed, 24 insertions, 14 deletions

diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index dc84a4a4..a905d909 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -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){
diff --git a/wizard/WizardOptions.qml b/wizard/WizardOptions.qml
index 0797fc34..e0e66adc 100644
--- a/wizard/WizardOptions.qml
+++ b/wizard/WizardOptions.qml
@@ -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;
                 }
             }
         }