diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-08-29 11:48:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-09-05 10:19:48 +0000 |
| commit | 4ef01c961e20fa0c2d4623f28f469916ec4e1abd (patch) | |
| tree | 1bbe75e64a1cd1fdf51a05c1af1d145670c91452 /src/plugins | |
| parent | ca959d8063a5beb08af6737a367c8befb688401c (diff) | |
| download | qt-creator-4ef01c961e20fa0c2d4623f28f469916ec4e1abd.tar.gz | |
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>
Diffstat (limited to 'src/plugins')
49 files changed, 185 insertions, 109 deletions
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index c01c7d0ecc..8264415a12 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -27,6 +27,8 @@ #include "androidconstants.h" #include "androidconfigurations.h" +#include <app/app_version.h> + #include <utils/detailswidget.h> #include <utils/utilsicons.h> @@ -91,8 +93,9 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent) auto layout = new QGridLayout(mainWidget); layout->setMargin(0); auto label = new QLabel; - label->setText(tr("Qt Creator needs additional settings to enable Android support." - " You can configure those settings in the Options dialog.")); + label->setText(tr("%1 needs additional settings to enable Android support." + " You can configure those settings in the Options dialog.") + .arg(Core::Constants::IDE_DISPLAY_NAME)); label->setWordWrap(true); layout->addWidget(label, 0, 0, 1, 2); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp index 82bc2e0162..37a8d6fd92 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp @@ -81,7 +81,7 @@ BuildPathPage::BuildPathPage(AutotoolsOpenProjectWizard *w) : QWizardPage(w), QLabel *label = new QLabel(this); label->setWordWrap(true); label->setText(tr("Please enter the directory in which you want to build your project. " - "Qt Creator recommends to not use the source directory for building. " + "It is not recommended to use the source directory for building. " "This ensures that the source directory remains clean and enables multiple builds " "with different settings.")); fl->addWidget(label); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 9a456cb8ce..d20e557d5e 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -194,8 +194,8 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps) CMakeTool *tool = CMakeKitInformation::cmakeTool(target()->kit()); if (!tool || !tool->isValid()) { emit addTask(Task(Task::Error, - tr("Qt Creator needs a CMake Tool set up to build. " - "Configure a CMake Tool in the kit options."), + tr("A CMake tool must be set up for building. " + "Configure a CMake tool in the kit options."), Utils::FileName(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); canInit = false; diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 9e5962d3ae..4509afe584 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -29,6 +29,7 @@ #include "cmaketoolmanager.h" #include "cmaketool.h" +#include <app/app_version.h> #include <projectexplorer/task.h> #include <projectexplorer/toolchain.h> #include <projectexplorer/kit.h> @@ -383,7 +384,8 @@ QList<Task> CMakeGeneratorKitInformation::validate(const Kit *k) const if (!tool->hasServerMode() && info.extraGenerator != "CodeBlocks") { result << Task(Task::Warning, tr("The selected CMake binary has no server-mode and the CMake " "generator does not generate a CodeBlocks file. " - "Qt Creator will not be able to parse CMake projects."), + "%1 will not be able to parse CMake projects.") + .arg(Core::Constants::IDE_DISPLAY_NAME), Utils::FileName(), -1, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); } } diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp index 4d3a9f9670..420456ccf9 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.cpp +++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp @@ -157,7 +157,7 @@ void ServerModeReader::resetData() void ServerModeReader::parse(bool force) { emit configurationStarted(); - Core::MessageManager::write(tr("Starting to parse CMake project for Qt Creator.")); + Core::MessageManager::write(tr("Starting to parse CMake project.")); QTC_ASSERT(m_cmakeServer, return); QVariantMap extra; diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index 5eba33f8bd..d6bbd7f2cb 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -26,11 +26,10 @@ #include "commandsfile.h" #include "command_p.h" #include <coreplugin/dialogs/shortcutsettings.h> +#include <coreplugin/icore.h> #include <app/app_version.h> - #include <utils/qtcassert.h> - #include <utils/fileutils.h> #include <QKeySequence> @@ -137,8 +136,8 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items) w.setAutoFormattingIndent(1); // Historical, used to be QDom. w.writeStartDocument(); w.writeDTD(QLatin1String("<!DOCTYPE KeyboardMappingScheme>")); - w.writeComment(QString::fromLatin1(" Written by Qt Creator %1, %2. "). - arg(QLatin1String(Constants::IDE_VERSION_LONG), + w.writeComment(QString::fromLatin1(" Written by %1, %2. "). + arg(ICore::versionString(), QDateTime::currentDateTime().toString(Qt::ISODate))); w.writeStartElement(ctx.mappingElement); foreach (const ShortcutItem *item, items) { diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 0a7e29c536..e21237b5a9 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -44,6 +44,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/fileutils.h> +#include <app/app_version.h> #include <extensionsystem/pluginerroroverview.h> #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> @@ -186,15 +187,22 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) []() { return DocumentManager::projectsDirectory(); }); expander->registerVariable("Config:LastFileDialogDirectory", tr("The directory last visited in a file dialog."), []() { return DocumentManager::fileDialogLastVisitedDirectory(); }); - expander->registerVariable("HostOs:isWindows", tr("Is Qt Creator running on Windows?"), + expander->registerVariable("HostOs:isWindows", + tr("Is %1 running on Windows?").arg(Constants::IDE_DISPLAY_NAME), []() { return QVariant(Utils::HostOsInfo::isWindowsHost()).toString(); }); - expander->registerVariable("HostOs:isOSX", tr("Is Qt Creator running on OS X?"), + expander->registerVariable("HostOs:isOSX", + tr("Is %1 running on OS X?").arg(Constants::IDE_DISPLAY_NAME), []() { return QVariant(Utils::HostOsInfo::isMacHost()).toString(); }); - expander->registerVariable("HostOs:isLinux", tr("Is Qt Creator running on Linux?"), + expander->registerVariable("HostOs:isLinux", + tr("Is %1 running on Linux?").arg(Constants::IDE_DISPLAY_NAME), []() { return QVariant(Utils::HostOsInfo::isLinuxHost()).toString(); }); - expander->registerVariable("HostOs:isUnix", tr("Is Qt Creator running on any unix-based platform?"), + expander->registerVariable("HostOs:isUnix", + tr("Is %1 running on any unix-based platform?") + .arg(Constants::IDE_DISPLAY_NAME), []() { return QVariant(Utils::HostOsInfo::isAnyUnixHost()).toString(); }); - expander->registerVariable("IDE:ResourcePath", tr("The directory where Qt Creator finds its pre-installed resources."), + expander->registerVariable("IDE:ResourcePath", + tr("The directory where %1 finds its pre-installed resources.") + .arg(Constants::IDE_DISPLAY_NAME), []() { return ICore::resourcePath(); }); expander->registerPrefix("CurrentDate:", tr("The current date (QDate formatstring)."), [](const QString &fmt) { return QDate::currentDate().toString(fmt); }); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 9b2bd61748..8f661064ea 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -34,6 +34,8 @@ #include "documentmodel_p.h" #include "ieditor.h" +#include <app/app_version.h> + #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> @@ -1789,7 +1791,7 @@ void EditorManagerPrivate::updateWindowTitleForDocument(IDocument *document, QWi if (!windowTitle.isEmpty()) windowTitle.append(dashSep); - windowTitle.append(tr("Qt Creator")); + windowTitle.append(Core::Constants::IDE_DISPLAY_NAME); window->window()->setWindowTitle(windowTitle); window->window()->setWindowFilePath(filePath); diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 9903d58125..58abcae5b1 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -26,6 +26,7 @@ #include "externaltool.h" #include "externaltoolmanager.h" +#include "icore.h" #include "idocument.h" #include "messagemanager.h" #include "documentmanager.h" @@ -480,8 +481,8 @@ bool ExternalTool::save(QString *errorMessage) const QXmlStreamWriter out(saver.file()); out.setAutoFormatting(true); out.writeStartDocument(QLatin1String("1.0")); - out.writeComment(QString::fromLatin1("Written on %1 by Qt Creator %2") - .arg(QDateTime::currentDateTime().toString(), QLatin1String(Constants::IDE_VERSION_LONG))); + out.writeComment(QString::fromLatin1("Written on %1 by %2") + .arg(QDateTime::currentDateTime().toString(), ICore::versionString())); out.writeStartElement(QLatin1String(kExternalTool)); out.writeAttribute(QLatin1String(kId), m_id); out.writeTextElement(QLatin1String(kDescription), m_description); diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index fcf8d07f96..2a0036616e 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -164,7 +164,7 @@ void GeneralSettings::setLanguage(const QString &locale) QSettings *settings = ICore::settings(); if (settings->value(QLatin1String("General/OverrideLanguage")).toString() != locale) QMessageBox::information(ICore::mainWindow(), tr("Restart Required"), - tr("The language change will take effect after a restart of Qt Creator.")); + tr("The language change will take effect after restart.")); if (locale.isEmpty()) settings->remove(QLatin1String("General/OverrideLanguage")); diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index e5a1bc8a5f..ab2a7f9770 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -461,8 +461,9 @@ QString ICore::versionString() QString ideVersionDescription; if (QLatin1String(Constants::IDE_VERSION_LONG) != QLatin1String(Constants::IDE_VERSION_DISPLAY)) ideVersionDescription = tr(" (%1)").arg(QLatin1String(Constants::IDE_VERSION_LONG)); - return tr("Qt Creator %1%2").arg(QLatin1String(Constants::IDE_VERSION_DISPLAY), - ideVersionDescription); + return tr("%1 %2%3").arg(QLatin1String(Constants::IDE_DISPLAY_NAME), + QLatin1String(Constants::IDE_VERSION_DISPLAY), + ideVersionDescription); } QString ICore::buildCompatibilityString() diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 9010fd8da3..5b65b2b97d 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -109,7 +109,7 @@ MainWindow::MainWindow() : m_coreImpl(new ICore(this)), m_lowPrioAdditionalContexts(Constants::C_GLOBAL), m_settingsDatabase(new SettingsDatabase(QFileInfo(PluginManager::settings()->fileName()).path(), - QLatin1String("QtCreator"), + QLatin1String(Constants::IDE_CASED_ID), this)), m_progressManager(new ProgressManagerPrivate), m_jsExpander(new JsExpander), @@ -130,10 +130,10 @@ MainWindow::MainWindow() : HistoryCompleter::setSettings(PluginManager::settings()); - setWindowTitle(tr("Qt Creator")); + setWindowTitle(Constants::IDE_DISPLAY_NAME); if (HostOsInfo::isLinuxHost()) QApplication::setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); - QCoreApplication::setApplicationName(QLatin1String("QtCreator")); + QCoreApplication::setApplicationName(QLatin1String(Constants::IDE_CASED_ID)); QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); QString baseName = QApplication::style()->objectName(); @@ -741,9 +741,9 @@ void MainWindow::registerDefaultActions() // About IDE Action icon = QIcon::fromTheme(QLatin1String("help-about")); if (HostOsInfo::isMacHost()) - tmpaction = new QAction(icon, tr("About &Qt Creator"), this); // it's convention not to add dots to the about menu + tmpaction = new QAction(icon, tr("About &%1").arg(Constants::IDE_DISPLAY_NAME), this); // it's convention not to add dots to the about menu else - tmpaction = new QAction(icon, tr("About &Qt Creator..."), this); + tmpaction = new QAction(icon, tr("About &%1...").arg(Constants::IDE_DISPLAY_NAME), this); tmpaction->setMenuRole(QAction::AboutRole); cmd = ActionManager::registerAction(tmpaction, Constants::ABOUT_QTCREATOR); mhelp->addAction(cmd, Constants::G_HELP_ABOUT); diff --git a/src/plugins/coreplugin/mimetypemagicdialog.ui b/src/plugins/coreplugin/mimetypemagicdialog.ui index f638354881..6dfcb1cacc 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.ui +++ b/src/plugins/coreplugin/mimetypemagicdialog.ui @@ -136,7 +136,7 @@ <bool>false</bool> </property> <property name="text"> - <string><i>Note: Wide range values might impact Qt Creator's performance when opening files.</i></string> + <string><html><head/><body><p><span style=" font-style:italic;">Note: Wide range values might impact performance when opening files.</span></p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 8573ae5f87..44b3413107 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -31,6 +31,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/editormanager/iexternaleditor.h> + #include <utils/algorithm.h> #include <utils/headerviewstretcher.h> #include <utils/mimetypes/mimedatabase.h> @@ -400,7 +401,7 @@ void MimeTypeSettingsPrivate::resetMimeTypes() m_userModifiedMimeTypes.clear(); // settings file will be removed with next settings-save QMessageBox::information(ICore::dialogParent(), tr("Reset MIME Types"), - tr("Changes will take effect after Qt Creator restart.")); + tr("Changes will take effect after restart.")); } void MimeTypeSettingsPrivate::setFilterPattern(const QString &pattern) diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 74d097e728..69f21929f8 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -31,6 +31,7 @@ #include "patchtool.h" #include "vcsmanager.h" +#include <app/app_version.h> #include <utils/checkablemessagebox.h> #include <utils/consoleprocess.h> #include <utils/environment.h> @@ -97,6 +98,11 @@ QWidget *SystemSettings::widget() m_page->patchChooser->setHistoryCompleter(QLatin1String("General.PatchCommand.History")); m_page->patchChooser->setPath(PatchTool::patchCommand()); m_page->autoSaveCheckBox->setChecked(EditorManagerPrivate::autoSaveEnabled()); + m_page->autoSaveCheckBox->setToolTip(tr("Automatically creates temporary copies of " + "modified files. If %1 is restarted after " + "a crash or power failure, it asks whether to " + "recover the auto-saved content.") + .arg(Constants::IDE_DISPLAY_NAME)); m_page->autoSaveInterval->setValue(EditorManagerPrivate::autoSaveInterval()); m_page->autoSuspendCheckBox->setChecked(EditorManagerPrivate::autoSuspendEnabled()); m_page->autoSuspendMinDocumentCount->setValue(EditorManagerPrivate::autoSuspendMinDocumentCount()); diff --git a/src/plugins/coreplugin/systemsettings.ui b/src/plugins/coreplugin/systemsettings.ui index b2928f9d47..674524e047 100644 --- a/src/plugins/coreplugin/systemsettings.ui +++ b/src/plugins/coreplugin/systemsettings.ui @@ -86,9 +86,6 @@ <layout class="QHBoxLayout" name="horizontalLayout_5"> <item> <widget class="QCheckBox" name="autoSaveCheckBox"> - <property name="toolTip"> - <string>Automatically creates temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content.</string> - </property> <property name="text"> <string>Auto-save modified files</string> </property> @@ -309,7 +306,7 @@ <item> <widget class="QLabel" name="autoSuspendLabel"> <property name="toolTip"> - <string>Minimum number of open documents that should be kept in memory. Increasing this number will lead to greater resource usage of Qt Creator when not manually closing documents.</string> + <string>Minimum number of open documents that should be kept in memory. Increasing this number will lead to greater resource usage when not manually closing documents.</string> </property> <property name="text"> <string>Files to keep open:</string> diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp index ff62406dba..18f0a4040b 100644 --- a/src/plugins/coreplugin/themechooser.cpp +++ b/src/plugins/coreplugin/themechooser.cpp @@ -179,7 +179,7 @@ void ThemeChooser::apply() const QString currentThemeId = ThemeEntry::themeSetting().toString(); if (currentThemeId != themeId) { QMessageBox::information(ICore::mainWindow(), tr("Restart Required"), - tr("The theme change will take effect after a restart of Qt Creator.")); + tr("The theme change will take effect after restart.")); // save filename of selected theme in global config settings->setValue(QLatin1String(Constants::SETTINGS_THEME), themeId); diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index ded2e13dae..06962971ea 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -51,7 +51,7 @@ VersionDialog::VersionDialog(QWidget *parent) if (Utils::HostOsInfo::isLinuxHost()) setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); - setWindowTitle(tr("About Qt Creator")); + setWindowTitle(tr("About %1").arg(Core::Constants::IDE_DISPLAY_NAME)); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); QGridLayout *layout = new QGridLayout(this); layout->setSizeConstraint(QLayout::SetFixedSize); diff --git a/src/plugins/coreplugin/windowsupport.cpp b/src/plugins/coreplugin/windowsupport.cpp index 4af9d7343b..7d9c3ef6ad 100644 --- a/src/plugins/coreplugin/windowsupport.cpp +++ b/src/plugins/coreplugin/windowsupport.cpp @@ -31,6 +31,7 @@ #include "coreconstants.h" #include "icore.h" +#include <app/app_version.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> @@ -191,7 +192,7 @@ void WindowList::updateTitle(QWidget *window) QTC_ASSERT(index >= 0, return); QTC_ASSERT(index < m_windowActions.size(), return); QString title = window->windowTitle(); - if (title.endsWith(QStringLiteral("- Qt Creator"))) + if (title.endsWith(QStringLiteral("- ") + Constants::IDE_DISPLAY_NAME)) title.chop(12); m_windowActions.at(index)->setText(title.trimmed()); } diff --git a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp b/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp index b875465344..e2135a76eb 100644 --- a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp +++ b/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp @@ -27,6 +27,8 @@ #include "cppmodelmanagersupportinternal.h" #include "builtineditordocumentprocessor.h" +#include <app/app_version.h> + #include <QCoreApplication> using namespace CppTools; @@ -40,7 +42,7 @@ QString ModelManagerSupportProviderInternal::id() const QString ModelManagerSupportProviderInternal::displayName() const { return QCoreApplication::translate("ModelManagerSupportInternal::displayName", - "Qt Creator Built-in"); + "%1 Built-in").arg(Core::Constants::IDE_DISPLAY_NAME); } ModelManagerSupport::Ptr ModelManagerSupportProviderInternal::createModelManagerSupport() diff --git a/src/plugins/debugger/cdb/cdboptionspagewidget.ui b/src/plugins/debugger/cdb/cdboptionspagewidget.ui index 4b80ff1d26..38f434688c 100644 --- a/src/plugins/debugger/cdb/cdboptionspagewidget.ui +++ b/src/plugins/debugger/cdb/cdboptionspagewidget.ui @@ -44,7 +44,7 @@ <item row="1" column="0" colspan="2"> <widget class="QCheckBox" name="consoleCheckBox"> <property name="toolTip"> - <string><html><head/><body><p>Uses CDB's native console instead of Qt Creator's console for console applications. The native console does not prompt on application exit. It is suitable for diagnosing cases in which the application does not start up properly in Qt Creator's console and the subsequent attach fails.</p></body></html></string> + <string><html><head/><body><p>Uses CDB's native console for console applications. This overrides the setting in Environment > System. The native console does not prompt on application exit. It is suitable for diagnosing cases in which the application does not start up properly in the configured console and the subsequent attach fails.</p></body></html></string> </property> <property name="text"> <string>Use CDB &console</string> diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 2f510a4184..94412301fc 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -32,6 +32,7 @@ #include <coreplugin/icore.h> #include <coreplugin/variablechooser.h> +#include <app/app_version.h> #include <utils/hostosinfo.h> #include <utils/pathchooser.h> #include <utils/qtcassert.h> @@ -129,7 +130,9 @@ QWidget *CommonOptionsPage::widget() checkBoxSwitchModeOnExit->setText(tr("Switch to previous mode on debugger exit")); auto checkBoxBringToForegroundOnInterrrupt = new QCheckBox(behaviorBox); - checkBoxBringToForegroundOnInterrrupt->setText(tr("Bring Qt Creator to foreground when application interrupts")); + checkBoxBringToForegroundOnInterrrupt->setText( + tr("Bring %1 to foreground when application interrupts") + .arg(Core::Constants::IDE_DISPLAY_NAME)); auto checkBoxShowQmlObjectTree = new QCheckBox(behaviorBox); checkBoxShowQmlObjectTree->setToolTip(tr("Shows QML object tree in Locals and Expressions when connected and not stepping.")); @@ -140,8 +143,12 @@ QWidget *CommonOptionsPage::widget() checkBoxBreakpointsFullPath->setText(tr("Set breakpoints using a full absolute path")); auto checkBoxRegisterForPostMortem = new QCheckBox(behaviorBox); - checkBoxRegisterForPostMortem->setToolTip(tr("Registers Qt Creator for debugging crashed applications.")); - checkBoxRegisterForPostMortem->setText(tr("Use Qt Creator for post-mortem debugging")); + checkBoxRegisterForPostMortem->setToolTip( + tr("Registers %1 for debugging crashed applications.") + .arg(Core::Constants::IDE_DISPLAY_NAME)); + checkBoxRegisterForPostMortem->setText( + tr("Use %1 for post-mortem debugging") + .arg(Core::Constants::IDE_DISPLAY_NAME)); auto checkBoxWarnOnReleaseBuilds = new QCheckBox(behaviorBox); checkBoxWarnOnReleaseBuilds->setText(tr("Warn when debugging \"Release\" builds")); @@ -314,7 +321,7 @@ QWidget *LocalsAndExpressionsOptionsPage::widget() auto groupBoxCustomDumperCommands = new QGroupBox(debuggingHelperGroupBox); groupBoxCustomDumperCommands->setTitle(tr("Debugging Helper Customization")); groupBoxCustomDumperCommands->setToolTip(tr( - "<html><head/><body><p>Python commands entered here will be executed after Qt Creator's " + "<html><head/><body><p>Python commands entered here will be executed after built-in " "debugging helpers have been loaded and fully initialized. You can load additional " "debugging helpers or modify existing ones here.</p></body></html>")); diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index f9017a7f41..311b1fcf5a 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -34,6 +34,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runnables.h> #include <projectexplorer/toolchain.h> + +#include <app/app_version.h> #include <utils/pathchooser.h> #include <utils/fancylineedit.h> #include <utils/qtcassert.h> @@ -264,7 +266,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent) d->serverStartScriptPathChooser->setPromptDialogTitle(tr("Select Server Start Script")); d->serverStartScriptPathChooser->setToolTip(tr( "This option can be used to point to a script that will be used " - "to start a debug server. If the field is empty, Qt Creator's " + "to start a debug server. If the field is empty, " "default methods to set up debug servers will be used.")); d->serverStartScriptLabel = new QLabel(tr("&Server start script:"), this); d->serverStartScriptLabel->setBuddy(d->serverStartScriptPathChooser); @@ -558,15 +560,16 @@ static QString cdbRemoteHelp() const QString ext32 = QDir::toNativeSeparators(CdbEngine::extensionLibraryName(false)); const QString ext64 = QDir::toNativeSeparators(CdbEngine::extensionLibraryName(true)); return StartRemoteCdbDialog::tr( - "<html><body><p>The remote CDB needs to load the matching Qt Creator CDB extension " - "(<code>%1</code> or <code>%2</code>, respectively).</p><p>Copy it onto the remote machine and set the " - "environment variable <code>%3</code> to point to its folder.</p><p>" - "Launch the remote CDB as <code>%4 <executable></code> " + "<html><body><p>The remote CDB needs to load the matching %1 CDB extension " + "(<code>%2</code> or <code>%3</code>, respectively).</p><p>Copy it onto the remote machine and set the " + "environment variable <code>%4</code> to point to its folder.</p><p>" + "Launch the remote CDB as <code>%5 <executable></code> " "to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>" - "<pre>%5</pre></body></html>"). - arg(ext32, ext64, QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), - QLatin1String("cdb.exe -server tcp:port=1234"), - QLatin1String(cdbConnectionSyntax)); + "<pre>%6</pre></body></html>") + .arg(Core::Constants::IDE_DISPLAY_NAME, + ext32, ext64, QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), + QLatin1String("cdb.exe -server tcp:port=1234"), + QLatin1String(cdbConnectionSyntax)); } StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 091acae934..80cad0e301 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -67,6 +67,8 @@ #include "analyzer/analyzerconstants.h" #include "analyzer/analyzermanager.h" +#include <app/app_version.h> + #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> @@ -2089,9 +2091,11 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit, const Abi tcAbi = ToolChainKitInformation::targetAbi(kit); const bool isWindows = (tcAbi.os() == Abi::WindowsOS); if (isWindows && isWinProcessBeingDebugged(process.pid)) { - AsynchronousMessageBox::warning(tr("Process Already Under Debugger Control"), - tr("The process %1 is already under the control of a debugger.\n" - "Qt Creator cannot attach to it.").arg(process.pid)); + AsynchronousMessageBox::warning( + tr("Process Already Under Debugger Control"), + tr("The process %1 is already under the control of a debugger.\n" + "%2 cannot attach to it.").arg(process.pid) + .arg(Core::Constants::IDE_DISPLAY_NAME)); return 0; } diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 313cecefd7..f1a5e17d35 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -215,7 +215,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget(QWidget *parent "at which the modules where built, for example, while " "doing remote debugging.</p>" "<p>If source is specified as a regular expression by starting it with an " - "open parenthesis, Qt Creator matches the paths in the ELF with the " + "open parenthesis, the paths in the ELF are matched with the " "regular expression to automatically determine the source path.</p>" "<p>Example: <b>(/home/.*/Project)/KnownSubDir -> D:\\Project</b> will " "substitute ELF built by any user to your local project directory.</p>")); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 53c00cbfd4..91a5fea8c5 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -66,6 +66,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/taskhub.h> +#include <app/app_version.h> #include <utils/algorithm.h> #include <utils/hostosinfo.h> #include <utils/macroexpander.h> @@ -1636,8 +1637,9 @@ void GdbEngine::handlePythonSetup(const DebuggerResponse &response) QString out = "<p>" + tr("The selected build of GDB supports Python scripting, " "but the used version %1.%2 is not sufficient for " - "Qt Creator. Supported versions are Python 2.7 and 3.x.") - .arg(pythonMajor).arg(pythonMinor); + "%3. Supported versions are Python 2.7 and 3.x.") + .arg(pythonMajor).arg(pythonMinor) + .arg(Core::Constants::IDE_DISPLAY_NAME); showStatusMessage(out); AsynchronousMessageBox::critical(tr("Execution Error"), out); } @@ -1649,7 +1651,8 @@ void GdbEngine::handlePythonSetup(const DebuggerResponse &response) QString msg = response.data["msg"].data(); if (msg.contains("Python scripting is not supported in this copy of GDB.")) { QString out1 = "The selected build of GDB does not support Python scripting."; - QString out2 = "It cannot be used in Qt Creator."; + QString out2 = QStringLiteral("It cannot be used in %1.") + .arg(Core::Constants::IDE_DISPLAY_NAME); showStatusMessage(out1 + ' ' + out2); AsynchronousMessageBox::critical(tr("Execution Error"), out1 + "<br>" + out2); } diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index cecf8ccaea..822e7d8b8c 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -86,11 +86,11 @@ GdbOptionsPageWidget::GdbOptionsPageWidget() auto labelGdbWatchdogTimeout = new QLabel(groupBoxGeneral); labelGdbWatchdogTimeout->setText(GdbOptionsPage::tr("GDB timeout:")); labelGdbWatchdogTimeout->setToolTip(GdbOptionsPage::tr( - "The number of seconds Qt Creator will wait before it terminates\n" - "a non-responsive GDB process. The default value of 20 seconds should\n" - "be sufficient for most applications, but there are situations when\n" - "loading big libraries or listing source files takes much longer than\n" - "that on slow machines. In this case, the value should be increased.")); + "The number of seconds before a non-responsive GDB process is terminated.\n" + "The default value of 20 seconds should be sufficient for most\n" + "applications, but there are situations when loading big libraries or\n" + "listing source files takes much longer than that on slow machines.\n" + "In this case, the value should be increased.")); auto spinBoxGdbWatchdogTimeout = new QSpinBox(groupBoxGeneral); spinBoxGdbWatchdogTimeout->setToolTip(labelGdbWatchdogTimeout->toolTip()); diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index 22c2e73ed9..98dc0f9143 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -43,6 +43,9 @@ #include <QToolButton> #include <aggregation/aggregate.h> + +#include <app/app_version.h> + #include <coreplugin/findplaceholder.h> #include <coreplugin/minisplitter.h> #include <coreplugin/find/basetextfind.h> @@ -432,12 +435,13 @@ LogWindow::LogWindow(QWidget *parent) showOutput(LogWarning, tr("Note: This log contains possibly confidential information about your machine, " "environment variables, in-memory data of the processes you are debugging, and more. " - "It is never transferred over the internet by Qt Creator, and only stored " + "It is never transferred over the internet by %1, and only stored " "to disk if you manually use the respective option from the context menu, or through " - "mechanisms that are not under Qt Creator's control, for instance in swap files.\n" + "mechanisms that are not under the control of %1, for instance in swap files.\n" "You may be asked to share the contents of this log when reporting bugs related " "to debugger operation. In this case, make sure your submission does not " - "contain data you do not want to or you are not allowed to share.\n\n")); + "contain data you do not want to or you are not allowed to share.\n\n") + .arg(Core::Constants::IDE_DISPLAY_NAME)); } void LogWindow::executeLine() diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index e6d5d3cc03..9ff977fc62 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -57,6 +57,7 @@ #include <texteditor/textdocument.h> #include <texteditor/texteditor.h> +#include <app/app_version.h> #include <utils/treemodel.h> #include <utils/basetreeview.h> #include <utils/qtcassert.h> @@ -422,7 +423,7 @@ void QmlEngine::connectionStartupFailed() QMessageBox *infoBox = new QMessageBox(ICore::mainWindow()); infoBox->setIcon(QMessageBox::Critical); - infoBox->setWindowTitle(tr("Qt Creator")); + infoBox->setWindowTitle(Core::Constants::IDE_DISPLAY_NAME); infoBox->setText(tr("Could not connect to the in-process QML debugger." "\nDo you want to retry?")); infoBox->setStandardButtons(QMessageBox::Retry | QMessageBox::Cancel | @@ -443,7 +444,7 @@ void QmlEngine::appStartupFailed(const QString &errorMessage) if (isMasterEngine()) { QMessageBox *infoBox = new QMessageBox(ICore::mainWindow()); infoBox->setIcon(QMessageBox::Critical); - infoBox->setWindowTitle(tr("Qt Creator")); + infoBox->setWindowTitle(Core::Constants::IDE_DISPLAY_NAME); infoBox->setText(error); infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help); infoBox->setDefaultButton(QMessageBox::Ok); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 32aaa3bbc0..5947ac4cca 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -46,6 +46,7 @@ #include <texteditor/syntaxhighlighter.h> +#include <app/app_version.h> #include <utils/algorithm.h> #include <utils/basetreeview.h> #include <utils/checkablemessagebox.h> @@ -271,7 +272,7 @@ public: setTabsClosable(true); connect(this, &QTabWidget::tabCloseRequested, this, &SeparatedView::closeTab); setWindowFlags(windowFlags() | Qt::Window); - setWindowTitle(WatchHandler::tr("Debugger - Qt Creator")); + setWindowTitle(WatchHandler::tr("Debugger - %1").arg(Core::Constants::IDE_DISPLAY_NAME)); QVariant geometry = sessionValue("DebuggerSeparateWidgetGeometry"); if (geometry.isValid()) { diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui index 8db93d585f..db3cb7df45 100644 --- a/src/plugins/fakevim/fakevimoptions.ui +++ b/src/plugins/fakevim/fakevimoptions.ui @@ -92,7 +92,7 @@ <item row="6" column="1"> <widget class="QCheckBox" name="checkBoxPassControlKey"> <property name="toolTip"> - <string>Passes key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim.</string> + <string>Does not interpret key sequences like Ctrl-S in FakeVim but handles them as regular shortcuts. This gives easier access to core functionality at the price of losing some features of FakeVim.</string> </property> <property name="text"> <string>Pass control key</string> @@ -123,7 +123,7 @@ <item row="7" column="0"> <widget class="QCheckBox" name="checkBoxPassKeys"> <property name="toolTip"> - <string>Lets Qt Creator handle some key presses in insert mode so that code can be properly completed and expanded.</string> + <string>Does not interpret some key presses in insert mode so that code can be properly completed and expanded.</string> </property> <property name="text"> <string>Pass keys in insert mode</string> diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index c91abba26d..f38be2003b 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -31,6 +31,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/customwizard/customwizard.h> +#include <app/app_version.h> #include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/filewizardpage.h> @@ -115,7 +116,8 @@ GenericProjectWizard::GenericProjectWizard() setDisplayName(tr("Import Existing Project")); setId("Z.Makefile"); setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools. " - "This allows you to use Qt Creator as a code editor.")); + "This allows you to use %1 as a code editor.") + .arg(Core::Constants::IDE_DISPLAY_NAME)); setCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY)); setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY)); setFlags(Core::IWizardFactory::PlatformIndependent); 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); } diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 8e54900fd6..3e7ac54eb4 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -30,6 +30,7 @@ #include "qbsprojectmanagerconstants.h" #include "qbsprojectmanagersettings.h" +#include <app/app_version.h> #include <coreplugin/icore.h> #include <projectexplorer/kit.h> #include <projectexplorer/kitmanager.h> @@ -105,6 +106,8 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) { m_model.setEditable(false); m_ui.setupUi(this); + m_ui.settingsDirCheckBox->setText(tr("Store profiles in %1 settings directory") + .arg(Core::Constants::IDE_DISPLAY_NAME)); m_ui.settingsDirCheckBox->setChecked(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()); m_ui.versionValueLabel->setText(qbs::LanguageInfo::qbsVersion()); connect(ProjectExplorer::KitManager::instance(), &ProjectExplorer::KitManager::kitsChanged, diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp index 04e7656173..d6bfb86551 100644 --- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp @@ -27,6 +27,8 @@ #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> +#include <app/app_version.h> + #include <coreplugin/basefilewizard.h> #include <coreplugin/icore.h> @@ -134,9 +136,10 @@ SimpleProjectWizard::SimpleProjectWizard() setDisplayName(tr("Import as qmake Project (Limited Functionality)")); setId("Z.DummyProFile"); setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools.<p>" - "This creates a qmake .pro file that allows you to use Qt Creator as a code editor " + "This creates a qmake .pro file that allows you to use %1 as a code editor " "and as a launcher for debugging and analyzing tools. " - "If you want to build the project, you might need to edit the generated .pro file.")); + "If you want to build the project, you might need to edit the generated .pro file.") + .arg(Core::Constants::IDE_DISPLAY_NAME)); setCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY); setDisplayCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY); setFlags(IWizardFactory::PlatformIndependent); @@ -200,7 +203,8 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w, GeneratedFile generatedProFile(proFileName); generatedProFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute); generatedProFile.setContents( - "# Created by and for Qt Creator. This file was created for editing the project sources only.\n" + "# Created by and for " + QLatin1String(Core::Constants::IDE_DISPLAY_NAME) + + " This file was created for editing the project sources only.\n" "# You may attempt to use it for building too, by modifying this file here.\n\n" "#TARGET = " + projectName + "\n\n" + proHeaders + "\n\n" diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index cc0136dc4c..0a32af56ea 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -29,6 +29,8 @@ #include "designersettings.h" #include "puppetcreator.h" +#include <app/app_version.h> + #include <coreplugin/icore.h> #include <qmljseditor/qmljseditorconstants.h> @@ -251,7 +253,8 @@ void SettingsPage::apply() if (currentSettings.value(key) != newSettings.value(key)) { QMessageBox::information(Core::ICore::mainWindow(), tr("Restart Required"), tr("The made changes will take effect after a " - "restart of the QML Emulation layer or Qt Creator.")); + "restart of the QML Emulation layer or %1.") + .arg(Core::Constants::IDE_DISPLAY_NAME)); break; } } diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index 9fed112a68..ca00b6fc41 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -252,14 +252,14 @@ <bool>true</bool> </property> <property name="toolTip"> - <string>Path where Qt Creator can find the QML emulation layer executable (qmlpuppet).</string> + <string>Path to the QML emulation layer executable (qmlpuppet).</string> </property> </widget> </item> <item> <widget class="QPushButton" name="resetFallbackPuppetPathButton"> <property name="toolTip"> - <string>Resets the path to the QML emulation layer that comes with Qt Creator.</string> + <string>Resets the path to the built-in QML emulation layer.</string> </property> <property name="text"> <string>Reset Path</string> diff --git a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.ui b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.ui index 9c7bdb50dc..df66e67b80 100644 --- a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.ui +++ b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.ui @@ -21,7 +21,7 @@ <item row="0" column="1"> <widget class="QCheckBox" name="flushEnabled"> <property name="toolTip"> - <string>Periodically flush pending data to Qt Creator. This reduces the delay when loading the + <string>Periodically flush pending data to the profiler. This reduces the delay when loading the data and the memory usage in the application. It distorts the profile as the flushing itself takes time.</string> </property> diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 949eab3176..8e6b2895f7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -28,6 +28,8 @@ #include "qmlprofilerclientmanager.h" #include "qmlprofilertool.h" +#include <app/app_version.h> + #include <coreplugin/icore.h> #include <coreplugin/helpmanager.h> @@ -100,7 +102,7 @@ void QmlProfilerRunner::start() this, [this, clientManager] { QMessageBox *infoBox = new QMessageBox(ICore::mainWindow()); infoBox->setIcon(QMessageBox::Critical); - infoBox->setWindowTitle(QmlProfilerTool::tr("Qt Creator")); + infoBox->setWindowTitle(Core::Constants::IDE_DISPLAY_NAME); infoBox->setText(QmlProfilerTool::tr("Could not connect to the in-process QML profiler.\n" "Do you want to retry?")); infoBox->setStandardButtons(QMessageBox::Retry | QMessageBox::Cancel | QMessageBox::Help); diff --git a/src/plugins/texteditor/behaviorsettingswidget.ui b/src/plugins/texteditor/behaviorsettingswidget.ui index bc3d4e5b76..a342858801 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.ui +++ b/src/plugins/texteditor/behaviorsettingswidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>801</width> - <height>459</height> + <height>480</height> </rect> </property> <layout class="QHBoxLayout" name="horizontalLayout"> @@ -290,7 +290,7 @@ Specifies how backspace interacts with indentation. <property name="toolTip"> <string><html><head/><body> <p>How text editors should deal with UTF-8 Byte Order Marks. The options are:</p> -<ul ><li><i>Add If Encoding Is UTF-8:</i> always add a BOM when saving a file in UTF-8 encoding. Note that this will not work if the encoding is <i>System</i>, as Qt Creator does not know what it actually is.</li> +<ul ><li><i>Add If Encoding Is UTF-8:</i> always add a BOM when saving a file in UTF-8 encoding. Note that this will not work if the encoding is <i>System</i>, as the text editor does not know what it actually is.</li> <li><i>Keep If Already Present: </i>save the file with a BOM if it already had one when it was loaded.</li> <li><i>Always Delete:</i> never write an UTF-8 BOM, possibly deleting a pre-existing one.</li></ul> <p>Note that UTF-8 BOMs are uncommon and treated incorrectly by some editors, so it usually makes little sense to add any.</p> diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 18d324a7e8..64d1209a7c 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -349,7 +349,7 @@ QWidget *FontSettingsPage::widget() d_ptr->m_ui = new Ui::FontSettingsPage; d_ptr->m_ui->setupUi(d_ptr->m_widget); d_ptr->m_ui->colorSchemeGroupBox->setTitle( - tr("Color Scheme for Qt Creator Theme \"%1\"") + tr("Color Scheme for Theme \"%1\"") .arg(Utils::creatorTheme()->displayName())); d_ptr->m_ui->schemeComboBox->setModel(d_ptr->m_schemeListModel); diff --git a/src/plugins/updateinfo/settingspage.ui b/src/plugins/updateinfo/settingspage.ui index 7e16862038..de6357b956 100644 --- a/src/plugins/updateinfo/settingspage.ui +++ b/src/plugins/updateinfo/settingspage.ui @@ -42,7 +42,7 @@ </sizepolicy> </property> <property name="text"> - <string>Qt Creator automatically runs a scheduled check for updates on a time interval basis. If Qt Creator is not in use on the scheduled date, the automatic check for updates will be performed next time Qt Creator starts.</string> + <string>Automatically runs a scheduled check for updates on a time interval basis. The automatic check for updates will be performed at the scheduled date, or the next startup following it.</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index c7d6058012..d22d398334 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -26,6 +26,8 @@ #include <extensionsystem/iplugin.h> #include <extensionsystem/pluginmanager.h> +#include <app/app_version.h> + #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/coreconstants.h> @@ -227,7 +229,8 @@ public: l->addWidget(newLabel); auto learnLabel = new QLabel(tr("Learn how to develop your own applications " - "and explore Qt Creator."), this); + "and explore %1.") + .arg(Core::Constants::IDE_DISPLAY_NAME), this); learnLabel->setMaximumWidth(200); learnLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); learnLabel->setWordWrap(true); diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index de74efdc51..03945602a0 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -27,6 +27,8 @@ #include "winrtrunconfiguration.h" #include "winrtrunnerhelper.h" +#include <app/app_version.h> + #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> @@ -56,9 +58,10 @@ WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl) QFileInfo debuggerHelper(QCoreApplication::applicationDirPath() + QLatin1String("/winrtdebughelper.exe")); if (!debuggerHelper.isExecutable()) { - reportFailure(tr("The WinRT debugging helper is missing from your Qt Creator " - "installation. It was assumed to be located at %1").arg( - debuggerHelper.absoluteFilePath())); + reportFailure(tr("The WinRT debugging helper is missing from your %1 " + "installation. It was assumed to be located at %2") + .arg(Core::Constants::IDE_DISPLAY_NAME) + .arg(debuggerHelper.absoluteFilePath())); return; } |