app_version.h: Make IDE name configurable

Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

6 files changed, 31 insertions, 21 deletions

diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index cd2a3e1063..1f45b23a54 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -94,6 +94,7 @@
 #include "projecttree.h"
 #include "projectwelcomepage.h"
 
+#include <app/app_version.h>
 #include <extensionsystem/pluginspec.h>
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
@@ -2545,9 +2546,10 @@ bool ProjectExplorerPlugin::coreAboutToClose()
         QPushButton *closeAnyway = box.addButton(tr("Cancel Build && Close"), QMessageBox::AcceptRole);
         QPushButton *cancelClose = box.addButton(tr("Do Not Close"), QMessageBox::RejectRole);
         box.setDefaultButton(cancelClose);
-        box.setWindowTitle(tr("Close Qt Creator?"));
+        box.setWindowTitle(tr("Close %1?").arg(Core::Constants::IDE_DISPLAY_NAME));
         box.setText(tr("A project is currently being built."));
-        box.setInformativeText(tr("Do you want to cancel the build process and close Qt Creator anyway?"));
+        box.setInformativeText(tr("Do you want to cancel the build process and close %1 anyway?")
+                               .arg(Core::Constants::IDE_DISPLAY_NAME));
         box.exec();
         if (box.clickedButton() != closeAnyway)
             return false;
diff --git a/src/plugins/projectexplorer/sessiondialog.ui b/src/plugins/projectexplorer/sessiondialog.ui
index fd41eeacec..21f2195a5c 100644
--- a/src/plugins/projectexplorer/sessiondialog.ui
+++ b/src/plugins/projectexplorer/sessiondialog.ui
@@ -87,9 +87,6 @@
    </item>
    <item row="1" column="0">
     <widget class="QCheckBox" name="autoLoadCheckBox">
-     <property name="toolTip">
-      <string>Automatically restores the last session when Qt Creator is started.</string>
-     </property>
      <property name="text">
       <string>Restore last session on startup</string>
      </property>
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 49b24103f5..6b413d702c 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -35,6 +35,7 @@
 #include "kit.h"
 #include "kitmanager.h"
 
+#include <app/app_version.h>
 #include <coreplugin/icore.h>
 #include <utils/persistentsettings.h>
 #include <utils/hostosinfo.h>
@@ -837,11 +838,12 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data
         result.message = QApplication::translate("Utils::SettingsAccessor",
                                                  "<p>The versioned backup \"%1\" of the settings "
                                                  "file is used, because the non-versioned file was "
-                                                 "created by an incompatible version of Qt Creator.</p>"
+                                                 "created by an incompatible version of %2.</p>"
                                                  "<p>Settings changes made since the last time this "
-                                                 "version of Qt Creator was used are ignored, and "
+                                                 "version of %2 was used are ignored, and "
                                                  "changes made now will <b>not</b> be propagated to "
-                                                 "the newer version.</p>").arg(path.toUserOutput());
+                                                 "the newer version.</p>").arg(path.toUserOutput())
+                .arg(Core::Constants::IDE_DISPLAY_NAME);
         result.buttons.insert(QMessageBox::Ok, Continue);
     }
 
@@ -853,10 +855,11 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data
         result.title = differentEnvironmentMsg(project()->displayName());
         result.message = QApplication::translate("ProjectExplorer::EnvironmentIdAccessor",
                                                  "<p>No .user settings file created by this instance "
-                                                 "of Qt Creator was found.</p>"
+                                                 "of %1 was found.</p>"
                                                  "<p>Did you work with this project on another machine or "
                                                  "using a different settings path before?</p>"
-                                                 "<p>Do you still want to load the settings file \"%1\"?</p>")
+                                                 "<p>Do you still want to load the settings file \"%2\"?</p>")
+                .arg(Core::Constants::IDE_DISPLAY_NAME)
                 .arg(path.toUserOutput());
         result.defaultButton = QMessageBox::No;
         result.escapeButton = QMessageBox::No;
