feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlproject: rename lastUsedLanguage -> currentLocale

Browse Source 
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>
This commit is contained in:
Tim Jenssen
2020-07-20 20:45:08 +02:00
parent 03307d8cb4
commit bde420f7b7
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
View File

@@ -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()

9
src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
View File

@@ -40,7 +40,8 @@ public:
explicit QmlMultiLanguageAspect(ProjectExplorer::Target *target);
~QmlMultiLanguageAspect() override;
QString lastUsedLanguage() const;
QString currentLocale() const;
void setCurrentLocale(const QString &locale);
Utils::FilePath databaseFilePath() const;
void toMap(QVariantMap &map) const final;
void fromMap(const QVariantMap &map) final;
@@ -49,13 +50,13 @@ public:
static QmlMultiLanguageAspect *current(ProjectExplorer::Project *project);
static QmlMultiLanguageAspect *current(ProjectExplorer::Target *target);
public slots:
void setLastUsedLanguage(const QString &language);
signals:
void currentLocaleChanged(const QString &locale);
private:
ProjectExplorer::Target *m_target = nullptr;
mutable Utils::FilePath m_databaseFilePath;
QString m_lastUsedLanguage;
QString m_currentLocale;
};
} // namespace QmlProjectManager

2
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -117,7 +117,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
if (m_multiLanguageAspect && m_multiLanguageAspect->value() && !m_multiLanguageAspect->databaseFilePath().isEmpty()) {
env.set("QT_MULTILANGUAGE_DATABASE", m_multiLanguageAspect->databaseFilePath().toString());
env.set("QT_MULTILANGUAGE_LANGUAGE", m_multiLanguageAspect->lastUsedLanguage());
env.set("QT_MULTILANGUAGE_LANGUAGE", m_multiLanguageAspect->currentLocale());
} else {
env.unset("QT_MULTILANGUAGE_DATABASE");
env.unset("QT_MULTILANGUAGE_LANGUAGE");