diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-07-20 20:45:08 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-07-23 09:14:31 +0000 |
commit | bde420f7b7373ad5602ce80383cfe4db6602aa6d (patch) | |
tree | fbc8e6bb4773559d2c6e2e2b904fa62fa658712d /src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp | |
parent | 03307d8cb4ecc15f4bf1ac5c7424b35ef7b1a7cf (diff) |
qmlproject: rename lastUsedLanguage -> currentLocale
removed the connection from plugin to
QmlMultiLanguageAspect::setCurrentLocale
but calling it directly in QmlPreviewPlugin::setLocale
Does not matter which method is called it will change the right
thing only once because it is checking if it already have the
set locale.
Change-Id: I6cb4b115788adc103481dcda45e3214a0cd73401
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index 623e51c66e9..1e5e88712eb 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -83,27 +83,24 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target) setDefaultValue(!databaseFilePath().isEmpty()); QVariantMap getDefaultValues; fromMap(getDefaultValues); - - if (auto previewPlugin = getPreviewPlugin()) - connect(previewPlugin, SIGNAL(localeChanged(QString)), this, SLOT(setLastUsedLanguage(QString))); } QmlMultiLanguageAspect::~QmlMultiLanguageAspect() { } -void QmlMultiLanguageAspect::setLastUsedLanguage(const QString &language) +void QmlMultiLanguageAspect::setCurrentLocale(const QString &locale) { + if (m_currentLocale == locale) + return; + m_currentLocale = locale; if (auto previewPlugin = getPreviewPlugin()) - previewPlugin->setProperty("locale", language); - if (m_lastUsedLanguage != language) { - m_lastUsedLanguage = language; - } + previewPlugin->setProperty("locale", locale); } -QString QmlMultiLanguageAspect::lastUsedLanguage() const +QString QmlMultiLanguageAspect::currentLocale() const { - return m_lastUsedLanguage; + return m_currentLocale; } Utils::FilePath QmlMultiLanguageAspect::databaseFilePath() const @@ -116,14 +113,14 @@ Utils::FilePath QmlMultiLanguageAspect::databaseFilePath() const void QmlMultiLanguageAspect::toMap(QVariantMap &map) const { BaseBoolAspect::toMap(map); - if (!m_lastUsedLanguage.isEmpty()) - map.insert(Constants::LAST_USED_LANGUAGE, m_lastUsedLanguage); + if (!m_currentLocale.isEmpty()) + map.insert(Constants::LAST_USED_LANGUAGE, m_currentLocale); } void QmlMultiLanguageAspect::fromMap(const QVariantMap &map) { BaseBoolAspect::fromMap(map); - setLastUsedLanguage(map.value(Constants::LAST_USED_LANGUAGE, "en").toString()); + setCurrentLocale(map.value(Constants::LAST_USED_LANGUAGE, "en").toString()); } QmlMultiLanguageAspect *QmlMultiLanguageAspect::current() |