From e2cc3c4c8b8212659aaf80e4797d9ad537857cf4 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 5 Mar 2010 11:38:17 +0100
Subject: [PATCH] Fixed localization with qml run configuration
Reviewed-by: dt
---
.../qmlprojectmanager/qmlprojectrunconfiguration.cpp | 9 ++++++---
.../qmlprojectmanager/qmlprojectrunconfiguration.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index a8c21398b99..e69060fb69b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -161,7 +161,7 @@ QWidget *QmlProjectRunConfiguration::configurationWidget()
QDir projectDir = qmlTarget()->qmlProject()->projectDir();
QStringList files;
- files.append(tr("<Current File>"));
+ files.append(CURRENT_FILE);
int currentIndex = -1;
@@ -228,8 +228,11 @@ void QmlProjectRunConfiguration::onDebugServerAddressChanged()
void QmlProjectRunConfiguration::setMainScript(const QString &scriptFile)
{
m_scriptFile = scriptFile;
+ // replace with locale-agnostic string
+ if (m_scriptFile == CURRENT_FILE)
+ m_scriptFile = M_CURRENT_FILE;
- if (m_scriptFile.isEmpty() || m_scriptFile == CURRENT_FILE) {
+ if (m_scriptFile.isEmpty() || m_scriptFile == M_CURRENT_FILE) {
m_usingCurrentFile = true;
changeCurrentFile(Core::EditorManager::instance()->currentEditor());
} else {
@@ -275,7 +278,7 @@ bool QmlProjectRunConfiguration::fromMap(const QVariantMap &map)
{
m_qmlViewerCustomPath = map.value(QLatin1String(Constants::QML_VIEWER_KEY)).toString();
m_qmlViewerArgs = map.value(QLatin1String(Constants::QML_VIEWER_ARGUMENTS_KEY)).toString();
- m_scriptFile = map.value(QLatin1String(Constants::QML_MAINSCRIPT_KEY), CURRENT_FILE).toString();
+ m_scriptFile = map.value(QLatin1String(Constants::QML_MAINSCRIPT_KEY), M_CURRENT_FILE).toString();
m_debugServerPort = map.value(QLatin1String(Constants::QML_DEBUG_SERVER_PORT_KEY), Constants::QML_DEFAULT_DEBUG_SERVER_PORT).toUInt();
m_debugServerAddress = map.value(QLatin1String(Constants::QML_DEBUG_SERVER_ADDRESS_KEY), QLatin1String("127.0.0.1")).toString();
setMainScript(m_scriptFile);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index 76efd3147e3..5fcd2fc4a17 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -46,6 +46,7 @@ class QmlProjectRunConfigurationFactory;
}
const char * const CURRENT_FILE = QT_TRANSLATE_NOOP("QmlManager", "<Current File>");
+const char * const M_CURRENT_FILE = "CurrentFile";
class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration
{
--
GitLab