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-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3231

Browse source 
56e61148 wizard: move language related settings to PersistentSettings (xiphon)
This commit is contained in:
Alexander Blair 2020-11-24 11:35:24 -08:00
commit 212fa083e2
No known key found for this signature in database
GPG key ID: C64552D877C32479
4 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/LanguageSidebar.qml
View file

@ -131,9 +131,9 @@ Drawer {
translationManager.setLanguage(locale_spl[0]);
// set wizard language settings
wizard.language_locale = locale;
wizard.language_wallet = wallet_language;
wizard.language_language = display_name;
persistentSettings.locale = locale;
persistentSettings.language = display_name;
persistentSettings.language_wallet = wallet_language;
appWindow.showStatusMessage(qsTr("Language changed."), 3);
appWindow.toggleLanguageView();

18
main.qml
View file

@ -233,12 +233,6 @@ ApplicationWindow {
else
walletManager.setLogLevel(persistentSettings.logLevel)
// setup language
var locale = persistentSettings.locale
if (locale !== "") {
translationManager.setLanguage(locale.split("_")[0]);
}
// Reload transfer page with translations enabled
middlePanel.transferView.onPageCompleted();
@ -1291,6 +1285,8 @@ ApplicationWindow {
x = (Screen.width - width) / 2
y = (Screen.height - maxWindowHeight) / 2
translationManager.setLanguage(persistentSettings.locale.split("_")[0]);
applyWalletMode(persistentSettings.walletMode);
//
@ -1346,8 +1342,9 @@ ApplicationWindow {
return "";
}
property string language
property string locale
property string language: 'English (US)'
property string language_wallet: 'English'
property string locale: 'en_US'
property string account_name
property string wallet_path
property bool allow_background_mining : false
@ -1845,11 +1842,6 @@ ApplicationWindow {
function toggleLanguageView(){
languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
resetLanguageFields()
// update after changing language from settings page
if (persistentSettings.language != wizard.language_language) {
persistentSettings.language = wizard.language_language
persistentSettings.locale = wizard.language_locale
}
}
Timer {

12
wizard/WizardController.qml
View file

@ -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)

2
wizard/WizardSummary.qml
View file

@ -54,7 +54,7 @@ ColumnLayout {
WizardSummaryItem {
Layout.fillWidth: true
header: qsTr("Language") + translationManager.emptyString
value: wizardController.language_language
value: persistentSettings.language
}
WizardSummaryItem {