mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Settings update: Fix "Language" settings

Browse source 
Save the language settings using the SettingsObjectWrapper.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-08-10 12:48:19 -03:00 • committed by Dirk Hohndel
parent bc95138f96
commit 048379cc2b
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
desktop-widgets/preferences/preferences_language.cpp
View file

@ -1,6 +1,7 @@
#include "preferences_language.h" #include "preferences_language.h"
#include "ui_prefs_language.h" #include "ui_prefs_language.h"
#include "core/helpers.h" #include "core/helpers.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include <QApplication> #include <QApplication>
#include <QSettings> #include <QSettings>
@ -44,26 +45,22 @@ void PreferencesLanguage::refreshSettings()
void PreferencesLanguage::syncSettings() void PreferencesLanguage::syncSettings()
{ {
QSettings s; auto lang = SettingsObjectWrapper::instance()->language_settings;
s.beginGroup("Language"); bool useSystemLang = prefs.locale.use_system_language;
bool useSystemLang = s.value("UseSystemLanguage", true).toBool();
QAbstractItemModel *m = ui->languageDropdown->model(); QAbstractItemModel *m = ui->languageDropdown->model();
QString currentText = m->data(m->index(ui->languageDropdown->currentIndex(),0), Qt::UserRole).toString(); QString currentText = m->data(m->index(ui->languageDropdown->currentIndex(),0), Qt::UserRole).toString();
if (useSystemLang != ui->languageSystemDefault->isChecked() || if (useSystemLang != ui->languageSystemDefault->isChecked() ||
(!useSystemLang && s.value("UiLanguage").toString() != currentText)) { (!useSystemLang && currentText != prefs.locale.language)) {
QMessageBox::warning(this, tr("Restart required"), QMessageBox::warning(this, tr("Restart required"),
tr("To correctly load a new language you must restart Subsurface.")); tr("To correctly load a new language you must restart Subsurface."));
} }
s.setValue("UiLanguage", currentText); lang->setLanguage(currentText);
s.setValue("UseSystemLanguage", ui->languageSystemDefault->isChecked()); lang->setUseSystemLanguage(ui->languageSystemDefault->isChecked());
s.setValue("time_format_override", !ui->timeFormatSystemDefault->isChecked()); lang->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked());
s.setValue("date_format_override", !ui->dateFormatSystemDefault->isChecked()); lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked());
if (!ui->timeFormatSystemDefault->isChecked()) lang->setTimeFormat(ui->timeFormatEntry->text());
s.setValue("time_format", ui->timeFormatEntry->text()); lang->setDateFormat(ui->dateFormatEntry->text());
if (!ui->dateFormatSystemDefault->isChecked()) { lang->setDateFormatShort(ui->shortDateFormatEntry->text());
s.setValue("date_format", ui->dateFormatEntry->text());
s.setValue("date_format_short", ui->shortDateFormatEntry->text());
}
s.endGroup();
uiLanguage(NULL); uiLanguage(NULL);
} }