From 713dd26d6c19de0ddc9b8caa28775486bf13c156 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 17 Oct 2016 18:23:45 +0200 Subject: Added language testcase Also, added a missing method / property Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- core/subsurface-qt/SettingsObjectWrapper.cpp | 7 ++++++- core/subsurface-qt/SettingsObjectWrapper.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'core/subsurface-qt') diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 101e6650c..0e8c8ee67 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1908,6 +1908,11 @@ bool LanguageSettingsObjectWrapper::useSystemLanguage() const return prefs.locale.use_system_language; } +QString LanguageSettingsObjectWrapper::langLocale() const +{ + return prefs.locale.lang_locale; +} + void LanguageSettingsObjectWrapper::setUseSystemLanguage(bool value) { if (value == prefs.locale.use_system_language) @@ -1927,7 +1932,7 @@ void LanguageSettingsObjectWrapper::setLangLocale(const QString &value) s.beginGroup(group); s.setValue("UiLangLocale", value); prefs.locale.lang_locale = copy_string(qPrintable(value)); - // no need to emit languageChanged since we already do this for setLanguage + emit langLocaleChanged(value); } void LanguageSettingsObjectWrapper::setLanguage(const QString& value) diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index 64e6a5a8a..d9b8196d4 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -597,6 +597,7 @@ class LanguageSettingsObjectWrapper : public QObject { Q_PROPERTY(QString time_format READ timeFormat WRITE setTimeFormat NOTIFY timeFormatChanged) Q_PROPERTY(QString date_format READ dateFormat WRITE setDateFormat NOTIFY dateFormatChanged) Q_PROPERTY(QString date_format_short READ dateFormatShort WRITE setDateFormatShort NOTIFY dateFormatShortChanged) + Q_PROPERTY(QString lang_locale READ langLocale WRITE setLangLocale NOTIFY langLocaleChanged) Q_PROPERTY(bool time_format_override READ timeFormatOverride WRITE setTimeFormatOverride NOTIFY timeFormatOverrideChanged) Q_PROPERTY(bool date_format_override READ dateFormatOverride WRITE setDateFormatOverride NOTIFY dateFormatOverrideChanged) Q_PROPERTY(bool use_system_language READ useSystemLanguage WRITE setUseSystemLanguage NOTIFY useSystemLanguageChanged) @@ -604,6 +605,7 @@ class LanguageSettingsObjectWrapper : public QObject { public: LanguageSettingsObjectWrapper(QObject *parent); QString language() const; + QString langLocale() const; QString timeFormat() const; QString dateFormat() const; QString dateFormatShort() const; @@ -622,6 +624,7 @@ public slots: void setUseSystemLanguage (bool value); signals: void languageChanged(const QString& value); + void langLocaleChanged(const QString& value); void timeFormatChanged(const QString& value); void dateFormatChanged(const QString& value); void dateFormatShortChanged(const QString& value); -- cgit v1.2.3-70-g09d2