diff options
| author | xiphon <xiphon@protonmail.com> | 2020-11-12 22:47:07 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-11-12 22:47:07 +0000 |
| commit | 56e611480abcd2e02701961a5a4772ddbad4666d (patch) | |
| tree | b85a623548d73e3c935afcc533b10d14651a5684 /wizard | |
| parent | 6fce5c7a848b770fbfa72f7b45e2d66e13acde22 (diff) | |
| download | monzero-gui-56e611480abcd2e02701961a5a4772ddbad4666d.tar.gz monzero-gui-56e611480abcd2e02701961a5a4772ddbad4666d.tar.xz monzero-gui-56e611480abcd2e02701961a5a4772ddbad4666d.zip | |
wizard: move language related settings to PersistentSettings
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardController.qml | 12 | ||||
| -rw-r--r-- | wizard/WizardSummary.qml | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index 1c4f96b5..7467fb3d 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -107,11 +107,6 @@ Rectangle { property bool walletOptionsDeviceIsRestore: false property string tmpWalletFilename: '' - // language settings, updated via sidebar - property string language_locale: 'en_US' - property string language_wallet: 'English' - property string language_language: 'English (US)' - // recovery made (restore wallet) property string walletRestoreMode: 'seed' // seed, keys, qr @@ -333,7 +328,7 @@ Rectangle { console.log("Creating temporary wallet", tmp_wallet_filename) var nettype = appWindow.persistentSettings.nettype; var kdfRounds = appWindow.persistentSettings.kdfRounds; - var wallet = walletManager.createWallet(tmp_wallet_filename, "", wizardController.language_wallet, nettype, kdfRounds) + var wallet = walletManager.createWallet(tmp_wallet_filename, "", persistentSettings.language_wallet, nettype, kdfRounds) wizardController.walletOptionsSeed = wallet.seed @@ -364,9 +359,6 @@ Rectangle { wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); // save to persistent settings - persistentSettings.language = wizardController.language_language - persistentSettings.locale = wizardController.language_locale - persistentSettings.account_name = wizardController.walletOptionsName persistentSettings.wallet_path = wizardController.m_wallet.path; persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight @@ -404,7 +396,7 @@ Rectangle { if(wizardController.walletRestoreMode === 'seed') wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, wizardController.walletOptionsSeedOffset, nettype, restoreHeight, kdfRounds); else - wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, wizardController.language_wallet, nettype, + wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, persistentSettings.language_wallet, nettype, wizardController.walletOptionsRecoverAddress, wizardController.walletOptionsRecoverViewkey, wizardController.walletOptionsRecoverSpendkey, restoreHeight, kdfRounds) diff --git a/wizard/WizardSummary.qml b/wizard/WizardSummary.qml index a94d921d..840ee971 100644 --- a/wizard/WizardSummary.qml +++ b/wizard/WizardSummary.qml @@ -54,7 +54,7 @@ ColumnLayout { WizardSummaryItem { Layout.fillWidth: true header: qsTr("Language") + translationManager.emptyString - value: wizardController.language_language + value: persistentSettings.language } WizardSummaryItem { |