From bc95138f96aeb990d3882cd3b8cad5a97fb4f84d Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 10 Aug 2016 12:42:18 -0300 Subject: Settings update: Use internal prefs structure to read preferences Don't use a QSettings to read properties, it's really easy to mispell something. Just use the internal prefs structure. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/preferences/preferences_language.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index 264e2a1a5..a1af676fa 100644 --- a/desktop-widgets/preferences/preferences_language.cpp +++ b/desktop-widgets/preferences/preferences_language.cpp @@ -30,19 +30,16 @@ PreferencesLanguage::~PreferencesLanguage() void PreferencesLanguage::refreshSettings() { - QSettings s; - s.beginGroup("Language"); - ui->languageSystemDefault->setChecked(s.value("UseSystemLanguage", true).toBool()); - ui->timeFormatSystemDefault->setChecked(!s.value("time_format_override", false).toBool()); - ui->dateFormatSystemDefault->setChecked(!s.value("date_format_override", false).toBool()); - ui->timeFormatEntry->setText(s.value("time_format").toString()); - ui->dateFormatEntry->setText(s.value("date_format").toString()); - ui->shortDateFormatEntry->setText(s.value("date_format_short").toString()); + ui->languageSystemDefault->setChecked(prefs.locale.use_system_language); + ui->timeFormatSystemDefault->setChecked(!prefs.time_format_override); + ui->dateFormatSystemDefault->setChecked(!prefs.date_format_override); + ui->timeFormatEntry->setText(prefs.time_format); + ui->dateFormatEntry->setText(prefs.date_format); + ui->shortDateFormatEntry->setText(prefs.date_format_short); QAbstractItemModel *m = ui->languageDropdown->model(); - QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, s.value("UiLanguage").toString()); + QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, prefs.locale.language); if (languages.count()) ui->languageDropdown->setCurrentIndex(languages.first().row()); - s.endGroup(); } void PreferencesLanguage::syncSettings() -- cgit v1.2.3-70-g09d2