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

Debugger: Add missing full stops and quotes

Browse Source 
And de-argumentify a string that is easier to handle as two strings.

Change-Id: I1ba5d86ae870adb107dd5b0a70c6492f1cacafde
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2023-06-13 15:32:09 +02:00
parent 33449bc880
commit 4e73069358
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2289,9 +2289,9 @@ void CdbEngine::parseOutputLine(QString line)
CheckableMessageBox::information( CheckableMessageBox::information(
Core::ICore::dialogParent(), Core::ICore::dialogParent(),
Tr::tr("Debugger Start Failed"), Tr::tr("Debugger Start Failed"),
Tr::tr("The system prevents loading of %1, which is required for debugging. " Tr::tr("The system prevents loading of \"%1\", which is required for debugging. "
"Make sure that your antivirus solution is up to date and if that does not work " "Make sure that your antivirus solution is up to date and if that does not work "
"consider adding an exception for %1.") "consider adding an exception for \"%1\".")
.arg(m_extensionFileName), .arg(m_extensionFileName),
QString("SecureInfoCdbextCannotBeLoaded")); QString("SecureInfoCdbextCannotBeLoaded"));
notifyEngineSetupFailed(); notifyEngineSetupFailed();
@@ -2778,7 +2778,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
if (!toLoad) { if (!toLoad) {
Core::AsynchronousMessageBox::critical( Core::AsynchronousMessageBox::critical(
Tr::tr("Cannot Find Debugger Initialization Script"), Tr::tr("Cannot Find Debugger Initialization Script"),
Tr::tr("Cannot read %1: %2").arg(loadOrderFile.toUserOutput(), toLoad.error())); Tr::tr("Cannot read \"%1\": %2").arg(loadOrderFile.toUserOutput(), toLoad.error()));
notifyEngineSetupFailed(); notifyEngineSetupFailed();
return; return;
} }
@@ -2795,7 +2795,8 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
const FilePath codeFile = dumperPath / (module + ".py"); const FilePath codeFile = dumperPath / (module + ".py");
const expected_str<QByteArray> code = codeFile.fileContents(); const expected_str<QByteArray> code = codeFile.fileContents();
if (!code) { if (!code) {
qDebug() << Tr::tr("Cannot read %1: %2").arg(codeFile.toUserOutput(), code.error()); qDebug() << Tr::tr("Cannot read \"%1\": %2")
.arg(codeFile.toUserOutput(), code.error());
continue; continue;
} }

4
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -221,7 +221,7 @@ DebuggerItemModel::DebuggerItemModel()
genericGdb.setEngineType(GdbEngineType); genericGdb.setEngineType(GdbEngineType);
genericGdb.setAbi(Abi()); genericGdb.setAbi(Abi());
genericGdb.setCommand("gdb"); genericGdb.setCommand("gdb");
genericGdb.setUnexpandedDisplayName(Tr::tr("%1 from PATH on Build Device").arg("GDB")); genericGdb.setUnexpandedDisplayName(Tr::tr("GDB from PATH on Build Device"));
generic->appendChild(new DebuggerTreeItem(genericGdb, false)); generic->appendChild(new DebuggerTreeItem(genericGdb, false));
DebuggerItem genericLldb(QVariant("lldb")); DebuggerItem genericLldb(QVariant("lldb"));
@@ -230,7 +230,7 @@ DebuggerItemModel::DebuggerItemModel()
genericLldb.setGeneric(true); genericLldb.setGeneric(true);
genericLldb.setAbi(Abi()); genericLldb.setAbi(Abi());
genericLldb.setCommand("lldb"); genericLldb.setCommand("lldb");
genericLldb.setUnexpandedDisplayName(Tr::tr("%1 from PATH on Build Device").arg("LLDB")); genericLldb.setUnexpandedDisplayName(Tr::tr("LLDB from PATH on Build Device"));
generic->appendChild(new DebuggerTreeItem(genericLldb, false)); generic->appendChild(new DebuggerTreeItem(genericLldb, false));
} }

14
src/plugins/debugger/debuggerrunconfigurationaspect.cpp
View File

@@ -73,19 +73,19 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
const auto setSummaryText = [this, details] { const auto setSummaryText = [this, details] {
QStringList items; QStringList items;
if (m_cppAspect->value() == TriState::Enabled) if (m_cppAspect->value() == TriState::Enabled)
items.append(Tr::tr("Enable C++ debugger")); items.append(Tr::tr("Enable C++ debugger."));
else if (m_cppAspect->value() == TriState::Default) else if (m_cppAspect->value() == TriState::Default)
items.append(Tr::tr("Try to determine need for C++ debugger")); items.append(Tr::tr("Try to determine need for C++ debugger."));
if (m_qmlAspect->value() == TriState::Enabled) if (m_qmlAspect->value() == TriState::Enabled)
items.append(Tr::tr("Enable QML debugger")); items.append(Tr::tr("Enable QML debugger."));
else if (m_qmlAspect->value() == TriState::Default) else if (m_qmlAspect->value() == TriState::Default)
items.append(Tr::tr("Try to determine need for QML debugger")); items.append(Tr::tr("Try to determine need for QML debugger."));
items.append(m_overrideStartupAspect->value().isEmpty() items.append(m_overrideStartupAspect->value().isEmpty()
? Tr::tr("Without additional startup commands") ? Tr::tr("Without additional startup commands.")
: Tr::tr("With additional startup commands")); : Tr::tr("With additional startup commands."));
details->setSummaryText(items.join(". ")); details->setSummaryText(items.join(" "));
}; };
setSummaryText(); setSummaryText();

9
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3976,9 +3976,9 @@ void GdbEngine::handleGdbStarted()
const FilePath loadOrderFile = dumperPath / "loadorder.txt"; const FilePath loadOrderFile = dumperPath / "loadorder.txt";
const expected_str<QByteArray> toLoad = loadOrderFile.fileContents(); const expected_str<QByteArray> toLoad = loadOrderFile.fileContents();
if (!toLoad) { if (!toLoad) {
AsynchronousMessageBox::critical( AsynchronousMessageBox::critical(Tr::tr("Cannot Find Debugger Initialization Script"),
Tr::tr("Cannot Find Debugger Initialization Script"), Tr::tr("Cannot read \"%1\": %2")
Tr::tr("Cannot read %1: %2").arg(loadOrderFile.toUserOutput(), toLoad.error())); .arg(loadOrderFile.toUserOutput(), toLoad.error()));
notifyEngineSetupFailed(); notifyEngineSetupFailed();
return; return;
} }
@@ -3995,7 +3995,8 @@ void GdbEngine::handleGdbStarted()
const FilePath codeFile = dumperPath / (module + ".py"); const FilePath codeFile = dumperPath / (module + ".py");
const expected_str<QByteArray> code = codeFile.fileContents(); const expected_str<QByteArray> code = codeFile.fileContents();
if (!code) { if (!code) {
qDebug() << Tr::tr("Cannot read %1: %2").arg(codeFile.toUserOutput(), code.error()); qDebug() << Tr::tr("Cannot read \"%1\": %2")
.arg(codeFile.toUserOutput(), code.error());
continue; continue;
} }