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

Make missing uses of IDE name configurable

Browse Source 
Change-Id: Ie89293b80adfacea19bcb949e4524f16fbb223f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Robert Loehning
2018-01-02 17:13:57 +01:00
parent dbfbe1d65d
commit e07bf2f682
8 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/main.cpp
View File

@@ -157,10 +157,12 @@ static inline QString msgCoreLoadFailure(const QString &why)
static inline int askMsgSendFailed() static inline int askMsgSendFailed()
{ {
return QMessageBox::question(0, QApplication::translate("Application","Could not send message"), return QMessageBox::question(0, QApplication::translate("Application","Could not send message"),
QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance. " QCoreApplication::translate("Application", "Unable to send command line arguments "
"It appears to be not responding. Do you want to start a new instance of Creator?"), "to the already running instance. It appears to be not "
QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry, "responding. Do you want to start a new instance of "
QMessageBox::Retry); "%1?").arg(Core::Constants::IDE_DISPLAY_NAME),
QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry,
QMessageBox::Retry);
} }
static void setHighDpiEnvironmentVariable() static void setHighDpiEnvironmentVariable()

4
src/libs/qt-breakpad/qtcrashhandler/mainwidget.cpp
View File

@@ -26,6 +26,8 @@
#include "mainwidget.h" #include "mainwidget.h"
#include "ui_mainwidget.h" #include "ui_mainwidget.h"
#include <app/app_version.h>
#include <QApplication> #include <QApplication>
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>
@@ -43,6 +45,8 @@ MainWidget::MainWidget(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->mainWidgetTopLabel.setText(tr("%1 has crashed").arg(Core::Constants::IDE_DISPLAY_NAME));
connect(ui->restartButton, &QAbstractButton::clicked, this, &MainWidget::restartApplication); connect(ui->restartButton, &QAbstractButton::clicked, this, &MainWidget::restartApplication);
connect(ui->quitButton, &QAbstractButton::clicked, this, &MainWidget::quitApplication); connect(ui->quitButton, &QAbstractButton::clicked, this, &MainWidget::quitApplication);
connect(ui->detailButton, &QAbstractButton::clicked, this, &MainWidget::showDetails); connect(ui->detailButton, &QAbstractButton::clicked, this, &MainWidget::showDetails);

2
src/libs/qt-breakpad/qtcrashhandler/mainwidget.ui
View File

@@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="mainWidgetTopLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>20</pointsize> <pointsize>20</pointsize>

6
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -29,6 +29,8 @@
#include "cpptoolsplugin.h" #include "cpptoolsplugin.h"
#include <ui_cppfilesettingspage.h> #include <ui_cppfilesettingspage.h>
#include <app/app_version.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <cppeditor/cppeditorconstants.h> #include <cppeditor/cppeditorconstants.h>
@@ -57,7 +59,7 @@ static const char licenseTemplatePathKeyC[] = "LicenseTemplate";
const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget", const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget",
"/**************************************************************************\n" "/**************************************************************************\n"
"** Qt Creator license header template\n" "** %1 license header template\n"
"** Special keywords: %USER% %DATE% %YEAR%\n" "** Special keywords: %USER% %DATE% %YEAR%\n"
"** Environment variables: %$VARIABLE%\n" "** Environment variables: %$VARIABLE%\n"
"** To protect a percent sign, use '%%'.\n" "** To protect a percent sign, use '%%'.\n"
@@ -339,7 +341,7 @@ void CppFileSettingsWidget::slotEdit()
if (path.isEmpty()) if (path.isEmpty())
return; return;
Utils::FileSaver saver(path, QIODevice::Text); Utils::FileSaver saver(path, QIODevice::Text);
saver.write(tr(licenseTemplateTemplate).toUtf8()); saver.write(tr(licenseTemplateTemplate).arg(Core::Constants::IDE_DISPLAY_NAME).toUtf8());
if (!saver.finalize(this)) if (!saver.finalize(this))
return; return;
setLicenseTemplatePath(path); setLicenseTemplatePath(path);

15
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -29,6 +29,8 @@
#include "cdboptionspage.h" #include "cdboptionspage.h"
#include "cdbparsehelpers.h" #include "cdbparsehelpers.h"
#include <app/app_version.h>
#include <debugger/breakhandler.h> #include <debugger/breakhandler.h>
#include <debugger/debuggeractions.h> #include <debugger/debuggeractions.h>
#include <debugger/debuggercore.h> #include <debugger/debuggercore.h>
@@ -424,15 +426,16 @@ void CdbEngine::setupEngine()
const QFileInfo extensionFi(CdbEngine::extensionLibraryName(cdbIs64Bit)); const QFileInfo extensionFi(CdbEngine::extensionLibraryName(cdbIs64Bit));
if (!extensionFi.isFile()) { if (!extensionFi.isFile()) {
handleSetupFailure(tr("Internal error: The extension %1 cannot be found.\n" handleSetupFailure(tr("Internal error: The extension %1 cannot be found.\n"
"If you have updated Qt Creator via Maintenance Tool, you may " "If you have updated %2 via Maintenance Tool, you may "
"need to rerun the Tool and select \"Add or remove components\" " "need to rerun the Tool and select \"Add or remove components\" "
"and then select the\n" "and then select the "
"Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.\n" "Qt > Tools > Qt Creator CDB Debugger Support component.\n"
"If you build Qt Creator from sources and want to use a CDB executable " "If you build %2 from sources and want to use a CDB executable "
"with another bitness than your Qt Creator build,\n" "with another bitness than your %2 build, "
"you will need to build a separate CDB extension with the " "you will need to build a separate CDB extension with the "
"same bitness as the CDB you want to use."). "same bitness as the CDB you want to use.").
arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()))); arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()),
Core::Constants::IDE_DISPLAY_NAME));
return; return;
} }
const QString extensionFileName = extensionFi.fileName(); const QString extensionFileName = extensionFi.fileName();

