From 0a6f6b4382a35402cdfd792487a82c4e83b3a3b0 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sat, 27 Aug 2016 22:13:33 -0300 Subject: Settings update: Fix missing groups and Language initialization There's one function named uiLanguage() that should return the current uiLanguage() that subsurface is running, but it actually sets a whole lot of preferences, I think that the general idea of that function is okay, but it seems broken for me. still, I used it to load the correct language from the preferences since it's what this function is currently doing right now. Also, a lot of missing groups where added. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/preferences/preferences_language.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index 75297a8ff..64e937aef 100644 --- a/desktop-widgets/preferences/preferences_language.cpp +++ b/desktop-widgets/preferences/preferences_language.cpp @@ -42,18 +42,19 @@ void PreferencesLanguage::refreshSettings() ui->languageDropdown->setCurrentIndex(languages.first().row()); } +#include void PreferencesLanguage::syncSettings() { - auto lang = SettingsObjectWrapper::instance()->language_settings; bool useSystemLang = prefs.locale.use_system_language; + QString currentText = ui->languageDropdown->currentText(); - QAbstractItemModel *m = ui->languageDropdown->model(); - QString currentText = m->data(m->index(ui->languageDropdown->currentIndex(),0), Qt::UserRole).toString(); if (useSystemLang != ui->languageSystemDefault->isChecked() || (!useSystemLang && currentText != prefs.locale.language)) { QMessageBox::warning(this, tr("Restart required"), tr("To correctly load a new language you must restart Subsurface.")); } + + auto lang = SettingsObjectWrapper::instance()->language_settings; lang->setLanguage(currentText); lang->setUseSystemLanguage(ui->languageSystemDefault->isChecked()); lang->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked()); -- cgit v1.2.3-70-g09d2