@@ -1093,8 +1096,9 @@ QVariantMap SettingsAccessor::readSharedSettings(QWidget *parent) const
                                             "Unsupported Shared Settings File"),
                     QApplication::translate("ProjectExplorer::SettingsAccessor",
                                             "The version of your .shared file is not "
-                                            "supported by Qt Creator. "
-                                            "Do you want to try loading it anyway?"),
+                                            "supported by %1. "
+                                            "Do you want to try loading it anyway?")
+                    .arg(Core::Constants::IDE_DISPLAY_NAME),
                     QMessageBox::Yes | QMessageBox::No,
                     parent);
         msgBox.setDefaultButton(QMessageBox::No);
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index de40db6c66..c089109fda 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -41,6 +41,8 @@
 #include "target.h"
 #include "targetsetuppage.h"
 
+#include <app/app_version.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/modemanager.h>
@@ -171,20 +173,22 @@ void TargetSetupPageWrapper::updateNoteText()
     bool showHint = false;
     if (!k) {
         text = tr("The project <b>%1</b> is not yet configured.<br/>"
-                  "Qt Creator cannot parse the project, because no kit "
+                  "%2 cannot parse the project, because no kit "
                   "has been set up.")
-                .arg(m_project->displayName());
+                .arg(m_project->displayName(), Core::Constants::IDE_DISPLAY_NAME);
         showHint = true;
     } else if (k->isValid()) {
         text = tr("The project <b>%1</b> is not yet configured.<br/>"
-                  "Qt Creator uses the kit <b>%2</b> to parse the project.")
+                  "%2 uses the kit <b>%3</b> to parse the project.")
                 .arg(m_project->displayName())
+                .arg(Core::Constants::IDE_DISPLAY_NAME)
                 .arg(k->displayName());
         showHint = false;
     } else {
         text = tr("The project <b>%1</b> is not yet configured.<br/>"
-                  "Qt Creator uses the <b>invalid</b> kit <b>%2</b> to parse the project.")
+                  "%2 uses the <b>invalid</b> kit <b>%3</b> to parse the project.")
                 .arg(m_project->displayName())
+                .arg(Core::Constants::IDE_DISPLAY_NAME)
                 .arg(k->displayName());
         showHint = true;
     }
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index 0944b8f5b1..c84beaf226 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -285,7 +285,7 @@ void TargetSetupPage::setProjectPath(const QString &path)
     if (!m_projectPath.isEmpty()) {
         QFileInfo fileInfo(QDir::cleanPath(path));
         QStringList subDirsList = fileInfo.absolutePath().split('/');
-        m_ui->headerLabel->setText(tr("Qt Creator can use the following kits for project <b>%1</b>:",
+        m_ui->headerLabel->setText(tr("The following kits can be used for project <b>%1</b>:",
                                       "%1: Project name").arg(subDirsList.last()));
     }
     m_ui->headerLabel->setVisible(!m_projectPath.isEmpty());
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index 9d6f4a3316..0b34cec14c 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -25,6 +25,7 @@
 
 #include "task.h"
 
+#include <app/app_version.h>
 #include <texteditor/textmark.h>
 #include <utils/utilsicons.h>
 #include <utils/qtcassert.h>
@@ -68,8 +69,9 @@ Task Task::compilerMissingTask()
 {
     return Task(Task::Error,
                 QCoreApplication::translate("ProjectExplorer::Task",
-                                            "Qt Creator needs a compiler set up to build. "
-                                            "Configure a compiler in the kit options."),
+                                            "%1 needs a compiler set up to build. "
+                                            "Configure a compiler in the kit options.")
+                .arg(Core::Constants::IDE_DISPLAY_NAME),
                 Utils::FileName(), -1,
                 Constants::TASK_CATEGORY_BUILDSYSTEM);
 }
@@ -78,8 +80,9 @@ Task Task::buildConfigurationMissingTask()
 {
     return Task(Task::Error,
                 QCoreApplication::translate("ProjectExplorer::Task",
-                                            "Qt Creator needs a build configuration set up to build. "
-                                            "Configure a build configuration in the project settings."),
+                                            "%1 needs a build configuration set up to build. "
+                                            "Configure a build configuration in the project settings.")
+                .arg(Core::Constants::IDE_DISPLAY_NAME),
                 Utils::FileName(), -1,
                 Constants::TASK_CATEGORY_BUILDSYSTEM);
 }