8
src/plugins/debugger/procinterrupt.cpp
View File

@@ -26,6 +26,8 @@
#include "procinterrupt.h" #include "procinterrupt.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include <app/app_version.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir> #include <QDir>
#include <QProcess> // makes kill visible on Windows. #include <QProcess> // makes kill visible on Windows.
@@ -147,10 +149,10 @@ GDB 32bit | Api | Api | NA | Win32
? QCoreApplication::applicationDirPath() + QLatin1String("/win32interrupt.exe") ? QCoreApplication::applicationDirPath() + QLatin1String("/win32interrupt.exe")
: QCoreApplication::applicationDirPath() + QLatin1String("/win64interrupt.exe"); : QCoreApplication::applicationDirPath() + QLatin1String("/win64interrupt.exe");
if (!QFile::exists(executable)) { if (!QFile::exists(executable)) {
*errorMessage = QString::fromLatin1("%1 does not exist. If you have built QtCreator " *errorMessage = QString::fromLatin1("%1 does not exist. If you have built %2 "
"on your own ,checkout " "on your own, checkout "
"https://code.qt.io/cgit/qt-creator/binary-artifacts.git/."). "https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.").
arg(QDir::toNativeSeparators(executable)); arg(QDir::toNativeSeparators(executable), Core::Constants::IDE_DISPLAY_NAME);
break; break;
} }
switch (QProcess::execute(executable, QStringList(QString::number(pID)))) { switch (QProcess::execute(executable, QStringList(QString::number(pID)))) {

7
src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
View File

@@ -27,6 +27,8 @@
#include "localprocesslist.h" #include "localprocesslist.h"
#include <app/app_version.h>
#include <utils/winutils.h> #include <utils/winutils.h>
#include <QCoreApplication> #include <QCoreApplication>
@@ -180,10 +182,11 @@ GDB 32bit | Api | Api | N/A | Win32
? QLatin1String("/win32interrupt.exe") ? QLatin1String("/win32interrupt.exe")
: QLatin1String("/win64interrupt.exe"); : QLatin1String("/win64interrupt.exe");
if (!QFile::exists(executable)) { if (!QFile::exists(executable)) {
appendMsgCannotInterrupt(pid, tr( "%1 does not exist. If you built Qt Creator " appendMsgCannotInterrupt(pid, tr( "%1 does not exist. If you built %2 "
"yourself, check out https://code.qt.io/cgit/" "yourself, check out https://code.qt.io/cgit/"
"qt-creator/binary-artifacts.git/."). "qt-creator/binary-artifacts.git/.").
arg(QDir::toNativeSeparators(executable))); arg(QDir::toNativeSeparators(executable),
Core::Constants::IDE_DISPLAY_NAME));
} }
switch (QProcess::execute(executable, QStringList(QString::number(pid)))) { switch (QProcess::execute(executable, QStringList(QString::number(pid)))) {
case -2: case -2:

6
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -34,6 +34,8 @@
#include <nodeinstanceview.h> #include <nodeinstanceview.h>
#include <app/app_version.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -315,9 +317,9 @@ static void warnAboutInvalidKit()
QCoreApplication::translate("PuppetCreator", QCoreApplication::translate("PuppetCreator",
"The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. " "The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. "
"For example the compiler can be misconfigured. " "For example the compiler can be misconfigured. "
"Fix the kit configuration and restart Qt Creator. " "Fix the kit configuration and restart %1. "
"Otherwise, the fallback emulation layer, which does not support all features, will be used." "Otherwise, the fallback emulation layer, which does not support all features, will be used."
)); ).arg(Core::Constants::IDE_DISPLAY_NAME));
} }
void PuppetCreator::createQml2PuppetExecutableIfMissing() void PuppetCreator::createQml2PuppetExecutableIfMissing()