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

core: activate qPrefLanguage

Browse source 
remove Language from SettingsObjectWrapper and reference qPrefLanguage

update files using SettingsObjectWrapper/Language to use qPrefLanguage

this activated qPrefLanguage and removed the similar class from
SettingsObjectWrapper.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-08 16:34:17 +02:00 • committed by Dirk Hohndel
parent 63fa532b15
commit 72d87364c0
6 changed files with 46 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,15 +82,15 @@ void PreferencesLanguage::syncSettings()
currentLocale = m->data(languages.first(),Qt::UserRole).toString();
auto lang = SettingsObjectWrapper::instance()->language_settings;
lang->setLanguage(currentText);
lang->setLangLocale(currentLocale);
lang->setUseSystemLanguage(ui->languageSystemDefault->isChecked());
lang->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked());
lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked());
lang->setTimeFormat(ui->timeFormatEntry->currentText());
lang->setDateFormat(ui->dateFormatEntry->currentText());
lang->setDateFormatShort(ui->shortDateFormatEntry->text());
auto lang = qPrefLanguage::instance();
lang->set_language(currentText);
lang->set_lang_locale(currentLocale);
lang->set_use_system_language(ui->languageSystemDefault->isChecked());
lang->set_time_format_override(!ui->timeFormatSystemDefault->isChecked());
lang->set_date_format_override(!ui->dateFormatSystemDefault->isChecked());
lang->set_time_format(ui->timeFormatEntry->currentText());
lang->set_date_format(ui->dateFormatEntry->currentText());
lang->set_date_format_short(ui->shortDateFormatEntry->text());
uiLanguage(NULL);
QString qDateTimeWeb = tr("These will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString");