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

Debugger: Convert to Tr::tr

Browse Source 
Change-Id: I5d2475c790851c68f9997ac6af72b5eaca58482d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-07-05 15:37:08 +02:00
parent bb3549a721
commit 9894c6eaf0
143 changed files with 2272 additions and 36880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,9 @@
****************************************************************************/
#include "debuggeritemmanager.h"
#include "debuggeritem.h"
#include "debuggerkitinformation.h"
#include "debuggertr.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include <coreplugin/icore.h>
@@ -48,7 +49,6 @@
#include <utils/treemodel.h>
#include <utils/winutils.h>
#include <QCoreApplication>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
@@ -80,7 +80,6 @@ class DebuggerItemModel;
class DebuggerItemManagerPrivate
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerItemManager)
public:
DebuggerItemManagerPrivate();
~DebuggerItemManagerPrivate();
@@ -111,8 +110,6 @@ static DebuggerItemManagerPrivate *d = nullptr;
class DebuggerItemConfigWidget : public QWidget
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerItemManager)
public:
explicit DebuggerItemConfigWidget();
void load(const DebuggerItem *item);
@@ -190,8 +187,6 @@ public:
class DebuggerItemModel : public TreeModel<TreeItem, StaticTreeItem, DebuggerTreeItem>
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage)
public:
DebuggerItemModel();
@@ -225,7 +220,7 @@ const DebuggerItem *findDebugger(const Predicate &pred)
DebuggerItemModel::DebuggerItemModel()
{
setHeader({tr("Name"), tr("Path"), tr("Type")});
setHeader({Tr::tr("Name"), Tr::tr("Path"), Tr::tr("Type")});
rootItem()->appendChild(
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
@@ -334,7 +329,7 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget()
m_cdbLabel->setOpenExternalLinks(true);
m_versionLabel = new QLineEdit(this);
m_versionLabel->setPlaceholderText(tr("Unknown"));
m_versionLabel->setPlaceholderText(Tr::tr("Unknown"));
m_versionLabel->setEnabled(false);
m_abis = new QLineEdit(this);
@@ -342,13 +337,13 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget()
auto formLayout = new QFormLayout(this);
formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit);
formLayout->addRow(new QLabel(Tr::tr("Name:")), m_displayNameLineEdit);
formLayout->addRow(m_cdbLabel);
formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser);
formLayout->addRow(new QLabel(tr("Type:")), m_typeLineEdit);
formLayout->addRow(new QLabel(tr("ABIs:")), m_abis);
formLayout->addRow(new QLabel(tr("Version:")), m_versionLabel);
formLayout->addRow(new QLabel(tr("Working directory:")), m_workingDirectoryChooser);
formLayout->addRow(new QLabel(Tr::tr("Path:")), m_binaryChooser);
formLayout->addRow(new QLabel(Tr::tr("Type:")), m_typeLineEdit);
formLayout->addRow(new QLabel(Tr::tr("ABIs:")), m_abis);
formLayout->addRow(new QLabel(Tr::tr("Version:")), m_versionLabel);
formLayout->addRow(new QLabel(Tr::tr("Working directory:")), m_workingDirectoryChooser);
connect(m_binaryChooser, &PathChooser::filePathChanged,
this, &DebuggerItemConfigWidget::binaryPathHasChanged);
@@ -413,10 +408,10 @@ void DebuggerItemConfigWidget::load(const DebuggerItem *item)
QString versionCommand;
if (item->engineType() == CdbEngineType) {
const bool is64bit = is64BitWindowsSystem();
const QString versionString = is64bit ? tr("64-bit version") : tr("32-bit version");
const QString versionString = is64bit ? Tr::tr("64-bit version") : Tr::tr("32-bit version");
//: Label text for path configuration. %2 is "x-bit version".
text = "<html><body><p>"
+ tr("Specify the path to the "
+ Tr::tr("Specify the path to the "
"<a href=\"%1\">Windows Console Debugger executable</a>"
" (%2) here.").arg(QLatin1String(debuggingToolsWikiLinkC), versionString)
+ "</p></body></html>";
@@ -460,13 +455,12 @@ void DebuggerItemConfigWidget::binaryPathHasChanged()
class DebuggerConfigWidget : public IOptionsPageWidget
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage)
public:
DebuggerConfigWidget()
{
m_addButton = new QPushButton(tr("Add"), this);
m_addButton = new QPushButton(Tr::tr("Add"), this);
m_cloneButton = new QPushButton(tr("Clone"), this);
m_cloneButton = new QPushButton(Tr::tr("Clone"), this);
m_cloneButton->setEnabled(false);
m_delButton = new QPushButton(this);
@@ -555,7 +549,7 @@ void DebuggerConfigWidget::cloneDebugger()
DebuggerItem newItem;
newItem.createId();
newItem.setCommand(item->command());
newItem.setUnexpandedDisplayName(d->uniqueDisplayName(tr("Clone of %1").arg(item->displayName())));
newItem.setUnexpandedDisplayName(d->uniqueDisplayName(Tr::tr("Clone of %1").arg(item->displayName())));
newItem.reinitializeFromFile();
newItem.setAutoDetected(false);
d->m_model->addDebugger(newItem, true);
@@ -567,7 +561,7 @@ void DebuggerConfigWidget::addDebugger()
DebuggerItem item;
item.createId();
item.setEngineType(NoEngineType);
item.setUnexpandedDisplayName(d->uniqueDisplayName(tr("New Debugger")));
item.setUnexpandedDisplayName(d->uniqueDisplayName(Tr::tr("New Debugger")));
item.setAutoDetected(false);
d->m_model->addDebugger(item, true);
m_debuggerView->setCurrentIndex(d->m_model->lastIndex());
@@ -597,7 +591,7 @@ void DebuggerConfigWidget::updateButtons()
m_container->setVisible(item != nullptr);
m_cloneButton->setEnabled(item && item->isValid() && item->canClone());
m_delButton->setEnabled(item && !item->isAutoDetected());
m_delButton->setText(item && titem->m_removed ? tr("Restore") : tr("Remove"));
m_delButton->setText(item && titem->m_removed ? Tr::tr("Restore") : Tr::tr("Remove"));
}
// --------------------------------------------------------------------------
@@ -606,12 +600,10 @@ void DebuggerConfigWidget::updateButtons()
class DebuggerOptionsPage : public Core::IOptionsPage
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage)
public:
DebuggerOptionsPage() {
setId(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID);
setDisplayName(tr("Debuggers"));
setDisplayName(Tr::tr("Debuggers"));
setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY);
setWidgetCreator([] { return new DebuggerConfigWidget; });
}
@@ -688,7 +680,7 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers()
item.setAbis(Abi::abisOfBinary(cdb));
item.setCommand(cdb);
item.setEngineType(CdbEngineType);
item.setUnexpandedDisplayName(uniqueDisplayName(tr("Auto-detected CDB at %1").arg(cdb.toUserOutput())));
item.setUnexpandedDisplayName(uniqueDisplayName(Tr::tr("Auto-detected CDB at %1").arg(cdb.toUserOutput())));
item.reinitializeFromFile(); // collect version number
m_model->addDebugger(item);
}
@@ -736,7 +728,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers(const FilePaths &s
// DebuggerItem result;
// result.setAutoDetected(true);
// result.setDisplayName(tr("Auto-detected for Tool Chain %1").arg(tc->displayName()));
// result.setDisplayName(Tr::tr("Auto-detected for Tool Chain %1").arg(tc->displayName()));
/*
// Check suggestions from the SDK.
Environment env = Environment::systemEnvironment();
@@ -785,7 +777,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers(const FilePaths &s
for (const FilePath &path : paths)
path.iterateDirectory(addSuspect, {filters, QDir::Files | QDir::Executable});
QStringList logMessages{tr("Searching debuggers...")};
QStringList logMessages{Tr::tr("Searching debuggers...")};
for (const FilePath &command : qAsConst(suspects)) {
const auto commandMatches = [command](const DebuggerTreeItem *titem) {
return titem->m_item.command() == command;
@@ -804,10 +796,10 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers(const FilePaths &s
if (item.engineType() == NoEngineType)
continue;
//: %1: Debugger engine type (GDB, LLDB, CDB...), %2: Path
const QString name = detectionSource.isEmpty() ? tr("System %1 at %2") : tr("Detected %1 at %2");
const QString name = detectionSource.isEmpty() ? Tr::tr("System %1 at %2") : Tr::tr("Detected %1 at %2");
item.setUnexpandedDisplayName(name.arg(item.engineTypeName()).arg(command.toUserOutput()));
m_model->addDebugger(item);
logMessages.append(tr("Found: \"%1\"").arg(command.toUserOutput()));
logMessages.append(Tr::tr("Found: \"%1\"").arg(command.toUserOutput()));
}
if (logMessage)
*logMessage = logMessages.join('\n');
@@ -848,7 +840,7 @@ void DebuggerItemManagerPrivate::autoDetectUvscDebuggers()
item.setVersion(uVisionVersion);
item.setEngineType(UvscEngineType);
item.setUnexpandedDisplayName(
uniqueDisplayName(tr("Auto-detected uVision at %1")
uniqueDisplayName(Tr::tr("Auto-detected uVision at %1")
.arg(uVision.toUserOutput())));
m_model->addDebugger(item);
}
@@ -996,8 +988,8 @@ void DebuggerItemManagerPrivate::saveDebuggers()
DebuggerItemManager::DebuggerItemManager()
{
new DebuggerItemManagerPrivate;
connect(ICore::instance(), &ICore::saveSettingsRequested,
this, [] { d->saveDebuggers(); });
QObject::connect(ICore::instance(), &ICore::saveSettingsRequested,
[] { d->saveDebuggers(); });
}
DebuggerItemManager::~DebuggerItemManager()
@@ -1056,7 +1048,7 @@ void DebuggerItemManager::autoDetectDebuggersForDevice(const FilePaths &searchPa
void DebuggerItemManager::removeDetectedDebuggers(const QString &detectionSource,
QString *logMessage)
{
QStringList logMessages{tr("Removing debugger entries...")};
QStringList logMessages{Tr::tr("Removing debugger entries...")};
QList<DebuggerTreeItem *> toBeRemoved;
d->m_model->forItemsAtLevel<2>([detectionSource, &toBeRemoved](DebuggerTreeItem *titem) {
@@ -1070,7 +1062,7 @@ void DebuggerItemManager::removeDetectedDebuggers(const QString &detectionSource
toBeRemoved.append(titem);
});
for (DebuggerTreeItem *current : toBeRemoved) {
logMessages.append(tr("Removed \"%1\"").arg(current->m_item.displayName()));
logMessages.append(Tr::tr("Removed \"%1\"").arg(current->m_item.displayName()));
d->m_model->destroyItem(current);
}
@@ -1081,7 +1073,7 @@ void DebuggerItemManager::removeDetectedDebuggers(const QString &detectionSource
void DebuggerItemManager::listDetectedDebuggers(const QString &detectionSource, QString *logMessage)
{
QTC_ASSERT(logMessage, return);
QStringList logMessages{tr("Debuggers:")};
QStringList logMessages{Tr::tr("Debuggers:")};
d->m_model->forItemsAtLevel<2>([detectionSource, &logMessages](DebuggerTreeItem *titem) {
if (titem->m_item.detectionSource() == detectionSource)
logMessages.append(titem->m_item.displayName());