#include
#include
@@ -49,8 +49,6 @@ const Qt::ItemFlags TOOL_ITEM_FLAGS = Qt::ItemIsSelectable | Qt::ItemIsEnabled |
class ExternalToolModel final : public QAbstractItemModel
{
- Q_DECLARE_TR_FUNCTIONS(Core::ExternalToolConfig)
-
public:
ExternalToolModel() = default;
~ExternalToolModel() final;
@@ -132,9 +130,9 @@ QVariant ExternalToolModel::data(const QString &category, int role)
switch (role) {
case Qt::DisplayRole:
case Qt::EditRole:
- return category.isEmpty() ? tr("Uncategorized") : category;
+ return category.isEmpty() ? Tr::tr("Uncategorized") : category;
case Qt::ToolTipRole:
- return category.isEmpty() ? tr("Tools that will appear directly under the External Tools menu.") : QVariant();
+ return category.isEmpty() ? Tr::tr("Tools that will appear directly under the External Tools menu.") : QVariant();
default:
break;
}
@@ -333,7 +331,7 @@ void ExternalToolModel::revertTool(const QModelIndex &modelIndex)
QModelIndex ExternalToolModel::addCategory()
{
- const QString &categoryBase = tr("New Category");
+ const QString &categoryBase = Tr::tr("New Category");
QString category = categoryBase;
int count = 0;
while (m_tools.contains(category)) {
@@ -360,10 +358,10 @@ QModelIndex ExternalToolModel::addTool(const QModelIndex &atIndex)
auto tool = new ExternalTool;
tool->setDisplayCategory(category);
- tool->setDisplayName(tr("New Tool"));
- tool->setDescription(tr("This tool prints a line of useful text"));
+ tool->setDisplayName(Tr::tr("New Tool"));
+ tool->setDescription(Tr::tr("This tool prints a line of useful text"));
//: Sample external tool text
- const QString text = tr("Useful text");
+ const QString text = Tr::tr("Useful text");
if (HostOsInfo::isWindowsHost()) {
tool->setExecutables({"cmd"});
tool->setArguments("/c echo " + text);
@@ -410,15 +408,13 @@ void ExternalToolModel::removeTool(const QModelIndex &modelIndex)
static void fillBaseEnvironmentComboBox(QComboBox *box)
{
box->clear();
- box->addItem(ExternalTool::tr("System Environment"), QByteArray());
+ box->addItem(Tr::tr("System Environment"), QByteArray());
for (const EnvironmentProvider &provider : EnvironmentProvider::providers())
box->addItem(provider.displayName, Id::fromName(provider.id).toSetting());
}
class ExternalToolConfig final : public IOptionsPageWidget
{
- Q_DECLARE_TR_FUNCTIONS(Core::ExternalToolConfig)
-
public:
ExternalToolConfig();
@@ -468,14 +464,14 @@ ExternalToolConfig::ExternalToolConfig()
m_toolTree->header()->setVisible(false);
m_toolTree->header()->setDefaultSectionSize(21);
- auto addButton = new QPushButton(tr("Add"));
- addButton->setToolTip(tr("Add tool."));
+ auto addButton = new QPushButton(Tr::tr("Add"));
+ addButton->setToolTip(Tr::tr("Add tool."));
- m_removeButton = new QPushButton(tr("Remove"));
- m_removeButton->setToolTip(tr("Remove tool."));
+ m_removeButton = new QPushButton(Tr::tr("Remove"));
+ m_removeButton->setToolTip(Tr::tr("Remove tool."));
- m_revertButton = new QPushButton(tr("Reset"));
- m_revertButton->setToolTip(tr("Revert tool to default."));
+ m_revertButton = new QPushButton(Tr::tr("Reset"));
+ m_revertButton->setToolTip(Tr::tr("Revert tool to default."));
auto scrollArea = new QScrollArea(this);
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -504,20 +500,20 @@ ExternalToolConfig::ExternalToolConfig()
m_workingDirectory = new PathChooser(m_infoWidget);
- auto outputLabel = new QLabel(tr("Output:"));
- outputLabel->setToolTip(tr("\n"
+ auto outputLabel = new QLabel(Tr::tr("Output:"));
+ outputLabel->setToolTip(Tr::tr("\n"
"What to do with the executable's standard output.\n"
"
- Ignore: Do nothing with it.
- Show in General Messages.
"
"- Replace selection: Replace the current selection in the current document with it.
"
"
\n"));
m_outputBehavior = new QComboBox(m_infoWidget);
- m_outputBehavior->addItem(tr("Ignore"));
- m_outputBehavior->addItem(tr("Show in General Messages"));
- m_outputBehavior->addItem(tr("Replace Selection"));
+ m_outputBehavior->addItem(Tr::tr("Ignore"));
+ m_outputBehavior->addItem(Tr::tr("Show in General Messages"));
+ m_outputBehavior->addItem(Tr::tr("Replace Selection"));
- auto errorOutputLabel = new QLabel(tr("Error output:"));
- errorOutputLabel->setToolTip(tr("\n"
+ auto errorOutputLabel = new QLabel(Tr::tr("Error output:"));
+ errorOutputLabel->setToolTip(Tr::tr("\n"
"What to do with the executable's standard error output.
\n"
"- Ignore: Do nothing with it.
\n"
"- Show in General Messages.
\n"
@@ -525,23 +521,23 @@ ExternalToolConfig::ExternalToolConfig()
"
"));
m_errorOutputBehavior = new QComboBox(m_infoWidget);
- m_errorOutputBehavior->addItem(tr("Ignore"));
- m_errorOutputBehavior->addItem(tr("Show in General Messages"));
- m_errorOutputBehavior->addItem(tr("Replace Selection"));
+ m_errorOutputBehavior->addItem(Tr::tr("Ignore"));
+ m_errorOutputBehavior->addItem(Tr::tr("Show in General Messages"));
+ m_errorOutputBehavior->addItem(Tr::tr("Replace Selection"));
- m_environmentLabel = new QLabel(tr("No changes to apply."));
+ m_environmentLabel = new QLabel(Tr::tr("No changes to apply."));
m_environmentLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
- auto environmentButton = new QPushButton(tr("Change..."));
+ auto environmentButton = new QPushButton(Tr::tr("Change..."));
- m_modifiesDocumentCheckbox = new QCheckBox(tr("Modifies current document"));
- m_modifiesDocumentCheckbox->setToolTip(tr("If the tool modifies the current document, "
+ m_modifiesDocumentCheckbox = new QCheckBox(Tr::tr("Modifies current document"));
+ m_modifiesDocumentCheckbox->setToolTip(Tr::tr("If the tool modifies the current document, "
"set this flag to ensure that the document is saved before "
"running the tool and is reloaded after the tool finished."));
- auto inputLabel = new QLabel(tr("Input:"));
- inputLabel->setToolTip(tr("Text to pass to the executable via standard input. Leave "
- "empty if the executable should not receive any input."));
+ auto inputLabel = new QLabel(Tr::tr("Input:"));
+ inputLabel->setToolTip(Tr::tr("Text to pass to the executable via standard input. Leave "
+ "empty if the executable should not receive any input."));
m_inputText = new QPlainTextEdit(m_infoWidget);
QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -558,14 +554,14 @@ ExternalToolConfig::ExternalToolConfig()
using namespace Layouting;
Form {
- tr("Description:"), m_description, br,
- tr("Executable:"), m_executable, br,
- tr("Arguments:"), m_arguments, br,
- tr("Working directory:"), m_workingDirectory, br,
+ Tr::tr("Description:"), m_description, br,
+ Tr::tr("Executable:"), m_executable, br,
+ Tr::tr("Arguments:"), m_arguments, br,
+ Tr::tr("Working directory:"), m_workingDirectory, br,
outputLabel, m_outputBehavior, br,
errorOutputLabel, m_errorOutputBehavior, br,
- tr("Base environment:"), m_baseEnvironment, br,
- tr("Environment:"), m_environmentLabel, environmentButton, br,
+ Tr::tr("Base environment:"), m_baseEnvironment, br,
+ Tr::tr("Environment:"), m_environmentLabel, environmentButton, br,
empty, m_modifiesDocumentCheckbox, br,
inputLabel, m_inputText
}.attachTo(m_infoWidget, WithMargins);
@@ -631,10 +627,10 @@ ExternalToolConfig::ExternalToolConfig()
auto menu = new QMenu(addButton);
addButton->setMenu(menu);
- auto addTool = new QAction(tr("Add Tool"), this);
+ auto addTool = new QAction(Tr::tr("Add Tool"), this);
menu->addAction(addTool);
connect(addTool, &QAction::triggered, this, &ExternalToolConfig::addTool);
- auto addCategory = new QAction(tr("Add Category"), this);
+ auto addCategory = new QAction(Tr::tr("Add Category"), this);
menu->addAction(addCategory);
connect(addCategory, &QAction::triggered, this, &ExternalToolConfig::addCategory);
@@ -926,8 +922,8 @@ void ExternalToolConfig::updateEffectiveArguments()
void ExternalToolConfig::editEnvironmentChanges()
{
const QString placeholderText = HostOsInfo::isWindowsHost()
- ? tr("PATH=C:\\dev\\bin;${PATH}")
- : tr("PATH=/opt/bin:${PATH}");
+ ? Tr::tr("PATH=C:\\dev\\bin;${PATH}")
+ : Tr::tr("PATH=/opt/bin:${PATH}");
const auto newItems = EnvironmentDialog::getEnvironmentItems(m_environmentLabel,
m_environment,
placeholderText);
@@ -942,7 +938,7 @@ void ExternalToolConfig::updateEnvironmentLabel()
QString shortSummary = EnvironmentItem::toStringList(m_environment).join("; ");
QFontMetrics fm(m_environmentLabel->font());
shortSummary = fm.elidedText(shortSummary, Qt::ElideRight, m_environmentLabel->width());
- m_environmentLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary);
+ m_environmentLabel->setText(shortSummary.isEmpty() ? Tr::tr("No changes to apply.") : shortSummary);
}
// ToolSettingsPage
@@ -950,7 +946,7 @@ void ExternalToolConfig::updateEnvironmentLabel()
ToolSettings::ToolSettings()
{
setId(Constants::SETTINGS_ID_TOOLS);
- setDisplayName(ExternalToolConfig::tr("External Tools"));
+ setDisplayName(Tr::tr("External Tools"));
setCategory(Constants::SETTINGS_CATEGORY_CORE);
setWidgetCreator([] { return new ExternalToolConfig; });
}
diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
index 874d5d2d893..c37125d447a 100644
--- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
@@ -3,8 +3,10 @@
#include "filepropertiesdialog.h"
-#include
-#include
+#include "../coreplugintr.h"
+#include "../editormanager/editormanager.h"
+#include "../editormanager/ieditorfactory.h"
+
#include
#include
#include
@@ -64,21 +66,21 @@ FilePropertiesDialog::FilePropertiesDialog(const FilePath &filePath, QWidget *pa
// clang-format off
Column {
Form {
- tr("Name:"), m_name, br,
- tr("Path:"), m_path, br,
- tr("MIME type:"), m_mimeType, br,
- tr("Default editor:"), m_defaultEditor, br,
- tr("Line endings:"), m_lineEndings, br,
- tr("Indentation:"), m_indentation, br,
- tr("Owner:"), m_owner, br,
- tr("Group:"), m_group, br,
- tr("Size:"), m_size, br,
- tr("Last read:"), m_lastRead, br,
- tr("Last modified:"), m_lastModified, br,
- tr("Readable:"), m_readable, br,
- tr("Writable:"), m_writable, br,
- tr("Executable:"), m_executable, br,
- tr("Symbolic link:"), m_symLink, br
+ Tr::tr("Name:"), m_name, br,
+ Tr::tr("Path:"), m_path, br,
+ Tr::tr("MIME type:"), m_mimeType, br,
+ Tr::tr("Default editor:"), m_defaultEditor, br,
+ Tr::tr("Line endings:"), m_lineEndings, br,
+ Tr::tr("Indentation:"), m_indentation, br,
+ Tr::tr("Owner:"), m_owner, br,
+ Tr::tr("Group:"), m_group, br,
+ Tr::tr("Size:"), m_size, br,
+ Tr::tr("Last read:"), m_lastRead, br,
+ Tr::tr("Last modified:"), m_lastModified, br,
+ Tr::tr("Readable:"), m_readable, br,
+ Tr::tr("Writable:"), m_writable, br,
+ Tr::tr("Executable:"), m_executable, br,
+ Tr::tr("Symbolic link:"), m_symLink, br
},
buttonBox
}.attachTo(this);
@@ -105,8 +107,8 @@ void FilePropertiesDialog::detectTextFileSettings()
{
QFile file(m_filePath.toString());
if (!file.open(QIODevice::ReadOnly)) {
- m_lineEndings->setText(tr("Unknown"));
- m_indentation->setText(tr("Unknown"));
+ m_lineEndings->setText(Tr::tr("Unknown"));
+ m_indentation->setText(Tr::tr("Unknown"));
return;
}
@@ -116,15 +118,15 @@ void FilePropertiesDialog::detectTextFileSettings()
// Try to guess the files line endings
if (data.contains("\r\n")) {
- m_lineEndings->setText(tr("Windows (CRLF)"));
+ m_lineEndings->setText(Tr::tr("Windows (CRLF)"));
} else if (data.contains("\n")) {
- m_lineEndings->setText(tr("Unix (LF)"));
+ m_lineEndings->setText(Tr::tr("Unix (LF)"));
} else if (data.contains("\r")) {
- m_lineEndings->setText(tr("Mac (CR)"));
+ m_lineEndings->setText(Tr::tr("Mac (CR)"));
lineSeparator = '\r';
} else {
// That does not look like a text file at all
- m_lineEndings->setText(tr("Unknown"));
+ m_lineEndings->setText(Tr::tr("Unknown"));
return;
}
@@ -167,14 +169,14 @@ void FilePropertiesDialog::detectTextFileSettings()
if (!indents.empty()) {
if (tabIndented) {
- m_indentation->setText(tr("Mixed"));
+ m_indentation->setText(Tr::tr("Mixed"));
} else {
- m_indentation->setText(tr("%1 Spaces").arg(max->first));
+ m_indentation->setText(Tr::tr("%1 Spaces").arg(max->first));
}
} else if (tabIndented) {
- m_indentation->setText(tr("Tabs"));
+ m_indentation->setText(Tr::tr("Tabs"));
} else {
- m_indentation->setText(tr("Unknown"));
+ m_indentation->setText(Tr::tr("Unknown"));
}
}
@@ -192,7 +194,7 @@ void FilePropertiesDialog::refresh()
const EditorTypeList factories = IEditorFactory::preferredEditorTypes(m_filePath);
m_defaultEditor->setText(!factories.isEmpty() ? factories.at(0)->displayName()
- : tr("Undefined"));
+ : Tr::tr("Undefined"));
m_owner->setText(fileInfo.owner());
m_group->setText(fileInfo.group());
@@ -206,8 +208,8 @@ void FilePropertiesDialog::refresh()
if (mimeType.inherits("text/plain")) {
detectTextFileSettings();
} else {
- m_lineEndings->setText(tr("Unknown"));
- m_indentation->setText(tr("Unknown"));
+ m_lineEndings->setText(Tr::tr("Unknown"));
+ m_indentation->setText(Tr::tr("Unknown"));
}
});
}
diff --git a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp
index b26a7a10808..545ca9c4169 100644
--- a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp
@@ -3,8 +3,9 @@
#include "newdialogwidget.h"
-#include
-#include
+#include "../coreplugintr.h"
+#include "../icontext.h"
+#include "../icore.h"
#include
#include
@@ -32,7 +33,7 @@ Q_DECLARE_METATYPE(Core::IWizardFactory*)
using namespace Utils;
-namespace {
+namespace Core::Internal {
const int ICON_SIZE = 48;
const char LAST_CATEGORY_KEY[] = "Core/NewDialog/LastCategory";
@@ -42,9 +43,6 @@ const char SHOW_PLATOFORM_FILTER[] = "Core/NewDialog/ShowPlatformFilter";
const char BLACKLISTED_CATEGORIES_KEY[] = "Core/NewDialog/BlacklistedCategories";
const char ALTERNATIVE_WIZARD_STYLE[] = "Core/NewDialog/AlternativeWizardStyle";
-using namespace Core;
-using namespace Core::Internal;
-
class WizardFactoryContainer
{
public:
@@ -150,13 +148,11 @@ public:
}
};
-}
+} // Core::Internal
-Q_DECLARE_METATYPE(WizardFactoryContainer)
+Q_DECLARE_METATYPE(Core::Internal::WizardFactoryContainer)
-using namespace Core;
-using namespace Core::Internal;
-using namespace Layouting;
+namespace Core::Internal {
NewDialogWidget::NewDialogWidget(QWidget *parent)
: QDialog(parent)
@@ -197,11 +193,12 @@ NewDialogWidget::NewDialogWidget(QWidget *parent)
m_templateDescription->setFocusPolicy(Qt::NoFocus);
m_templateDescription->setFrameShape(QFrame::NoFrame);
+ using namespace Layouting;
+
Column { m_imageLabel, m_templateDescription }.attachTo(frame);
Column {
- Row { QCoreApplication::translate("Core::Internal::NewDialog", "Choose a template:"),
- st, m_comboBox },
+ Row { Tr::tr("Choose a template:"), st, m_comboBox },
Row { m_templateCategoryView, m_templatesView, frame },
buttonBox
}.attachTo(this);
@@ -211,7 +208,7 @@ NewDialogWidget::NewDialogWidget(QWidget *parent)
frame->setPalette(p);
m_okButton = buttonBox->button(QDialogButtonBox::Ok);
m_okButton->setDefault(true);
- m_okButton->setText(tr("Choose..."));
+ m_okButton->setText(Tr::tr("Choose..."));
m_model = new QStandardItemModel(this);
@@ -279,10 +276,10 @@ void NewDialogWidget::setWizardFactories(QList factories,
m_model->clear();
QStandardItem *parentItem = m_model->invisibleRootItem();
- QStandardItem *projectKindItem = new QStandardItem(tr("Projects"));
+ QStandardItem *projectKindItem = new QStandardItem(Tr::tr("Projects"));
projectKindItem->setData(IWizardFactory::ProjectWizard, Qt::UserRole);
projectKindItem->setFlags({}); // disable item to prevent focus
- QStandardItem *filesKindItem = new QStandardItem(tr("Files and Classes"));
+ QStandardItem *filesKindItem = new QStandardItem(Tr::tr("Files and Classes"));
filesKindItem->setData(IWizardFactory::FileWizard, Qt::UserRole);
filesKindItem->setFlags({}); // disable item to prevent focus
@@ -293,11 +290,11 @@ void NewDialogWidget::setWizardFactories(QList factories,
const bool allowAllTemplates = ICore::settings()->value(ALLOW_ALL_TEMPLATES, true).toBool();
if (allowAllTemplates)
- m_comboBox->addItem(tr("All Templates"), Id().toSetting());
+ m_comboBox->addItem(Tr::tr("All Templates"), Id().toSetting());
for (Id platform : availablePlatforms) {
const QString displayNameForPlatform = IWizardFactory::displayNameForPlatform(platform);
- m_comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform.toSetting());
+ m_comboBox->addItem(Tr::tr("%1 Templates").arg(displayNameForPlatform), platform.toSetting());
}
m_comboBox->setCurrentIndex(0); // "All templates"
@@ -443,9 +440,9 @@ void NewDialogWidget::currentItemChanged(const QModelIndex &index)
desciption.replace(QLatin1Char('\n'), QLatin1String("
"));
desciption += QLatin1String("
");
if (wizard->flags().testFlag(IWizardFactory::PlatformIndependent))
- desciption += tr("Platform independent") + QLatin1String("");
+ desciption += Tr::tr("Platform independent") + QLatin1String("");
else
- desciption += tr("Supported Platforms")
+ desciption += Tr::tr("Supported Platforms")
+ QLatin1String(": ")
+ "- " + displayNamesForSupportedPlatforms.join("
- ") + "
"
+ QLatin1String("
");
@@ -511,3 +508,5 @@ void NewDialogWidget::setSelectedPlatform(int /*platform*/)
//The static cast allows us to keep PlatformFilterProxyModel anonymous
static_cast(m_filterProxyModel)->setPlatform(selectedPlatform());
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/dialogs/newdialogwidget.h b/src/plugins/coreplugin/dialogs/newdialogwidget.h
index 1733cae83da..04a06e382e1 100644
--- a/src/plugins/coreplugin/dialogs/newdialogwidget.h
+++ b/src/plugins/coreplugin/dialogs/newdialogwidget.h
@@ -25,14 +25,10 @@ class QTextBrowser;
class QTreeView;
QT_END_NAMESPACE
-namespace Core {
-
-namespace Internal {
+namespace Core::Internal {
class NewDialogWidget : public QDialog, public NewDialog
{
- Q_DECLARE_TR_FUNCTIONS(Core::Internal::NewDialog)
-
public:
explicit NewDialogWidget(QWidget *parent);
~NewDialogWidget() override;
@@ -77,5 +73,4 @@ private:
QVariantMap m_extraVariables;
};
-} // namespace Internal
-} // namespace Core
+} // Core::Internal
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index 2dc9ec6f76d..ddec97928bf 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -3,6 +3,8 @@
#include "openwithdialog.h"
+#include "../coreplugintr.h"
+
#include
#include
@@ -10,8 +12,7 @@
#include
#include
-using namespace Core;
-using namespace Core::Internal;
+namespace Core::Internal {
OpenWithDialog::OpenWithDialog(const Utils::FilePath &filePath, QWidget *parent)
: QDialog(parent)
@@ -19,7 +20,7 @@ OpenWithDialog::OpenWithDialog(const Utils::FilePath &filePath, QWidget *parent)
, buttonBox(new QDialogButtonBox)
{
resize(358, 199);
- setWindowTitle(tr("Open File With..."));
+ setWindowTitle(Tr::tr("Open File With..."));
buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
@@ -27,7 +28,7 @@ OpenWithDialog::OpenWithDialog(const Utils::FilePath &filePath, QWidget *parent)
using namespace Utils::Layouting;
// clang-format off
Column {
- tr("Open file \"%1\" with:").arg(filePath.fileName()),
+ Tr::tr("Open file \"%1\" with:").arg(filePath.fileName()),
editorListWidget,
buttonBox
}.attachTo(this);
@@ -70,3 +71,5 @@ void OpenWithDialog::currentItemChanged(QListWidgetItem *current, QListWidgetIte
{
setOkButtonEnabled(current);
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
index fc033570d30..62878a19eaa 100644
--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
@@ -3,6 +3,8 @@
#include "promptoverwritedialog.h"
+#include "../coreplugintr.h"
+
#include
#include
@@ -43,7 +45,7 @@ PromptOverwriteDialog::PromptOverwriteDialog(QWidget *parent) :
m_view(new QTreeView),
m_model(new QStandardItemModel(0, 1, this))
{
- setWindowTitle(tr("Overwrite Existing Files"));
+ setWindowTitle(Tr::tr("Overwrite Existing Files"));
setModal(true);
auto mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(m_label);
@@ -74,8 +76,8 @@ void PromptOverwriteDialog::setFiles(const FilePaths &l)
m_model->appendRow(item);
}
const QString message =
- tr("The following files already exist in the folder\n%1.\n"
- "Would you like to overwrite them?").arg(nativeCommonPath);
+ Tr::tr("The following files already exist in the folder\n%1.\n"
+ "Would you like to overwrite them?").arg(nativeCommonPath);
m_label->setText(message);
}
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
index 0fc4aabc0c2..97d35aca82c 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -3,11 +3,12 @@
#include "readonlyfilesdialog.h"
-#include
-#include
-#include
-#include
-#include
+#include "../coreplugintr.h"
+#include "../editormanager/editormanager_p.h"
+#include "../icore.h"
+#include "../idocument.h"
+#include "../iversioncontrol.h"
+#include "../vcsmanager.h"
#include
#include
@@ -35,8 +36,6 @@ namespace Internal {
class ReadOnlyFilesDialogPrivate
{
- Q_DECLARE_TR_FUNCTIONS(Core::ReadOnlyFilesDialog)
-
public:
ReadOnlyFilesDialogPrivate(ReadOnlyFilesDialog *parent, IDocument *document = nullptr, bool useSaveAs = false);
~ReadOnlyFilesDialogPrivate();
@@ -100,10 +99,10 @@ ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(ReadOnlyFilesDialog *pare
, useVCS(false)
, showWarnings(false)
, document(document)
- , mixedText(tr("Mixed"))
- , makeWritableText(tr("Make Writable"))
- , versionControlOpenText(tr("Open with VCS"))
- , saveAsText(tr("Save As"))
+ , mixedText(Tr::tr("Mixed"))
+ , makeWritableText(Tr::tr("Make Writable"))
+ , versionControlOpenText(Tr::tr("Open with VCS"))
+ , saveAsText(Tr::tr("Save As"))
{}
ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
@@ -217,16 +216,16 @@ void ReadOnlyFilesDialogPrivate::promptFailWarning(const FilePaths &files, ReadO
case ReadOnlyFilesDialog::RO_OpenVCS: {
if (IVersionControl *vc = versionControls[file]) {
const QString openText = Utils::stripAccelerator(vc->vcsOpenText());
- title = tr("Failed to %1 File").arg(openText);
- message = tr("%1 file %2 from version control system %3 failed.")
+ title = Tr::tr("Failed to %1 File").arg(openText);
+ message = Tr::tr("%1 file %2 from version control system %3 failed.")
.arg(openText)
.arg(file.toUserOutput())
.arg(vc->displayName())
+ '\n'
+ failWarning;
} else {
- title = tr("No Version Control System Found");
- message = tr("Cannot open file %1 from version control system.\n"
+ title = Tr::tr("No Version Control System Found");
+ message = Tr::tr("Cannot open file %1 from version control system.\n"
"No version control system found.")
.arg(file.toUserOutput())
+ '\n'
@@ -235,27 +234,27 @@ void ReadOnlyFilesDialogPrivate::promptFailWarning(const FilePaths &files, ReadO
break;
}
case ReadOnlyFilesDialog::RO_MakeWritable:
- title = tr("Cannot Set Permissions");
- message = tr("Cannot set permissions for %1 to writable.")
+ title = Tr::tr("Cannot Set Permissions");
+ message = Tr::tr("Cannot set permissions for %1 to writable.")
.arg(file.toUserOutput())
+ '\n'
+ failWarning;
break;
case ReadOnlyFilesDialog::RO_SaveAs:
- title = tr("Cannot Save File");
- message = tr("Cannot save file %1").arg(file.toUserOutput())
+ title = Tr::tr("Cannot Save File");
+ message = Tr::tr("Cannot save file %1").arg(file.toUserOutput())
+ '\n'
+ failWarning;
break;
default:
- title = tr("Canceled Changing Permissions");
+ title = Tr::tr("Canceled Changing Permissions");
message = failWarning;
break;
}
} else {
- title = tr("Could Not Change Permissions on Some Files");
+ title = Tr::tr("Could Not Change Permissions on Some Files");
message = failWarning + QLatin1Char('\n')
- + tr("See details for a complete list of files.");
+ + Tr::tr("See details for a complete list of files.");
details = Utils::transform(files, &FilePath::toString).join('\n');
}
QMessageBox msgBox(QMessageBox::Warning, title, message,
@@ -393,18 +392,18 @@ void ReadOnlyFilesDialogPrivate::updateSelectAll()
void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths)
{
q->resize(639, 217);
- q->setWindowTitle(tr("Files Without Write Permissions"));
+ q->setWindowTitle(Tr::tr("Files Without Write Permissions"));
- m_msgLabel = new QLabel(tr(
+ m_msgLabel = new QLabel(Tr::tr(
"The following files have no write permissions. Do you want to change the permissions?"));
m_treeWidget = new QTreeWidget;
auto headerItem = new QTreeWidgetItem;
- headerItem->setText(0, tr("Make Writable"));
- headerItem->setText(1, tr("Open with VCS"));
- headerItem->setText(2, tr("Save As"));
- headerItem->setText(3, tr("Filename"));
- headerItem->setText(4, tr("Path"));
+ headerItem->setText(0, Tr::tr("Make Writable"));
+ headerItem->setText(1, Tr::tr("Open with VCS"));
+ headerItem->setText(2, Tr::tr("Save As"));
+ headerItem->setText(3, Tr::tr("Filename"));
+ headerItem->setText(4, Tr::tr("Path"));
m_treeWidget->setSelectionMode(QAbstractItemView::NoSelection);
m_treeWidget->setTextElideMode(Qt::ElideLeft);
m_treeWidget->setIndentation(0);
@@ -416,14 +415,14 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths)
m_setAll = new QComboBox;
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::NoButton);
- buttonBox->addButton(tr("Change &Permission"), QDialogButtonBox::AcceptRole);
+ buttonBox->addButton(Tr::tr("Change &Permission"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(QDialogButtonBox::Cancel);
QObject::connect(buttonBox, &QDialogButtonBox::accepted, q, &QDialog::accept);
QObject::connect(buttonBox, &QDialogButtonBox::rejected, q, &QDialog::reject);
using namespace Layouting;
- QWidget *setAllWidget = Row{tr("Select all, if possible: "), m_setAll, st}.emerge(
+ QWidget *setAllWidget = Row{Tr::tr("Select all, if possible: "), m_setAll, st}.emerge(
WithoutMargins);
// clang-format off
@@ -505,9 +504,10 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths)
m_treeWidget->resizeColumnToContents(FileName);
m_treeWidget->resizeColumnToContents(Folder);
setAllWidget->setVisible(false);
- if (useVCS)
- m_msgLabel->setText(tr("The following files are not checked out yet.\n"
- "Do you want to check them out now?"));
+ if (useVCS) {
+ m_msgLabel->setText(Tr::tr("The following files are not checked out yet.\n"
+ "Do you want to check them out now?"));
+ }
return;
}
diff --git a/src/plugins/coreplugin/dialogs/restartdialog.cpp b/src/plugins/coreplugin/dialogs/restartdialog.cpp
index adf92371e65..3513b310b66 100644
--- a/src/plugins/coreplugin/dialogs/restartdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/restartdialog.cpp
@@ -3,7 +3,8 @@
#include "restartdialog.h"
-#include
+#include "../coreplugintr.h"
+#include "../icore.h"
#include
@@ -12,11 +13,11 @@ namespace Core {
RestartDialog::RestartDialog(QWidget *parent, const QString &text)
: QMessageBox(parent)
{
- setWindowTitle(tr("Restart Required"));
+ setWindowTitle(Tr::tr("Restart Required"));
setText(text);
setIcon(QMessageBox::Information);
- addButton(tr("Later"), QMessageBox::NoRole);
- addButton(tr("Restart Now"), QMessageBox::YesRole);
+ addButton(Tr::tr("Later"), QMessageBox::NoRole);
+ addButton(Tr::tr("Restart Now"), QMessageBox::YesRole);
connect(this, &QDialog::accepted, ICore::instance(), &ICore::restart, Qt::QueuedConnection);
}
diff --git a/src/plugins/coreplugin/dialogs/restartdialog.h b/src/plugins/coreplugin/dialogs/restartdialog.h
index c0bcbcff99b..65646f3389a 100644
--- a/src/plugins/coreplugin/dialogs/restartdialog.h
+++ b/src/plugins/coreplugin/dialogs/restartdialog.h
@@ -12,8 +12,6 @@ namespace Core {
class CORE_EXPORT RestartDialog : public QMessageBox
{
- Q_DECLARE_TR_FUNCTIONS(Core::RestartDialog)
-
public:
RestartDialog(QWidget *parent, const QString &text);
};
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index 68d951e4b6a..87953b3ab92 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -3,8 +3,9 @@
#include "saveitemsdialog.h"
-#include
-#include
+#include "../coreplugintr.h"
+#include "../diffservice.h"
+#include "../idocument.h"
#include
#include
@@ -24,18 +25,17 @@
Q_DECLARE_METATYPE(Core::IDocument*)
-using namespace Core;
-using namespace Core::Internal;
+namespace Core::Internal {
SaveItemsDialog::SaveItemsDialog(QWidget *parent, const QList &items)
: QDialog(parent)
- , m_msgLabel(new QLabel(tr("The following files have unsaved changes:")))
+ , m_msgLabel(new QLabel(Tr::tr("The following files have unsaved changes:")))
, m_treeWidget(new QTreeWidget)
- , m_saveBeforeBuildCheckBox(new QCheckBox(tr("Automatically save all files before building")))
+ , m_saveBeforeBuildCheckBox(new QCheckBox(Tr::tr("Automatically save all files before building")))
, m_buttonBox(new QDialogButtonBox)
{
resize(457, 200);
- setWindowTitle(tr("Save Changes"));
+ setWindowTitle(Tr::tr("Save Changes"));
m_treeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_treeWidget->setTextElideMode(Qt::ElideLeft);
@@ -50,11 +50,11 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent, const QList &item
? QDialogButtonBox::ResetRole
: QDialogButtonBox::DestructiveRole;
if (DiffService::instance()) {
- m_diffButton = m_buttonBox->addButton(tr("&Diff"), discardButtonRole);
+ m_diffButton = m_buttonBox->addButton(Tr::tr("&Diff"), discardButtonRole);
connect(m_diffButton, &QAbstractButton::clicked, this, &SaveItemsDialog::collectFilesToDiff);
}
m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Save);
- QPushButton *discardButton = m_buttonBox->addButton(tr("Do &Not Save"), discardButtonRole);
+ QPushButton *discardButton = m_buttonBox->addButton(Tr::tr("Do &Not Save"), discardButtonRole);
m_treeWidget->setFocus();
m_saveBeforeBuildCheckBox->setVisible(false);
@@ -116,16 +116,16 @@ void SaveItemsDialog::updateButtons()
int count = m_treeWidget->selectedItems().count();
QPushButton *saveButton = m_buttonBox->button(QDialogButtonBox::Save);
bool buttonsEnabled = true;
- QString saveText = tr("&Save");
- QString diffText = tr("&Diff && Cancel");
+ QString saveText = Tr::tr("&Save");
+ QString diffText = Tr::tr("&Diff && Cancel");
if (count == m_treeWidget->topLevelItemCount()) {
- saveText = tr("&Save All");
- diffText = tr("&Diff All && Cancel");
+ saveText = Tr::tr("&Save All");
+ diffText = Tr::tr("&Diff All && Cancel");
} else if (count == 0) {
buttonsEnabled = false;
} else {
- saveText = tr("&Save Selected");
- diffText = tr("&Diff Selected && Cancel");
+ saveText = Tr::tr("&Save Selected");
+ diffText = Tr::tr("&Diff Selected && Cancel");
}
saveButton->setEnabled(buttonsEnabled);
saveButton->setText(saveText);
@@ -140,9 +140,9 @@ void SaveItemsDialog::adjustButtonWidths()
// give save button a size that all texts fit in, so it doesn't get resized
// Mac: make cancel + save button same size (work around dialog button box issue)
QStringList possibleTexts;
- possibleTexts << tr("Save") << tr("Save All");
+ possibleTexts << Tr::tr("Save") << Tr::tr("Save All");
if (m_treeWidget->topLevelItemCount() > 1)
- possibleTexts << tr("Save Selected");
+ possibleTexts << Tr::tr("Save Selected");
int maxTextWidth = 0;
QPushButton *saveButton = m_buttonBox->button(QDialogButtonBox::Save);
for (const QString &text : std::as_const(possibleTexts)) {
@@ -208,3 +208,5 @@ bool SaveItemsDialog::alwaysSaveChecked()
{
return m_saveBeforeBuildCheckBox->isChecked();
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index f641c63c25c..5b760f8ff10 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -3,9 +3,10 @@
#include "settingsdialog.h"
-#include
-#include
-#include
+#include "ioptionspage.h"
+#include "../coreplugintr.h"
+#include "../icore.h"
+#include "../iwizardfactory.h"
#include
#include
@@ -429,7 +430,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
m_filterLineEdit->setFiltering(true);
createGui();
- setWindowTitle(QCoreApplication::translate("Core::Internal::SettingsDialog", "Preferences"));
+ setWindowTitle(Tr::tr("Preferences"));
m_model.setPages(m_pages, IOptionsPageProvider::allOptionsPagesProviders());
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index b467f2d7b64..598cf92d993 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -3,12 +3,13 @@
#include "shortcutsettings.h"
-#include
-#include
-#include
-#include
-#include
-#include
+#include "../coreconstants.h"
+#include "../coreplugintr.h"
+#include "../documentmanager.h"
+#include "../icore.h"
+#include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
+#include "../actionmanager/commandsfile.h"
#include
#include
@@ -130,11 +131,10 @@ ShortcutButton::ShortcutButton(QWidget *parent)
: QPushButton(parent)
, m_key({{0, 0, 0, 0}})
{
- // Using ShortcutButton::tr() as workaround for QTBUG-34128
- setToolTip(ShortcutButton::tr("Click and type the new key sequence."));
+ setToolTip(::Core::Tr::tr("Click and type the new key sequence."));
setCheckable(true);
- m_checkedText = ShortcutButton::tr("Stop Recording");
- m_uncheckedText = ShortcutButton::tr("Record");
+ m_checkedText = ::Core::Tr::tr("Stop Recording");
+ m_uncheckedText = ::Core::Tr::tr("Record");
updateText();
connect(this, &ShortcutButton::toggled, this, &ShortcutButton::handleToggleChange);
}
@@ -228,8 +228,6 @@ void ShortcutButton::handleToggleChange(bool toogleState)
class ShortcutSettingsWidget final : public CommandMappings
{
- Q_DECLARE_TR_FUNCTIONS(Core::Internal::ShortcutSettings)
-
public:
ShortcutSettingsWidget();
~ShortcutSettingsWidget() final;
@@ -262,8 +260,8 @@ private:
ShortcutSettingsWidget::ShortcutSettingsWidget()
{
- setPageTitle(tr("Keyboard Shortcuts"));
- setTargetHeader(tr("Shortcut"));
+ setPageTitle(Tr::tr("Keyboard Shortcuts"));
+ setTargetHeader(Tr::tr("Shortcut"));
setResetVisible(true);
connect(ActionManager::instance(), &ActionManager::commandListChanged,
@@ -275,7 +273,7 @@ ShortcutSettingsWidget::ShortcutSettingsWidget()
this,
&ShortcutSettingsWidget::resetToDefault);
- m_shortcutBox = new QGroupBox(tr("Shortcut"), this);
+ m_shortcutBox = new QGroupBox(Tr::tr("Shortcut"), this);
m_shortcutBox->setEnabled(false);
m_shortcutLayout = new QGridLayout(m_shortcutBox);
m_shortcutBox->setLayout(m_shortcutLayout);
@@ -292,7 +290,7 @@ ShortcutSettingsWidget::~ShortcutSettingsWidget()
ShortcutSettings::ShortcutSettings()
{
setId(Constants::SETTINGS_ID_SHORTCUTS);
- setDisplayName(ShortcutSettingsWidget::tr("Keyboard"));
+ setDisplayName(Tr::tr("Keyboard"));
setCategory(Constants::SETTINGS_CATEGORY_CORE);
}
@@ -371,7 +369,7 @@ void ShortcutSettingsWidget::setupShortcutBox(ShortcutItem *scitem)
};
m_shortcutInputs.clear();
delete m_addButton;
- m_addButton = new QPushButton(tr("Add"), this);
+ m_addButton = new QPushButton(Tr::tr("Add"), this);
for (int i = 0; i < qMax(1, scitem->m_keys.size()); ++i)
addShortcutInput(i, scitem->m_keys.value(i));
connect(m_addButton, &QPushButton::clicked, this, [this, addShortcutInput, addButtonToLayout] {
@@ -388,11 +386,11 @@ static bool checkValidity(const QKeySequence &key, QString *warningMessage)
return true;
QTC_ASSERT(warningMessage, return true);
if (!keySequenceIsValid(key)) {
- *warningMessage = ShortcutSettingsWidget::tr("Invalid key sequence.");
+ *warningMessage = Tr::tr("Invalid key sequence.");
return false;
}
if (isTextKeySequence(key))
- *warningMessage = ShortcutSettingsWidget::tr("Key sequence will not work in editor.");
+ *warningMessage = Tr::tr("Key sequence will not work in editor.");
return true;
}
@@ -466,9 +464,9 @@ void ShortcutSettingsWidget::resetToDefault()
void ShortcutSettingsWidget::importAction()
{
FilePath fileName = FileUtils::getOpenFilePath(nullptr,
- tr("Import Keyboard Mapping Scheme"),
+ Tr::tr("Import Keyboard Mapping Scheme"),
schemesPath(),
- tr("Keyboard Mapping Scheme (*.kms)"));
+ Tr::tr("Keyboard Mapping Scheme (*.kms)"));
if (!fileName.isEmpty()) {
CommandsFile cf(fileName);
@@ -506,9 +504,9 @@ void ShortcutSettingsWidget::defaultAction()
void ShortcutSettingsWidget::exportAction()
{
const FilePath filePath
- = DocumentManager::getSaveFileNameWithExtension(tr("Export Keyboard Mapping Scheme"),
+ = DocumentManager::getSaveFileNameWithExtension(Tr::tr("Export Keyboard Mapping Scheme"),
schemesPath(),
- tr("Keyboard Mapping Scheme (*.kms)"));
+ Tr::tr("Keyboard Mapping Scheme (*.kms)"));
if (!filePath.isEmpty()) {
CommandsFile cf(filePath);
cf.exportCommands(m_scitems);
@@ -619,33 +617,33 @@ void ShortcutSettingsWidget::markAllCollisions()
ShortcutInput::ShortcutInput()
{
- m_shortcutLabel = new QLabel(tr("Key sequence:"));
+ m_shortcutLabel = new QLabel(Tr::tr("Key sequence:"));
m_shortcutLabel->setToolTip(
Utils::HostOsInfo::isMacHost()
? QLatin1String("")
- + tr("Use \"Cmd\", \"Opt\", \"Ctrl\", and \"Shift\" for modifier keys. "
- "Use \"Escape\", \"Backspace\", \"Delete\", \"Insert\", \"Home\", and so "
- "on, for special keys. "
- "Combine individual keys with \"+\", "
- "and combine multiple shortcuts to a shortcut sequence with \",\". "
- "For example, if the user must hold the Ctrl and Shift modifier keys "
- "while pressing Escape, and then release and press A, "
- "enter \"Ctrl+Shift+Escape,A\".")
+ + Tr::tr("Use \"Cmd\", \"Opt\", \"Ctrl\", and \"Shift\" for modifier keys. "
+ "Use \"Escape\", \"Backspace\", \"Delete\", \"Insert\", \"Home\", and so "
+ "on, for special keys. "
+ "Combine individual keys with \"+\", "
+ "and combine multiple shortcuts to a shortcut sequence with \",\". "
+ "For example, if the user must hold the Ctrl and Shift modifier keys "
+ "while pressing Escape, and then release and press A, "
+ "enter \"Ctrl+Shift+Escape,A\".")
+ QLatin1String("")
: QLatin1String("")
- + tr("Use \"Ctrl\", \"Alt\", \"Meta\", and \"Shift\" for modifier keys. "
- "Use \"Escape\", \"Backspace\", \"Delete\", \"Insert\", \"Home\", and so "
- "on, for special keys. "
- "Combine individual keys with \"+\", "
- "and combine multiple shortcuts to a shortcut sequence with \",\". "
- "For example, if the user must hold the Ctrl and Shift modifier keys "
- "while pressing Escape, and then release and press A, "
- "enter \"Ctrl+Shift+Escape,A\".")
+ + Tr::tr("Use \"Ctrl\", \"Alt\", \"Meta\", and \"Shift\" for modifier keys. "
+ "Use \"Escape\", \"Backspace\", \"Delete\", \"Insert\", \"Home\", and so "
+ "on, for special keys. "
+ "Combine individual keys with \"+\", "
+ "and combine multiple shortcuts to a shortcut sequence with \",\". "
+ "For example, if the user must hold the Ctrl and Shift modifier keys "
+ "while pressing Escape, and then release and press A, "
+ "enter \"Ctrl+Shift+Escape,A\".")
+ QLatin1String(""));
m_shortcutEdit = new Utils::FancyLineEdit;
m_shortcutEdit->setFiltering(true);
- m_shortcutEdit->setPlaceholderText(tr("Enter key sequence as text"));
+ m_shortcutEdit->setPlaceholderText(Tr::tr("Enter key sequence as text"));
connect(m_shortcutEdit, &Utils::FancyLineEdit::textChanged, this, &ShortcutInput::changed);
m_shortcutButton = new ShortcutButton;
@@ -669,7 +667,7 @@ ShortcutInput::ShortcutInput()
const bool isValid = checkValidity(key, &warningMessage);
m_warningLabel->setText(warningMessage);
if (isValid && m_conflictChecker && m_conflictChecker(key)) {
- m_warningLabel->setText(ShortcutSettingsWidget::tr(
+ m_warningLabel->setText(Tr::tr(
"Key sequence has potential conflicts. Show."));
}
return isValid;
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 403bd1a0f72..d5bd558e804 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -228,7 +228,7 @@ void DocumentManagerPrivate::registerSaveAllAction()
{
ActionContainer *mfile = ActionManager::actionContainer(Constants::M_FILE);
Command *cmd = ActionManager::registerAction(m_saveAllAction, Constants::SAVEALL);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? QString() : tr("Ctrl+Shift+S")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? QString() : Tr::tr("Ctrl+Shift+S")));
mfile->addAction(cmd, Constants::G_FILE_SAVE);
m_saveAllAction->setEnabled(false);
connect(m_saveAllAction, &QAction::triggered, [] {
@@ -237,7 +237,7 @@ void DocumentManagerPrivate::registerSaveAllAction()
}
DocumentManagerPrivate::DocumentManagerPrivate() :
- m_saveAllAction(new QAction(tr("Save A&ll"), this))
+ m_saveAllAction(new QAction(Tr::tr("Save A&ll"), this))
{
// we do not want to do too much directly in the focus change event, so queue the connection
connect(qApp,
@@ -688,9 +688,8 @@ static bool saveModifiedFilesHelper(const QList &documents,
}
if (!roDocuments.isEmpty()) {
ReadOnlyFilesDialog roDialog(roDocuments, ICore::dialogParent());
- roDialog.setShowFailWarning(true, DocumentManager::tr(
- "Could not save the files.",
- "error message"));
+ roDialog.setShowFailWarning(true, Tr::tr("Could not save the files.",
+ "error message"));
if (roDialog.exec() == ReadOnlyFilesDialog::RO_Cancel) {
if (cancelled)
(*cancelled) = true;
@@ -732,8 +731,8 @@ bool DocumentManager::saveDocument(IDocument *document,
}
*isReadOnly = false;
}
- QMessageBox::critical(ICore::dialogParent(), tr("File Error"),
- tr("Error while saving file: %1").arg(errorString));
+ QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"),
+ Tr::tr("Error while saving file: %1").arg(errorString));
out:
ret = false;
}
@@ -826,8 +825,8 @@ FilePath DocumentManager::getSaveFileName(const QString &title, const FilePath &
if (!suffixOk && !suffixes.isEmpty()) {
filePath = filePath.stringAppended(suffixes.at(0));
if (filePath.exists()) {
- if (QMessageBox::warning(ICore::dialogParent(), tr("Overwrite?"),
- tr("An item named \"%1\" already exists at this location. "
+ if (QMessageBox::warning(ICore::dialogParent(), Tr::tr("Overwrite?"),
+ Tr::tr("An item named \"%1\" already exists at this location. "
"Do you want to overwrite it?").arg(filePath.toUserOutput()),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
repeat = true;
@@ -877,7 +876,7 @@ FilePath DocumentManager::getSaveAsFileName(const IDocument *document)
if (selectedFilter.isEmpty())
selectedFilter = Utils::mimeTypeForName(document->mimeType()).filterString();
- return getSaveFileName(tr("Save File As"),
+ return getSaveFileName(Tr::tr("Save File As"),
fileDialogPath,
filter,
&selectedFilter);
@@ -1036,7 +1035,7 @@ FilePaths DocumentManager::getOpenFileNames(const QString &filters,
QFileDialog::Options options)
{
const FilePath path = pathIn.isEmpty() ? fileDialogInitialDirectory() : pathIn;
- const FilePaths files = FileUtils::getOpenFilePaths(nullptr, tr("Open File"), path, filters,
+ const FilePaths files = FileUtils::getOpenFilePaths(nullptr, Tr::tr("Open File"), path, filters,
selectedFilter, options);
if (!files.isEmpty())
setFileDialogLastVisitedDirectory(files.front().absolutePath());
@@ -1286,7 +1285,7 @@ void DocumentManager::checkForReload()
}
if (!success) {
if (errorString.isEmpty())
- errorStrings << tr("Cannot reload %1").arg(document->filePath().toUserOutput());
+ errorStrings << Tr::tr("Cannot reload %1").arg(document->filePath().toUserOutput());
else
errorStrings << errorString;
}
@@ -1300,7 +1299,7 @@ void DocumentManager::checkForReload()
}
if (!errorStrings.isEmpty())
- QMessageBox::critical(ICore::dialogParent(), tr("File Error"),
+ QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"),
errorStrings.join(QLatin1Char('\n')));
// handle deleted files
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 8e47e5d9aee..684170a9cba 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -1,19 +1,20 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#include "editmode.h"
+
#include "coreconstants.h"
#include "coreicons.h"
-#include "editmode.h"
+#include "coreplugintr.h"
+#include "editormanager/editormanager.h"
+#include "editormanager/ieditor.h"
#include "icore.h"
-#include "modemanager.h"
#include "minisplitter.h"
+#include "modemanager.h"
#include "navigationwidget.h"
#include "outputpane.h"
#include "rightpane.h"
-#include
-#include
-#include
#include
#include
#include
@@ -26,7 +27,7 @@ EditMode::EditMode() :
m_rightSplitWidgetLayout(new QVBoxLayout)
{
setObjectName(QLatin1String("EditMode"));
- setDisplayName(tr("Edit"));
+ setDisplayName(Tr::tr("Edit"));
setIcon(Utils::Icon::modeIcon(Icons::MODE_EDIT_CLASSIC,
Icons::MODE_EDIT_FLAT, Icons::MODE_EDIT_FLAT_ACTIVE));
setPriority(Constants::P_MODE_EDIT);
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 4041ecb1666..ea349270850 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -5,8 +5,9 @@
#include "documentmodel_p.h"
#include "ieditor.h"
-#include
-#include
+#include "../coreplugintr.h"
+#include "../documentmanager.h"
+#include "../idocument.h"
#include
#include
@@ -290,9 +291,9 @@ QVariant DocumentModelPrivate::data(const QModelIndex &index, int role) const
// entry
switch (role) {
case Qt::DisplayRole:
- return tr("");
+ return Tr::tr("");
case Qt::ToolTipRole:
- return tr("No document is selected.");
+ return Tr::tr("No document is selected.");
default:
return QVariant();
}
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 2c450e59ab9..4128cbdc0d7 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -4,42 +4,39 @@
#include "editormanager.h"
#include "editormanager_p.h"
-#include "../coreconstants.h"
-#include "editorwindow.h"
-
-#include "editorview.h"
-#include "openeditorswindow.h"
-#include "openeditorsview.h"
#include "documentmodel.h"
#include "documentmodel_p.h"
+#include "editorview.h"
+#include "editorwindow.h"
#include "ieditor.h"
+#include "openeditorsview.h"
+#include "openeditorswindow.h"
+#include "../actionmanager/actioncontainer.h"
+#include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
+#include "../coreconstants.h"
+#include "../coreplugintr.h"
+#include "../dialogs/openwithdialog.h"
+#include "../dialogs/readonlyfilesdialog.h"
+#include "../diffservice.h"
+#include "../documentmanager.h"
+#include "../editormanager/ieditorfactory.h"
+#include "../editormanager/ieditorfactory_p.h"
+#include "../editormanager/iexternaleditor.h"
+#include "../fileutils.h"
+#include "../find/searchresultitem.h"
+#include "../findplaceholder.h"
+#include "../icore.h"
+#include "../iversioncontrol.h"
+#include "../modemanager.h"
+#include "../outputpane.h"
+#include "../outputpanemanager.h"
+#include "../rightpane.h"
+#include "../settingsdatabase.h"
+#include "../vcsmanager.h"
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
#include
#include
@@ -56,33 +53,30 @@
#include
#include
+#include
+#include
#include
#include
#include
+#include
#include
#include
+#include
#include
+#include
+#include
+#include
#include
#include
#include
#include
+#include
#include
#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
-
#include
#if defined(WITH_TESTS)
-#include
#include
#endif
@@ -110,12 +104,11 @@ static const char scratchBufferKey[] = "_q_emScratchBuffer";
static const int kMaxViews = 20;
-// for lupdate
-using namespace Core;
-
using namespace Core::Internal;
using namespace Utils;
+namespace Core {
+
static void checkEditorFlags(EditorManager::OpenEditorFlags flags)
{
if (flags & EditorManager::OpenInOtherSplit) {
@@ -372,36 +365,36 @@ static void setFocusToEditorViewAndUnmaximizePanes(EditorView *view)
EditorManagerPrivate::EditorManagerPrivate(QObject *parent) :
QObject(parent),
- m_revertToSavedAction(new QAction(EditorManager::tr("Revert to Saved"), this)),
+ m_revertToSavedAction(new QAction(::Core::Tr::tr("Revert to Saved"), this)),
m_saveAction(new QAction(this)),
m_saveAsAction(new QAction(this)),
- m_closeCurrentEditorAction(new QAction(EditorManager::tr("Close"), this)),
- m_closeAllEditorsAction(new QAction(EditorManager::tr("Close All"), this)),
- m_closeOtherDocumentsAction(new QAction(EditorManager::tr("Close Others"), this)),
- m_closeAllEditorsExceptVisibleAction(new QAction(EditorManager::tr("Close All Except Visible"), this)),
- m_gotoNextDocHistoryAction(new QAction(EditorManager::tr("Next Open Document in History"), this)),
- m_gotoPreviousDocHistoryAction(new QAction(EditorManager::tr("Previous Open Document in History"), this)),
- m_goBackAction(new QAction(Utils::Icons::PREV.icon(), EditorManager::tr("Go Back"), this)),
- m_goForwardAction(new QAction(Utils::Icons::NEXT.icon(), EditorManager::tr("Go Forward"), this)),
- m_gotoLastEditAction(new QAction(EditorManager::tr("Go to Last Edit"), this)),
- m_copyFilePathContextAction(new QAction(EditorManager::tr("Copy Full Path"), this)),
- m_copyLocationContextAction(new QAction(EditorManager::tr("Copy Path and Line Number"), this)),
- m_copyFileNameContextAction(new QAction(EditorManager::tr("Copy File Name"), this)),
- m_saveCurrentEditorContextAction(new QAction(EditorManager::tr("&Save"), this)),
- m_saveAsCurrentEditorContextAction(new QAction(EditorManager::tr("Save &As..."), this)),
- m_revertToSavedCurrentEditorContextAction(new QAction(EditorManager::tr("Revert to Saved"), this)),
- m_closeCurrentEditorContextAction(new QAction(EditorManager::tr("Close"), this)),
- m_closeAllEditorsContextAction(new QAction(EditorManager::tr("Close All"), this)),
- m_closeOtherDocumentsContextAction(new QAction(EditorManager::tr("Close Others"), this)),
- m_closeAllEditorsExceptVisibleContextAction(new QAction(EditorManager::tr("Close All Except Visible"), this)),
+ m_closeCurrentEditorAction(new QAction(::Core::Tr::tr("Close"), this)),
+ m_closeAllEditorsAction(new QAction(::Core::Tr::tr("Close All"), this)),
+ m_closeOtherDocumentsAction(new QAction(::Core::Tr::tr("Close Others"), this)),
+ m_closeAllEditorsExceptVisibleAction(new QAction(::Core::Tr::tr("Close All Except Visible"), this)),
+ m_gotoNextDocHistoryAction(new QAction(::Core::Tr::tr("Next Open Document in History"), this)),
+ m_gotoPreviousDocHistoryAction(new QAction(::Core::Tr::tr("Previous Open Document in History"), this)),
+ m_goBackAction(new QAction(Utils::Icons::PREV.icon(), ::Core::Tr::tr("Go Back"), this)),
+ m_goForwardAction(new QAction(Utils::Icons::NEXT.icon(), ::Core::Tr::tr("Go Forward"), this)),
+ m_gotoLastEditAction(new QAction(::Core::Tr::tr("Go to Last Edit"), this)),
+ m_copyFilePathContextAction(new QAction(::Core::Tr::tr("Copy Full Path"), this)),
+ m_copyLocationContextAction(new QAction(::Core::Tr::tr("Copy Path and Line Number"), this)),
+ m_copyFileNameContextAction(new QAction(::Core::Tr::tr("Copy File Name"), this)),
+ m_saveCurrentEditorContextAction(new QAction(::Core::Tr::tr("&Save"), this)),
+ m_saveAsCurrentEditorContextAction(new QAction(::Core::Tr::tr("Save &As..."), this)),
+ m_revertToSavedCurrentEditorContextAction(new QAction(::Core::Tr::tr("Revert to Saved"), this)),
+ m_closeCurrentEditorContextAction(new QAction(::Core::Tr::tr("Close"), this)),
+ m_closeAllEditorsContextAction(new QAction(::Core::Tr::tr("Close All"), this)),
+ m_closeOtherDocumentsContextAction(new QAction(::Core::Tr::tr("Close Others"), this)),
+ m_closeAllEditorsExceptVisibleContextAction(new QAction(::Core::Tr::tr("Close All Except Visible"), this)),
m_openGraphicalShellAction(new QAction(FileUtils::msgGraphicalShellAction(), this)),
m_openGraphicalShellContextAction(new QAction(FileUtils::msgGraphicalShellAction(), this)),
m_showInFileSystemViewAction(new QAction(FileUtils::msgFileSystemAction(), this)),
m_showInFileSystemViewContextAction(new QAction(FileUtils::msgFileSystemAction(), this)),
m_openTerminalAction(new QAction(FileUtils::msgTerminalHereAction(), this)),
m_findInDirectoryAction(new QAction(FileUtils::msgFindInDirectory(), this)),
- m_filePropertiesAction(new QAction(tr("Properties..."), this)),
- m_pinAction(new QAction(tr("Pin"), this))
+ m_filePropertiesAction(new QAction(::Core::Tr::tr("Properties..."), this)),
+ m_pinAction(new QAction(::Core::Tr::tr("Pin"), this))
{
d = this;
}
@@ -445,7 +438,7 @@ void EditorManagerPrivate::init()
Command *cmd = ActionManager::registerAction(m_revertToSavedAction,
Constants::REVERTTOSAVED, editManagerContext);
cmd->setAttribute(Command::CA_UpdateText);
- cmd->setDescription(tr("Revert File to Saved"));
+ cmd->setDescription(::Core::Tr::tr("Revert File to Saved"));
mfile->addAction(cmd, Constants::G_FILE_SAVE);
connect(m_revertToSavedAction, &QAction::triggered, m_instance, &EditorManager::revertToSaved);
@@ -466,7 +459,7 @@ void EditorManagerPrivate::init()
// Close Action
cmd = ActionManager::registerAction(m_closeCurrentEditorAction, Constants::CLOSE, editManagerContext, true);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+W")));
+ cmd->setDefaultKeySequence(QKeySequence(::Core::Tr::tr("Ctrl+W")));
cmd->setAttribute(Command::CA_UpdateText);
cmd->setDescription(m_closeCurrentEditorAction->text());
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
@@ -475,17 +468,17 @@ void EditorManagerPrivate::init()
if (HostOsInfo::isWindowsHost()) {
// workaround for QTCREATORBUG-72
- QAction *action = new QAction(tr("Alternative Close"), this);
+ QAction *action = new QAction(::Core::Tr::tr("Alternative Close"), this);
cmd = ActionManager::registerAction(action, Constants::CLOSE_ALTERNATIVE, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4")));
- cmd->setDescription(EditorManager::tr("Close"));
+ cmd->setDefaultKeySequence(QKeySequence(::Core::Tr::tr("Ctrl+F4")));
+ cmd->setDescription(::Core::Tr::tr("Close"));
connect(action, &QAction::triggered,
m_instance, &EditorManager::slotCloseCurrentEditorOrDocument);
}
// Close All Action
cmd = ActionManager::registerAction(m_closeAllEditorsAction, Constants::CLOSEALL, editManagerContext, true);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+W")));
+ cmd->setDefaultKeySequence(QKeySequence(::Core::Tr::tr("Ctrl+Shift+W")));
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
connect(m_closeAllEditorsAction, &QAction::triggered, m_instance, &EditorManager::closeAllDocuments);
@@ -572,28 +565,28 @@ void EditorManagerPrivate::init()
// Goto Previous In History Action
cmd = ActionManager::registerAction(m_gotoPreviousDocHistoryAction, Constants::GOTOPREVINHISTORY, editDesignContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Alt+Tab") : tr("Ctrl+Tab")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Alt+Tab") : ::Core::Tr::tr("Ctrl+Tab")));
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
connect(m_gotoPreviousDocHistoryAction, &QAction::triggered,
this, &EditorManagerPrivate::gotoPreviousDocHistory);
// Goto Next In History Action
cmd = ActionManager::registerAction(m_gotoNextDocHistoryAction, Constants::GOTONEXTINHISTORY, editDesignContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Alt+Shift+Tab") : tr("Ctrl+Shift+Tab")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Alt+Shift+Tab") : ::Core::Tr::tr("Ctrl+Shift+Tab")));
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
connect(m_gotoNextDocHistoryAction, &QAction::triggered,
this, &EditorManagerPrivate::gotoNextDocHistory);
// Go back in navigation history
cmd = ActionManager::registerAction(m_goBackAction, Constants::GO_BACK, editDesignContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Ctrl+Alt+Left") : tr("Alt+Left")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Ctrl+Alt+Left") : ::Core::Tr::tr("Alt+Left")));
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
connect(m_goBackAction, &QAction::triggered,
m_instance, &EditorManager::goBackInNavigationHistory);
// Go forward in navigation history
cmd = ActionManager::registerAction(m_goForwardAction, Constants::GO_FORWARD, editDesignContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Ctrl+Alt+Right") : tr("Alt+Right")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Ctrl+Alt+Right") : ::Core::Tr::tr("Alt+Right")));
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
connect(m_goForwardAction, &QAction::triggered,
m_instance, &EditorManager::goForwardInNavigationHistory);
@@ -604,57 +597,57 @@ void EditorManagerPrivate::init()
connect(m_gotoLastEditAction, &QAction::triggered,
this, &EditorManagerPrivate::gotoLastEditLocation);
- m_splitAction = new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(), tr("Split"), this);
+ m_splitAction = new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(), ::Core::Tr::tr("Split"), this);
cmd = ActionManager::registerAction(m_splitAction, Constants::SPLIT, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,2") : tr("Ctrl+E,2")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,2") : ::Core::Tr::tr("Ctrl+E,2")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_splitAction, &QAction::triggered, this, [] { split(Qt::Vertical); });
m_splitSideBySideAction = new QAction(Utils::Icons::SPLIT_VERTICAL.icon(),
- tr("Split Side by Side"), this);
+ ::Core::Tr::tr("Split Side by Side"), this);
cmd = ActionManager::registerAction(m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,3") : tr("Ctrl+E,3")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,3") : ::Core::Tr::tr("Ctrl+E,3")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_splitSideBySideAction, &QAction::triggered, m_instance, &EditorManager::splitSideBySide);
- m_splitNewWindowAction = new QAction(tr("Open in New Window"), this);
+ m_splitNewWindowAction = new QAction(::Core::Tr::tr("Open in New Window"), this);
cmd = ActionManager::registerAction(m_splitNewWindowAction, Constants::SPLIT_NEW_WINDOW, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,4") : tr("Ctrl+E,4")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,4") : ::Core::Tr::tr("Ctrl+E,4")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_splitNewWindowAction, &QAction::triggered,
this, [] { splitNewWindow(currentEditorView()); });
- m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
+ m_removeCurrentSplitAction = new QAction(::Core::Tr::tr("Remove Current Split"), this);
cmd = ActionManager::registerAction(m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,0") : tr("Ctrl+E,0")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,0") : ::Core::Tr::tr("Ctrl+E,0")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_removeCurrentSplitAction, &QAction::triggered,
this, &EditorManagerPrivate::removeCurrentSplit);
- m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
+ m_removeAllSplitsAction = new QAction(::Core::Tr::tr("Remove All Splits"), this);
cmd = ActionManager::registerAction(m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,1") : tr("Ctrl+E,1")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,1") : ::Core::Tr::tr("Ctrl+E,1")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_removeAllSplitsAction, &QAction::triggered,
this, &EditorManagerPrivate::removeAllSplits);
- m_gotoPreviousSplitAction = new QAction(tr("Go to Previous Split or Window"), this);
+ m_gotoPreviousSplitAction = new QAction(::Core::Tr::tr("Go to Previous Split or Window"), this);
cmd = ActionManager::registerAction(m_gotoPreviousSplitAction, Constants::GOTO_PREV_SPLIT, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,i") : tr("Ctrl+E,i")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,i") : ::Core::Tr::tr("Ctrl+E,i")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_gotoPreviousSplitAction, &QAction::triggered,
this, &EditorManagerPrivate::gotoPreviousSplit);
- m_gotoNextSplitAction = new QAction(tr("Go to Next Split or Window"), this);
+ m_gotoNextSplitAction = new QAction(::Core::Tr::tr("Go to Next Split or Window"), this);
cmd = ActionManager::registerAction(m_gotoNextSplitAction, Constants::GOTO_NEXT_SPLIT, editManagerContext);
- cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+E,o") : tr("Ctrl+E,o")));
+ cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? ::Core::Tr::tr("Meta+E,o") : ::Core::Tr::tr("Ctrl+E,o")));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_gotoNextSplitAction, &QAction::triggered, this, &EditorManagerPrivate::gotoNextSplit);
ActionContainer *medit = ActionManager::actionContainer(Constants::M_EDIT);
ActionContainer *advancedMenu = ActionManager::createMenu(Constants::M_EDIT_ADVANCED);
medit->addMenu(advancedMenu, Constants::G_EDIT_ADVANCED);
- advancedMenu->menu()->setTitle(tr("Ad&vanced"));
+ advancedMenu->menu()->setTitle(::Core::Tr::tr("Ad&vanced"));
advancedMenu->appendGroup(Constants::G_EDIT_FORMAT);
advancedMenu->appendGroup(Constants::G_EDIT_TEXT);
advancedMenu->appendGroup(Constants::G_EDIT_COLLAPSING);
@@ -693,21 +686,21 @@ void EditorManagerPrivate::init()
d->m_openEditorsFactory = new OpenEditorsViewFactory();
- globalMacroExpander()->registerFileVariables(kCurrentDocumentPrefix, tr("Current document"),
+ globalMacroExpander()->registerFileVariables(kCurrentDocumentPrefix, ::Core::Tr::tr("Current document"),
[] {
IDocument *document = EditorManager::currentDocument();
return document ? document->filePath() : FilePath();
});
globalMacroExpander()->registerIntVariable(kCurrentDocumentXPos,
- tr("X-coordinate of the current editor's upper left corner, relative to screen."),
+ ::Core::Tr::tr("X-coordinate of the current editor's upper left corner, relative to screen."),
[]() -> int {
IEditor *editor = EditorManager::currentEditor();
return editor ? editor->widget()->mapToGlobal(QPoint(0, 0)).x() : 0;
});
globalMacroExpander()->registerIntVariable(kCurrentDocumentYPos,
- tr("Y-coordinate of the current editor's upper left corner, relative to screen."),
+ ::Core::Tr::tr("Y-coordinate of the current editor's upper left corner, relative to screen."),
[]() -> int {
IEditor *editor = EditorManager::currentEditor();
return editor ? editor->widget()->mapToGlobal(QPoint(0, 0)).y() : 0;
@@ -748,8 +741,8 @@ bool EditorManagerPrivate::skipOpeningBigTextFile(const FilePath &filePath)
const double fileSizeInMB = fileSize / 1000.0 / 1000.0;
if (fileSizeInMB > d->m_settings.bigFileSizeLimitInMB
&& fileSize < EditorManager::maxTextFileSize()) {
- const QString title = EditorManager::tr("Continue Opening Huge Text File?");
- const QString text = EditorManager::tr(
+ const QString title = ::Core::Tr::tr("Continue Opening Huge Text File?");
+ const QString text = ::Core::Tr::tr(
"The text file \"%1\" has the size %2MB and might take more memory to open"
" and process than available.\n"
"\n"
@@ -819,8 +812,8 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
}
if (factories.isEmpty()) {
Utils::MimeType mimeType = Utils::mimeTypeForFile(filePath);
- QMessageBox msgbox(QMessageBox::Critical, EditorManager::tr("File Error"),
- tr("Could not open \"%1\": Cannot open files of type \"%2\".")
+ QMessageBox msgbox(QMessageBox::Critical, ::Core::Tr::tr("File Error"),
+ ::Core::Tr::tr("Could not open \"%1\": Cannot open files of type \"%2\".")
.arg(realFp.toUserOutput(), mimeType.name()),
QMessageBox::Ok, ICore::dialogParent());
msgbox.exec();
@@ -858,8 +851,8 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
editor = nullptr;
if (openResult == IDocument::OpenResult::ReadError) {
QMessageBox msgbox(QMessageBox::Critical,
- EditorManager::tr("File Error"),
- tr("Could not open \"%1\" for reading. "
+ ::Core::Tr::tr("File Error"),
+ ::Core::Tr::tr("Could not open \"%1\" for reading. "
"Either the file does not exist or you do not have "
"the permissions to open it.")
.arg(realFp.toUserOutput()),
@@ -879,10 +872,10 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
}
if (errorString.isEmpty())
- errorString = tr("Could not open \"%1\": Unknown error.").arg(realFp.toUserOutput());
+ errorString = ::Core::Tr::tr("Could not open \"%1\": Unknown error.").arg(realFp.toUserOutput());
QMessageBox msgbox(QMessageBox::Critical,
- EditorManager::tr("File Error"),
+ ::Core::Tr::tr("File Error"),
errorString,
QMessageBox::Open | QMessageBox::Cancel,
ICore::dialogParent());
@@ -2042,14 +2035,14 @@ void EditorManagerPrivate::updateMakeWritableWarning()
// we are about to change a read-only file, warn user
if (promptVCS) {
InfoBarEntry info(Id(kMakeWritableWarning),
- tr("Warning: This file was not opened in %1 yet.")
+ ::Core::Tr::tr("Warning: This file was not opened in %1 yet.")
.arg(versionControl->displayName()));
- info.addCustomButton(tr("Open"), &vcsOpenCurrentEditor);
+ info.addCustomButton(::Core::Tr::tr("Open"), &vcsOpenCurrentEditor);
document->infoBar()->addInfo(info);
} else {
InfoBarEntry info(Id(kMakeWritableWarning),
- tr("Warning: You are changing a read-only file."));
- info.addCustomButton(tr("Make Writable"), &makeCurrentEditorWritable);
+ ::Core::Tr::tr("Warning: You are changing a read-only file."));
+ info.addCustomButton(::Core::Tr::tr("Make Writable"), &makeCurrentEditorWritable);
document->infoBar()->addInfo(info);
}
} else {
@@ -2069,15 +2062,15 @@ void EditorManagerPrivate::setupSaveActions(IDocument *document, QAction *saveAc
if (document && !document->displayName().isEmpty()) {
const QString quotedName = QLatin1Char('"')
+ Utils::quoteAmpersands(document->displayName()) + QLatin1Char('"');
- saveAction->setText(tr("&Save %1").arg(quotedName));
- saveAsAction->setText(tr("Save %1 &As...").arg(quotedName));
+ saveAction->setText(::Core::Tr::tr("&Save %1").arg(quotedName));
+ saveAsAction->setText(::Core::Tr::tr("Save %1 &As...").arg(quotedName));
revertToSavedAction->setText(document->isModified()
- ? tr("Revert %1 to Saved").arg(quotedName)
- : tr("Reload %1").arg(quotedName));
+ ? ::Core::Tr::tr("Revert %1 to Saved").arg(quotedName)
+ : ::Core::Tr::tr("Reload %1").arg(quotedName));
} else {
- saveAction->setText(EditorManager::tr("&Save"));
- saveAsAction->setText(EditorManager::tr("Save &As..."));
- revertToSavedAction->setText(EditorManager::tr("Revert to Saved"));
+ saveAction->setText(::Core::Tr::tr("&Save"));
+ saveAsAction->setText(::Core::Tr::tr("Save &As..."));
+ revertToSavedAction->setText(::Core::Tr::tr("Revert to Saved"));
}
}
@@ -2097,10 +2090,11 @@ void EditorManagerPrivate::updateActions()
setupSaveActions(curDocument, d->m_saveAction, d->m_saveAsAction, d->m_revertToSavedAction);
d->m_closeCurrentEditorAction->setEnabled(curDocument);
- d->m_closeCurrentEditorAction->setText(tr("Close %1").arg(quotedName));
+ d->m_closeCurrentEditorAction->setText(::Core::Tr::tr("Close %1").arg(quotedName));
d->m_closeAllEditorsAction->setEnabled(openedCount > 0);
d->m_closeOtherDocumentsAction->setEnabled(openedCount > 1);
- d->m_closeOtherDocumentsAction->setText((openedCount > 1 ? tr("Close All Except %1").arg(quotedName) : tr("Close Others")));
+ d->m_closeOtherDocumentsAction->setText((openedCount > 1 ? ::Core::Tr::tr("Close All Except %1").arg(quotedName)
+ : ::Core::Tr::tr("Close Others")));
d->m_closeAllEditorsExceptVisibleAction->setEnabled(visibleDocumentsCount() < openedCount);
@@ -2290,8 +2284,8 @@ void EditorManagerPrivate::vcsOpenCurrentEditor()
return;
if (!versionControl->vcsOpen(document->filePath())) {
- QMessageBox::warning(ICore::dialogParent(), tr("Cannot Open File"),
- tr("Cannot open the file for editing with VCS."));
+ QMessageBox::warning(ICore::dialogParent(), ::Core::Tr::tr("Cannot Open File"),
+ ::Core::Tr::tr("Cannot open the file for editing with VCS."));
}
}
@@ -2365,7 +2359,7 @@ void EditorManagerPrivate::autoSave()
}
if (!errors.isEmpty())
QMessageBox::critical(ICore::dialogParent(),
- tr("File Error"),
+ ::Core::Tr::tr("File Error"),
errors.join(QLatin1Char('\n')));
emit m_instance->autoSaved();
}
@@ -2569,18 +2563,18 @@ void EditorManagerPrivate::revertToSaved(IDocument *document)
return;
if (document->isModified()) {
QMessageBox msgBox(QMessageBox::Question,
- tr("Revert to Saved"),
- tr("You will lose your current changes if you proceed reverting %1.")
+ ::Core::Tr::tr("Revert to Saved"),
+ ::Core::Tr::tr("You will lose your current changes if you proceed reverting %1.")
.arg(QDir::toNativeSeparators(fileName)),
QMessageBox::Yes | QMessageBox::No,
ICore::dialogParent());
- msgBox.button(QMessageBox::Yes)->setText(tr("Proceed"));
- msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
+ msgBox.button(QMessageBox::Yes)->setText(::Core::Tr::tr("Proceed"));
+ msgBox.button(QMessageBox::No)->setText(::Core::Tr::tr("Cancel"));
QPushButton *diffButton = nullptr;
auto diffService = DiffService::instance();
if (diffService)
- diffButton = msgBox.addButton(tr("Cancel && &Diff"), QMessageBox::RejectRole);
+ diffButton = msgBox.addButton(::Core::Tr::tr("Cancel && &Diff"), QMessageBox::RejectRole);
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No);
@@ -2594,7 +2588,7 @@ void EditorManagerPrivate::revertToSaved(IDocument *document)
}
QString errorString;
if (!document->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents))
- QMessageBox::critical(ICore::dialogParent(), tr("File Error"), errorString);
+ QMessageBox::critical(ICore::dialogParent(), ::Core::Tr::tr("File Error"), errorString);
}
void EditorManagerPrivate::autoSuspendDocuments()
@@ -2887,11 +2881,11 @@ void EditorManager::addSaveAndCloseEditorActions(QMenu *contextMenu, DocumentMod
const QString quotedDisplayName = entry ? Utils::quoteAmpersands(entry->displayName()) : QString();
d->m_closeCurrentEditorContextAction->setText(entry
- ? tr("Close \"%1\"").arg(quotedDisplayName)
- : tr("Close Editor"));
+ ? ::Core::Tr::tr("Close \"%1\"").arg(quotedDisplayName)
+ : ::Core::Tr::tr("Close Editor"));
d->m_closeOtherDocumentsContextAction->setText(entry
- ? tr("Close All Except \"%1\"").arg(quotedDisplayName)
- : tr("Close Other Editors"));
+ ? ::Core::Tr::tr("Close All Except \"%1\"").arg(quotedDisplayName)
+ : ::Core::Tr::tr("Close Other Editors"));
d->m_closeCurrentEditorContextAction->setEnabled(entry != nullptr);
d->m_closeOtherDocumentsContextAction->setEnabled(entry != nullptr);
d->m_closeAllEditorsContextAction->setEnabled(!DocumentModel::entries().isEmpty());
@@ -2912,10 +2906,10 @@ void EditorManager::addPinEditorActions(QMenu *contextMenu, DocumentModel::Entry
const QString quotedDisplayName = entry ? Utils::quoteAmpersands(entry->displayName()) : QString();
if (entry) {
d->m_pinAction->setText(entry->pinned
- ? tr("Unpin \"%1\"").arg(quotedDisplayName)
- : tr("Pin \"%1\"").arg(quotedDisplayName));
+ ? ::Core::Tr::tr("Unpin \"%1\"").arg(quotedDisplayName)
+ : ::Core::Tr::tr("Pin \"%1\"").arg(quotedDisplayName));
} else {
- d->m_pinAction->setText(tr("Pin Editor"));
+ d->m_pinAction->setText(::Core::Tr::tr("Pin Editor"));
}
d->m_pinAction->setEnabled(entry != nullptr);
contextMenu->addAction(d->m_pinAction);
@@ -2940,7 +2934,7 @@ void EditorManager::addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentM
contextMenu->addAction(d->m_openTerminalAction);
contextMenu->addAction(d->m_findInDirectoryAction);
contextMenu->addAction(d->m_filePropertiesAction);
- QMenu *openWith = contextMenu->addMenu(tr("Open With"));
+ QMenu *openWith = contextMenu->addMenu(::Core::Tr::tr("Open With"));
openWith->setEnabled(enabled);
if (enabled)
populateOpenWithMenu(openWith, entry->filePath());
@@ -3223,7 +3217,7 @@ bool EditorManager::openExternalEditor(const FilePath &filePath, Id editorId)
const bool ok = ee->startEditor(filePath, &errorMessage);
QApplication::restoreOverrideCursor();
if (!ok)
- QMessageBox::critical(ICore::dialogParent(), tr("Opening File"), errorMessage);
+ QMessageBox::critical(ICore::dialogParent(), ::Core::Tr::tr("Opening File"), errorMessage);
return ok;
}
@@ -3811,3 +3805,5 @@ void EditorManager::setWindowTitleVcsTopicHandler(WindowTitleHandler handler)
{
d->m_titleVcsTopicHandler = handler;
}
+
+} // Core
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index cae311e24f2..3cbc9b4aec8 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -2,20 +2,20 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "openeditorsview.h"
+
+#include "documentmodel.h"
#include "editormanager.h"
#include "ieditor.h"
-#include "documentmodel.h"
+#include "../actionmanager/command.h"
+#include "../coreplugintr.h"
-#include
-#include
#include
#include
#include
#include
-using namespace Core;
-using namespace Core::Internal;
+namespace Core::Internal {
////
// OpenEditorsWidget
@@ -23,7 +23,7 @@ using namespace Core::Internal;
OpenEditorsWidget::OpenEditorsWidget()
{
- setWindowTitle(tr("Open Documents"));
+ setWindowTitle(Tr::tr("Open Documents"));
setDragEnabled(true);
setDragDropMode(QAbstractItemView::DragOnly);
@@ -111,9 +111,8 @@ void OpenEditorsWidget::contextMenuRequested(QPoint pos)
OpenEditorsViewFactory::OpenEditorsViewFactory()
{
setId("Open Documents");
- setDisplayName(OpenEditorsWidget::tr("Open Documents"));
- setActivationSequence(QKeySequence(useMacShortcuts ? OpenEditorsWidget::tr("Meta+O")
- : OpenEditorsWidget::tr("Alt+O")));
+ setDisplayName(Tr::tr("Open Documents"));
+ setActivationSequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+O") : Tr::tr("Alt+O")));
setPriority(200);
}
@@ -265,3 +264,5 @@ void ProxyModel::sourceRowsAboutToBeInserted(const QModelIndex &parent, int star
int realEnd = parent.isValid() || end == 0 ? end : end - 1;
beginInsertRows(parent, realStart, realEnd);
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h
index 3355bf9f308..0634e45f7d2 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -45,7 +45,6 @@ private:
class OpenEditorsWidget : public OpenDocumentsTreeView
{
- Q_DECLARE_TR_FUNCTIONS(OpenEditorsWidget)
public:
OpenEditorsWidget();
~OpenEditorsWidget() override;
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 1f6922ec6d5..b3e119f3ad9 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -6,7 +6,8 @@
#include "editormanager.h"
#include "editormanager_p.h"
#include "editorview.h"
-#include
+#include "../coreplugintr.h"
+#include "../idocument.h"
#include
#include
@@ -21,8 +22,7 @@
Q_DECLARE_METATYPE(Core::Internal::EditorView*)
Q_DECLARE_METATYPE(Core::IDocument*)
-using namespace Core;
-using namespace Core::Internal;
+namespace Core::Internal {
enum class Role
{
@@ -226,7 +226,7 @@ void OpenEditorsWindow::addItem(DocumentModel::Entry *entry,
QTC_ASSERT(!title.isEmpty(), return);
auto item = new QTreeWidgetItem();
if (entry->document->isModified())
- title += tr("*");
+ title += Tr::tr("*");
item->setIcon(0, !entry->filePath().isEmpty() && entry->document->isFileReadOnly()
? DocumentModel::lockedIcon() : Utils::FileIconProvider::icon(entry->filePath()));
item->setText(0, title);
@@ -240,3 +240,5 @@ void OpenEditorsWindow::addItem(DocumentModel::Entry *entry,
if (m_editorList->topLevelItemCount() == 1)
m_editorList->setCurrentItem(item);
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp
index f7e91cf624f..d54446aa480 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -3,20 +3,22 @@
#include "systemeditor.h"
+#include "../coreplugintr.h"
+
#include
#include
#include
#include
-using namespace Core;
-using namespace Core::Internal;
using namespace Utils;
+namespace Core::Internal {
+
SystemEditor::SystemEditor()
{
setId("CorePlugin.OpenWithSystemEditor");
- setDisplayName(tr("System Editor"));
+ setDisplayName(Tr::tr("System Editor"));
setMimeTypes({"application/octet-stream"});
}
@@ -28,8 +30,10 @@ bool SystemEditor::startEditor(const FilePath &filePath, QString *errorMessage)
url.setScheme(QLatin1String("file"));
if (!QDesktopServices::openUrl(url)) {
if (errorMessage)
- *errorMessage = tr("Could not open URL %1.").arg(url.toString());
+ *errorMessage = Tr::tr("Could not open URL %1.").arg(url.toString());
return false;
}
return true;
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index e4f349bd095..fadfe4cae67 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -3,13 +3,14 @@
#include "editortoolbar.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "actionmanager/actionmanager.h"
+#include "actionmanager/command.h"
+#include "coreplugintr.h"
+#include "editormanager/documentmodel.h"
+#include "editormanager/editormanager.h"
+#include "editormanager/editormanager_p.h"
+#include "editormanager/ieditor.h"
+#include "icore.h"
#include
#include
@@ -72,16 +73,16 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) :
m_lockButton(new QToolButton(q)),
m_dragHandle(new QToolButton(q)),
m_dragHandleMenu(nullptr),
- m_goBackAction(new QAction(Utils::Icons::PREV_TOOLBAR.icon(), EditorManager::tr("Go Back"), parent)),
- m_goForwardAction(new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), EditorManager::tr("Go Forward"), parent)),
+ m_goBackAction(new QAction(Utils::Icons::PREV_TOOLBAR.icon(), Tr::tr("Go Back"), parent)),
+ m_goForwardAction(new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), Tr::tr("Go Forward"), parent)),
m_backButton(new QToolButton(q)),
m_forwardButton(new QToolButton(q)),
m_splitButton(new QToolButton(q)),
m_horizontalSplitAction(new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(),
- EditorManager::tr("Split"), parent)),
+ Tr::tr("Split"), parent)),
m_verticalSplitAction(new QAction(Utils::Icons::SPLIT_VERTICAL.icon(),
- EditorManager::tr("Split Side by Side"), parent)),
- m_splitNewWindowAction(new QAction(EditorManager::tr("Open in New Window"), parent)),
+ Tr::tr("Split Side by Side"), parent)),
+ m_splitNewWindowAction(new QAction(Tr::tr("Open in New Window"), parent)),
m_closeSplitButton(new QToolButton(q)),
m_activeToolBar(nullptr),
m_toolBarPlaceholder(new QWidget(q)),
@@ -109,7 +110,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
d->m_lockButton->setEnabled(false);
d->m_dragHandle->setProperty("noArrow", true);
- d->m_dragHandle->setToolTip(tr("Drag to drag documents between splits"));
+ d->m_dragHandle->setToolTip(Tr::tr("Drag to drag documents between splits"));
d->m_dragHandle->installEventFilter(this);
d->m_dragHandleMenu = new QMenu(d->m_dragHandle);
d->m_dragHandle->setMenu(d->m_dragHandleMenu);
@@ -138,7 +139,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
d->m_forwardButton->setDefaultAction(d->m_goForwardAction);
d->m_splitButton->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
- d->m_splitButton->setToolTip(tr("Split"));
+ d->m_splitButton->setToolTip(Tr::tr("Split"));
d->m_splitButton->setPopupMode(QToolButton::InstantPopup);
d->m_splitButton->setProperty("noArrow", true);
auto splitMenu = new QMenu(d->m_splitButton);
@@ -347,10 +348,10 @@ void EditorToolBar::setCanGoForward(bool canGoForward)
void EditorToolBar::updateActionShortcuts()
{
- d->m_closeEditorButton->setToolTip(ActionManager::command(Constants::CLOSE)->stringWithAppendedShortcut(EditorManager::tr("Close Document")));
+ d->m_closeEditorButton->setToolTip(ActionManager::command(Constants::CLOSE)->stringWithAppendedShortcut(Tr::tr("Close Document")));
d->m_goBackAction->setToolTip(ActionManager::command(Constants::GO_BACK)->action()->toolTip());
d->m_goForwardAction->setToolTip(ActionManager::command(Constants::GO_FORWARD)->action()->toolTip());
- d->m_closeSplitButton->setToolTip(ActionManager::command(Constants::REMOVE_CURRENT_SPLIT)->stringWithAppendedShortcut(tr("Remove Split")));
+ d->m_closeSplitButton->setToolTip(ActionManager::command(Constants::REMOVE_CURRENT_SPLIT)->stringWithAppendedShortcut(Tr::tr("Remove Split")));
}
void EditorToolBar::checkDocumentStatus(IDocument *document)
@@ -383,12 +384,12 @@ void EditorToolBar::updateDocumentStatus(IDocument *document)
const static QIcon locked = Utils::Icons::LOCKED_TOOLBAR.icon();
d->m_lockButton->setIcon(locked);
d->m_lockButton->setEnabled(true);
- d->m_lockButton->setToolTip(tr("Make Writable"));
+ d->m_lockButton->setToolTip(Tr::tr("Make Writable"));
} else {
const static QIcon unlocked = Utils::Icons::UNLOCKED_TOOLBAR.icon();
d->m_lockButton->setIcon(unlocked);
d->m_lockButton->setEnabled(false);
- d->m_lockButton->setToolTip(tr("File is writable"));
+ d->m_lockButton->setToolTip(Tr::tr("File is writable"));
}
if (document->filePath().isEmpty())
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index d375ef1c806..bfac272b3d5 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -2,14 +2,14 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "externaltool.h"
-#include "externaltoolmanager.h"
+#include "coreplugintr.h"
+#include "externaltoolmanager.h"
#include "icore.h"
#include "idocument.h"
#include "messagemanager.h"
#include "documentmanager.h"
#include "editormanager/editormanager.h"
-#include "editormanager/ieditor.h"
#include
@@ -308,7 +308,7 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
}
} else {
if (*currentLocale < 0 && currentText->isEmpty()) {
- *currentText = QCoreApplication::translate("Core::ExternalTool",
+ *currentText = QCoreApplication::translate("::Core",
reader->readElementText().toUtf8().constData(),
"");
} else {
@@ -591,7 +591,7 @@ bool ExternalToolRunner::resolve()
if (m_resolvedExecutable.isEmpty()) {
m_hasError = true;
for (int i = 0; i < expandedExecutables.size(); ++i) {
- m_errorString += tr("Could not find executable for \"%1\" (expanded \"%2\")")
+ m_errorString += Tr::tr("Could not find executable for \"%1\" (expanded \"%2\")")
.arg(m_tool->executables().at(i).toUserOutput(),
expandedExecutables.at(i).toUserOutput());
m_errorString += QLatin1Char('\n');
@@ -643,7 +643,7 @@ void ExternalToolRunner::run()
const auto write = m_tool->outputHandling() == ExternalTool::ShowInPane
? QOverload::of(MessageManager::writeDisrupting)
: QOverload::of(MessageManager::writeSilently);
- write(tr("Starting external tool \"%1\"").arg(cmd.toUserOutput()));
+ write(Tr::tr("Starting external tool \"%1\"").arg(cmd.toUserOutput()));
if (!m_resolvedInput.isEmpty())
m_process->setWriteData(m_resolvedInput.toLocal8Bit());
m_process->start();
@@ -657,8 +657,8 @@ void ExternalToolRunner::done()
ExternalToolManager::emitReplaceSelectionRequested(m_processOutput);
}
const QString message = (m_process->result() == ProcessResult::FinishedWithSuccess)
- ? tr("\"%1\" finished").arg(m_resolvedExecutable.toUserOutput())
- : tr("\"%1\" finished with error").arg(m_resolvedExecutable.toUserOutput());
+ ? Tr::tr("\"%1\" finished").arg(m_resolvedExecutable.toUserOutput())
+ : Tr::tr("\"%1\" finished with error").arg(m_resolvedExecutable.toUserOutput());
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFilePath);
diff --git a/src/plugins/coreplugin/externaltoolmanager.cpp b/src/plugins/coreplugin/externaltoolmanager.cpp
index dc2231529e1..0a42bfc9ab7 100644
--- a/src/plugins/coreplugin/externaltoolmanager.cpp
+++ b/src/plugins/coreplugin/externaltoolmanager.cpp
@@ -2,8 +2,10 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "externaltoolmanager.h"
+
#include "externaltool.h"
#include "coreconstants.h"
+#include "coreplugintr.h"
#include "icontext.h"
#include "icore.h"
#include "messagemanager.h"
@@ -55,7 +57,7 @@ ExternalToolManager::ExternalToolManager()
// add the external tools menu
ActionContainer *mexternaltools = ActionManager::createMenu(Id(Constants::M_TOOLS_EXTERNAL));
- mexternaltools->menu()->setTitle(ExternalToolManager::tr("&External"));
+ mexternaltools->menu()->setTitle(Tr::tr("&External"));
ActionContainer *mtools = ActionManager::actionContainer(Constants::M_TOOLS);
mtools->addMenu(mexternaltools, Constants::G_DEFAULT_THREE);
@@ -105,7 +107,7 @@ void ExternalToolManager::parseDirectory(const QString &directory,
QString error;
ExternalTool *tool = ExternalTool::createFromFile(Utils::FilePath::fromString(fileName), &error, ICore::userInterfaceLanguage());
if (!tool) {
- qWarning() << ExternalTool::tr("Error while parsing external tool %1: %2").arg(fileName, error);
+ qWarning() << Tr::tr("Error while parsing external tool %1: %2").arg(fileName, error);
continue;
}
if (tools->contains(tool->id())) {
@@ -114,7 +116,7 @@ void ExternalToolManager::parseDirectory(const QString &directory,
ExternalTool *other = tools->value(tool->id());
other->setPreset(QSharedPointer(tool));
} else {
- qWarning() << ExternalToolManager::tr("Error: External tool in %1 has duplicate id").arg(fileName);
+ qWarning() << Tr::tr("Error: External tool in %1 has duplicate id").arg(fileName);
delete tool;
}
continue;
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index 8fc53f1f1f9..3525d602a6b 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -4,6 +4,7 @@
#include "fileutils.h"
#include "coreconstants.h"
+#include "coreplugintr.h"
#include "documentmanager.h"
#include "editormanager/editormanager.h"
#include "foldernavigationwidget.h"
@@ -47,14 +48,11 @@ namespace Core {
// Show error with option to open settings.
static void showGraphicalShellError(QWidget *parent, const QString &app, const QString &error)
{
- const QString title = QApplication::translate("Core::Internal",
- "Launching a file browser failed");
- const QString msg = QApplication::translate("Core::Internal",
- "Unable to start the file manager:\n\n%1\n\n").arg(app);
+ const QString title = Tr::tr("Launching a file browser failed");
+ const QString msg = Tr::tr("Unable to start the file manager:\n\n%1\n\n").arg(app);
QMessageBox mbox(QMessageBox::Warning, title, msg, QMessageBox::Close, parent);
if (!error.isEmpty())
- mbox.setDetailedText(QApplication::translate("Core::Internal",
- "\"%1\" returned the following error:\n\n%2").arg(app, error));
+ mbox.setDetailedText(Tr::tr("\"%1\" returned the following error:\n\n%2").arg(app, error));
QAbstractButton *settingsButton = mbox.addButton(Core::ICore::msgShowOptionsDialog(),
QMessageBox::ActionRole);
mbox.exec();
@@ -70,10 +68,8 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
const FilePath explorer = Environment::systemEnvironment().searchInPath(QLatin1String("explorer.exe"));
if (explorer.isEmpty()) {
QMessageBox::warning(parent,
- QApplication::translate("Core::Internal",
- "Launching Windows Explorer Failed"),
- QApplication::translate("Core::Internal",
- "Could not find explorer.exe in path to launch Windows Explorer."));
+ Tr::tr("Launching Windows Explorer Failed"),
+ Tr::tr("Could not find explorer.exe in path to launch Windows Explorer."));
return;
}
QStringList param;
@@ -91,8 +87,7 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
UnixUtils::substituteFileBrowserParameters(app, folder));
QString error;
if (browserArgs.isEmpty()) {
- error = QApplication::translate("Core::Internal",
- "The command for file browser is not set.");
+ error = QApplication::translate("::Core", "The command for file browser is not set.");
} else {
QProcess browserProc;
browserProc.setProgram(browserArgs.takeFirst());
@@ -100,8 +95,7 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
const bool success = browserProc.startDetached();
error = QString::fromLocal8Bit(browserProc.readAllStandardError());
if (!success && error.isEmpty())
- error = QApplication::translate("Core::Internal",
- "Error while starting file browser.");
+ error = QApplication::translate("::Core", "Error while starting file browser.");
}
if (!error.isEmpty())
showGraphicalShellError(parent, app, error);
@@ -184,37 +178,37 @@ void FileUtils::openTerminal(const FilePath &path, const Environment &env)
QString FileUtils::msgFindInDirectory()
{
- return QApplication::translate("Core::Internal", "Find in This Directory...");
+ return Tr::tr("Find in This Directory...");
}
QString FileUtils::msgFileSystemAction()
{
- return QApplication::translate("Core::Internal", "Show in File System View");
+ return Tr::tr("Show in File System View");
}
QString FileUtils::msgGraphicalShellAction()
{
if (HostOsInfo::isWindowsHost())
- return QApplication::translate("Core::Internal", "Show in Explorer");
+ return Tr::tr("Show in Explorer");
if (HostOsInfo::isMacHost())
- return QApplication::translate("Core::Internal", "Show in Finder");
- return QApplication::translate("Core::Internal", "Show Containing Folder");
+ return Tr::tr("Show in Finder");
+ return Tr::tr("Show Containing Folder");
}
QString FileUtils::msgTerminalHereAction()
{
if (HostOsInfo::isWindowsHost())
- return QApplication::translate("Core::Internal", "Open Command Prompt Here");
- return QApplication::translate("Core::Internal", "Open Terminal Here");
+ return Tr::tr("Open Command Prompt Here");
+ return Tr::tr("Open Terminal Here");
}
QString FileUtils::msgTerminalWithAction()
{
if (HostOsInfo::isWindowsHost())
- return QApplication::translate("Core::Internal", "Open Command Prompt With",
- "Opens a submenu for choosing an environment, such as \"Run Environment\"");
- return QApplication::translate("Core::Internal", "Open Terminal With",
- "Opens a submenu for choosing an environment, such as \"Run Environment\"");
+ return Tr::tr("Open Command Prompt With",
+ "Opens a submenu for choosing an environment, such as \"Run Environment\"");
+ return Tr::tr("Open Terminal With",
+ "Opens a submenu for choosing an environment, such as \"Run Environment\"");
}
void FileUtils::removeFiles(const FilePaths &filePaths, bool deleteFromFS)
@@ -232,8 +226,7 @@ void FileUtils::removeFiles(const FilePaths &filePaths, bool deleteFromFS)
continue;
if (!file.remove()) {
MessageManager::writeDisrupting(
- QCoreApplication::translate("Core::Internal", "Failed to remove file \"%1\".")
- .arg(fp.toUserOutput()));
+ Tr::tr("Failed to remove file \"%1\".").arg(fp.toUserOutput()));
}
}
}
@@ -270,8 +263,7 @@ void FileUtils::updateHeaderFileGuardIfApplicable(const Utils::FilePath &oldFile
if (headerUpdateSuccess)
return;
MessageManager::writeDisrupting(
- QCoreApplication::translate("Core::FileUtils",
- "Failed to rename the include guard in file \"%1\".")
+ Tr::tr("Failed to rename the include guard in file \"%1\".")
.arg(newFilePath.toUserOutput()));
}
diff --git a/src/plugins/coreplugin/find/currentdocumentfind.cpp b/src/plugins/coreplugin/find/currentdocumentfind.cpp
index 044c6b08afd..9a8c7864dbd 100644
--- a/src/plugins/coreplugin/find/currentdocumentfind.cpp
+++ b/src/plugins/coreplugin/find/currentdocumentfind.cpp
@@ -3,8 +3,9 @@
#include "currentdocumentfind.h"
+#include "../coreplugintr.h"
+
#include
-#include
#include
#include
@@ -13,9 +14,7 @@
#include
#include
-using namespace Core;
-using namespace Core;
-using namespace Core::Internal;
+namespace Core::Internal {
CurrentDocumentFind::CurrentDocumentFind()
: m_currentFind(nullptr)
@@ -128,7 +127,7 @@ int CurrentDocumentFind::replaceAll(const QString &before, const QString &after,
QTC_CHECK(m_currentWidget);
int count = m_currentFind->replaceAll(before, after, findFlags);
Utils::FadingIndicator::showText(m_currentWidget,
- tr("%n occurrences replaced.", nullptr, count),
+ Tr::tr("%n occurrences replaced.", nullptr, count),
Utils::FadingIndicator::SmallText);
return count;
}
@@ -264,3 +263,5 @@ void CurrentDocumentFind::candidateAggregationChanged()
emit candidateChanged();
}
}
+
+} // Core::Internal
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 95b0021ecc7..3be3c8209e2 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -6,17 +6,15 @@
#include "currentdocumentfind.h"
#include "findtoolbar.h"
#include "findtoolwindow.h"
-#include "searchresultwindow.h"
#include "ifindfilter.h"
-
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
+#include "searchresultwindow.h"
+#include "../actionmanager/actioncontainer.h"
+#include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
+#include "../coreconstants.h"
+#include "../coreplugintr.h"
+#include "../icontext.h"
+#include "../icore.h"
#include
@@ -155,8 +153,6 @@ void CompletionModel::updateCompletion(const QString &text, FindFlags f)
class FindPrivate : public QObject
{
- Q_DECLARE_TR_FUNCTIONS(Core::Find)
-
public:
bool isAnyFilterEnabled() const;
void writeSettings();
@@ -266,7 +262,7 @@ void FindPrivate::setupMenu()
ActionContainer *medit = ActionManager::actionContainer(Constants::M_EDIT);
ActionContainer *mfind = ActionManager::createMenu(Constants::M_FIND);
medit->addMenu(mfind, Constants::G_EDIT_FIND);
- mfind->menu()->setTitle(tr("&Find/Replace"));
+ mfind->menu()->setTitle(Tr::tr("&Find/Replace"));
mfind->appendGroup(Constants::G_FIND_CURRENTDOCUMENT);
mfind->appendGroup(Constants::G_FIND_FILTERS);
mfind->appendGroup(Constants::G_FIND_FLAGS);
@@ -276,12 +272,12 @@ void FindPrivate::setupMenu()
mfind->addSeparator(Constants::G_FIND_ACTIONS);
ActionContainer *mfindadvanced = ActionManager::createMenu(Constants::M_FIND_ADVANCED);
- mfindadvanced->menu()->setTitle(tr("Advanced Find"));
+ mfindadvanced->menu()->setTitle(Tr::tr("Advanced Find"));
mfind->addMenu(mfindadvanced, Constants::G_FIND_FILTERS);
- m_openFindDialog = new QAction(tr("Open Advanced Find..."), this);
- m_openFindDialog->setIconText(tr("Advanced..."));
+ m_openFindDialog = new QAction(Tr::tr("Open Advanced Find..."), this);
+ m_openFindDialog->setIconText(Tr::tr("Advanced..."));
cmd = ActionManager::registerAction(m_openFindDialog, Constants::ADVANCED_FIND);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+F")));
mfindadvanced->addAction(cmd);
connect(m_openFindDialog, &QAction::triggered,
this, [] { Find::openFindDialog(nullptr); });
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 962373f8b47..11c51fe26ea 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -6,15 +6,15 @@
#include "ifindfilter.h"
#include "findplugin.h"
#include "optionspopup.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "../actionmanager/actioncontainer.h"
+#include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
+#include "../coreicons.h"
+#include "../coreplugin.h"
+#include "../coreplugintr.h"
+#include "../findplaceholder.h"
+#include "../icontext.h"
+#include "../icore.h"
#include
#include
@@ -59,10 +59,10 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
m_findIncrementalTimer(this),
m_findStepTimer(this)
{
- setWindowTitle(QCoreApplication::translate("Core::Internal::FindWidget", "Find", nullptr));
+ setWindowTitle(Tr::tr("Find", nullptr));
m_findLabel = new QLabel;
- m_findLabel->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Find:", nullptr));
+ m_findLabel->setText(Tr::tr("Find:", nullptr));
m_findEdit = new FancyLineEdit;
m_findEdit->setObjectName("findEdit");
@@ -98,7 +98,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
m_replaceEdit->setFiltering(true);
m_replaceLabel = new QLabel;
- m_replaceLabel->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Replace with:"));
+ m_replaceLabel->setText(Tr::tr("Replace with:"));
// compensate for a vertically expanding spacer below the label
m_replaceLabel->setMinimumHeight(m_replaceEdit->sizeHint().height());
@@ -106,21 +106,21 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
m_replaceButtonsWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_replaceButton = new QToolButton;
- m_replaceButton->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Replace"));
+ m_replaceButton->setText(Tr::tr("Replace"));
m_replaceButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
m_replaceButton->setArrowType(Qt::LeftArrow);
m_replaceNextButton = new QToolButton;
- m_replaceNextButton->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Replace && Find"));
+ m_replaceNextButton->setText(Tr::tr("Replace && Find"));
m_replaceNextButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
m_replaceNextButton->setArrowType(Qt::RightArrow);
m_replaceAllButton = new QToolButton;
- m_replaceAllButton->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Replace All"));
+ m_replaceAllButton->setText(Tr::tr("Replace All"));
m_replaceAllButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
m_advancedButton = new QToolButton;
- m_advancedButton->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Advanced..."));
+ m_advancedButton->setText(Tr::tr("Advanced..."));
m_advancedButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
auto replaceButtonsLayout = new QHBoxLayout(m_replaceButtonsWidget);
@@ -208,26 +208,26 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
this, &FindToolBar::findCompleterActivated);
auto shiftEnterAction = new QAction(m_findEdit);
- shiftEnterAction->setShortcut(QKeySequence(tr("Shift+Enter")));
+ shiftEnterAction->setShortcut(QKeySequence(Tr::tr("Shift+Enter")));
shiftEnterAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftEnterAction, &QAction::triggered,
this, &FindToolBar::invokeFindPrevious);
m_findEdit->addAction(shiftEnterAction);
auto shiftReturnAction = new QAction(m_findEdit);
- shiftReturnAction->setShortcut(QKeySequence(tr("Shift+Return")));
+ shiftReturnAction->setShortcut(QKeySequence(Tr::tr("Shift+Return")));
shiftReturnAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftReturnAction, &QAction::triggered,
this, &FindToolBar::invokeFindPrevious);
m_findEdit->addAction(shiftReturnAction);
auto shiftEnterReplaceAction = new QAction(m_replaceEdit);
- shiftEnterReplaceAction->setShortcut(QKeySequence(tr("Shift+Enter")));
+ shiftEnterReplaceAction->setShortcut(QKeySequence(Tr::tr("Shift+Enter")));
shiftEnterReplaceAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftEnterReplaceAction, &QAction::triggered,
this, &FindToolBar::invokeReplacePrevious);
m_replaceEdit->addAction(shiftEnterReplaceAction);
auto shiftReturnReplaceAction = new QAction(m_replaceEdit);
- shiftReturnReplaceAction->setShortcut(QKeySequence(tr("Shift+Return")));
+ shiftReturnReplaceAction->setShortcut(QKeySequence(Tr::tr("Shift+Return")));
shiftReturnReplaceAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftReturnReplaceAction, &QAction::triggered,
this, &FindToolBar::invokeReplacePrevious);
@@ -241,8 +241,8 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
ActionContainer *mfind = ActionManager::actionContainer(Constants::M_FIND);
Command *cmd;
- auto advancedAction = new QAction(Find::tr("Open Advanced Find..."), this);
- advancedAction->setIconText(Find::tr("Advanced..."));
+ auto advancedAction = new QAction(Tr::tr("Open Advanced Find..."), this);
+ advancedAction->setIconText(Tr::tr("Advanced..."));
Command *advancedCmd = ActionManager::command(Constants::ADVANCED_FIND);
if (advancedCmd)
advancedCmd->augmentActionWithShortcutToolTip(advancedAction);
@@ -258,7 +258,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
this, &FindToolBar::setFocusToCurrentFindSupport);
QIcon icon = QIcon::fromTheme(QLatin1String("edit-find-replace"));
- m_findInDocumentAction = new QAction(icon, tr("Find/Replace"), this);
+ m_findInDocumentAction = new QAction(icon, Tr::tr("Find/Replace"), this);
cmd = ActionManager::registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT);
cmd->setDefaultKeySequence(QKeySequence::Find);
mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT);
@@ -273,16 +273,16 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
});
if (QApplication::clipboard()->supportsFindBuffer()) {
- m_enterFindStringAction = new QAction(tr("Enter Find String"), this);
+ m_enterFindStringAction = new QAction(Tr::tr("Enter Find String"), this);
cmd = ActionManager::registerAction(m_enterFindStringAction, "Find.EnterFindString");
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+E")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_enterFindStringAction, &QAction::triggered,
this, &FindToolBar::putSelectionToFindClipboard);
connect(QApplication::clipboard(), &QClipboard::findBufferChanged, this, &FindToolBar::updateFromFindClipboard);
}
- m_findNextAction = new QAction(tr("Find Next"), this);
+ m_findNextAction = new QAction(Tr::tr("Find Next"), this);
cmd = ActionManager::registerAction(m_findNextAction, Constants::FIND_NEXT);
cmd->setDefaultKeySequence(QKeySequence::FindNext);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
@@ -293,7 +293,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localFindNextAction, &QAction::triggered, this, &FindToolBar::invokeFindNext);
m_findNextButton->setDefaultAction(m_localFindNextAction);
- m_findPreviousAction = new QAction(tr("Find Previous"), this);
+ m_findPreviousAction = new QAction(Tr::tr("Find Previous"), this);
cmd = ActionManager::registerAction(m_findPreviousAction, Constants::FIND_PREVIOUS);
cmd->setDefaultKeySequence(QKeySequence::FindPrevious);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
@@ -304,22 +304,22 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localFindPreviousAction, &QAction::triggered, this, &FindToolBar::invokeFindPrevious);
m_findPreviousButton->setDefaultAction(m_localFindPreviousAction);
- m_findNextSelectedAction = new QAction(tr("Find Next (Selected)"), this);
+ m_findNextSelectedAction = new QAction(Tr::tr("Find Next (Selected)"), this);
cmd = ActionManager::registerAction(m_findNextSelectedAction, Constants::FIND_NEXT_SELECTED);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F3")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+F3")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_findNextSelectedAction, &QAction::triggered, this, &FindToolBar::findNextSelected);
- m_findPreviousSelectedAction = new QAction(tr("Find Previous (Selected)"), this);
+ m_findPreviousSelectedAction = new QAction(Tr::tr("Find Previous (Selected)"), this);
cmd = ActionManager::registerAction(m_findPreviousSelectedAction, Constants::FIND_PREV_SELECTED);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F3")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+F3")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_findPreviousSelectedAction, &QAction::triggered,
this, &FindToolBar::findPreviousSelected);
- m_selectAllAction = new QAction(tr("Select All"), this);
+ m_selectAllAction = new QAction(Tr::tr("Select All"), this);
cmd = ActionManager::registerAction(m_selectAllAction, Constants::FIND_SELECT_ALL);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+Return")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Return")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_selectAllAction, &QAction::triggered, this, &FindToolBar::selectAll);
m_localSelectAllAction = new QAction(m_selectAllAction->text(), this);
@@ -328,7 +328,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localSelectAllAction, &QAction::triggered, this, &FindToolBar::selectAll);
m_selectAllButton->setDefaultAction(m_localSelectAllAction);
- m_replaceAction = new QAction(tr("Replace"), this);
+ m_replaceAction = new QAction(Tr::tr("Replace"), this);
cmd = ActionManager::registerAction(m_replaceAction, Constants::REPLACE);
cmd->setDefaultKeySequence(QKeySequence());
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
@@ -339,9 +339,9 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localReplaceAction, &QAction::triggered, this, &FindToolBar::invokeReplace);
m_replaceButton->setDefaultAction(m_localReplaceAction);
- m_replaceNextAction = new QAction(tr("Replace && Find"), this);
+ m_replaceNextAction = new QAction(Tr::tr("Replace && Find"), this);
cmd = ActionManager::registerAction(m_replaceNextAction, Constants::REPLACE_NEXT);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+=")));
+ cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+=")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_replaceNextAction, &QAction::triggered, this, &FindToolBar::invokeGlobalReplaceNext);
m_localReplaceNextAction = new QAction(m_replaceNextAction->text(), this);
@@ -351,7 +351,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localReplaceNextAction, &QAction::triggered, this, &FindToolBar::invokeReplaceNext);
m_replaceNextButton->setDefaultAction(m_localReplaceNextAction);
- m_replacePreviousAction = new QAction(tr("Replace && Find Previous"), this);
+ m_replacePreviousAction = new QAction(Tr::tr("Replace && Find Previous"), this);
cmd = ActionManager::registerAction(m_replacePreviousAction, Constants::REPLACE_PREVIOUS);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_replacePreviousAction, &QAction::triggered,
@@ -362,7 +362,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localReplacePreviousAction, &QAction::triggered,
this, &FindToolBar::invokeReplacePrevious);
- m_replaceAllAction = new QAction(tr("Replace All"), this);
+ m_replaceAllAction = new QAction(Tr::tr("Replace All"), this);
cmd = ActionManager::registerAction(m_replaceAllAction, Constants::REPLACE_ALL);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_replaceAllAction, &QAction::triggered, this, &FindToolBar::invokeGlobalReplaceAll);
@@ -372,7 +372,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
connect(m_localReplaceAllAction, &QAction::triggered, this, &FindToolBar::invokeReplaceAll);
m_replaceAllButton->setDefaultAction(m_localReplaceAllAction);
- m_caseSensitiveAction = new QAction(tr("Case Sensitive"), this);
+ m_caseSensitiveAction = new QAction(Tr::tr("Case Sensitive"), this);
m_caseSensitiveAction->setIcon(Icons::FIND_CASE_INSENSITIVELY.icon());
m_caseSensitiveAction->setCheckable(true);
m_caseSensitiveAction->setChecked(false);
@@ -380,7 +380,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
mfind->addAction(cmd, Constants::G_FIND_FLAGS);
connect(m_caseSensitiveAction, &QAction::toggled, this, &FindToolBar::setCaseSensitive);
- m_wholeWordAction = new QAction(tr("Whole Words Only"), this);
+ m_wholeWordAction = new QAction(Tr::tr("Whole Words Only"), this);
m_wholeWordAction->setIcon(Icons::FIND_WHOLE_WORD.icon());
m_wholeWordAction->setCheckable(true);
m_wholeWordAction->setChecked(false);
@@ -388,7 +388,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
mfind->addAction(cmd, Constants::G_FIND_FLAGS);
connect(m_wholeWordAction, &QAction::toggled, this, &FindToolBar::setWholeWord);
- m_regularExpressionAction = new QAction(tr("Use Regular Expressions"), this);
+ m_regularExpressionAction = new QAction(Tr::tr("Use Regular Expressions"), this);
m_regularExpressionAction->setIcon(Icons::FIND_REGEXP.icon());
m_regularExpressionAction->setCheckable(true);
m_regularExpressionAction->setChecked(false);
@@ -396,7 +396,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
mfind->addAction(cmd, Constants::G_FIND_FLAGS);
connect(m_regularExpressionAction, &QAction::toggled, this, &FindToolBar::setRegularExpressions);
- m_preserveCaseAction = new QAction(tr("Preserve Case when Replacing"), this);
+ m_preserveCaseAction = new QAction(Tr::tr("Preserve Case when Replacing"), this);
m_preserveCaseAction->setIcon(Icons::FIND_PRESERVE_CASE.icon());
m_preserveCaseAction->setCheckable(true);
m_preserveCaseAction->setChecked(false);
@@ -527,7 +527,7 @@ void FindToolBar::updateToolBar()
m_findLabel->setEnabled(enabled);
m_findLabel->setVisible(showAllControls);
m_findEdit->setEnabled(enabled);
- m_findEdit->setPlaceholderText(showAllControls ? QString() : tr("Search for..."));
+ m_findEdit->setPlaceholderText(showAllControls ? QString() : Tr::tr("Search for..."));
m_findPreviousButton->setEnabled(enabled);
m_findPreviousButton->setVisible(showAllControls);
m_findNextButton->setEnabled(enabled);
@@ -541,7 +541,7 @@ void FindToolBar::updateToolBar()
m_replaceLabel->setEnabled(replaceEnabled);
m_replaceLabel->setVisible(replaceEnabled && showAllControls);
m_replaceEdit->setEnabled(replaceEnabled);
- m_replaceEdit->setPlaceholderText(showAllControls ? QString() : tr("Replace with..."));
+ m_replaceEdit->setPlaceholderText(showAllControls ? QString() : Tr::tr("Replace with..."));
m_replaceEdit->setVisible(replaceEnabled);
m_replaceButtonsWidget->setVisible(replaceEnabled && showAllControls);
m_advancedButton->setVisible(replaceEnabled && showAllControls);
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index 5edafe9c345..1ab13cdc7c1 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -5,8 +5,8 @@
#include "ifindfilter.h"
#include "findplugin.h"
-
-#include
+#include "../coreplugintr.h"
+#include "../icore.h"
#include
#include
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -36,7 +35,7 @@ static bool validateRegExp(Utils::FancyLineEdit *edit, QString *errorMessage)
{
if (edit->text().isEmpty()) {
if (errorMessage)
- *errorMessage = FindToolWindow::tr("Empty search term.");
+ *errorMessage = Tr::tr("Empty search term.");
return false;
}
if (Find::hasFindFlag(FindRegularExpression)) {
@@ -58,17 +57,17 @@ FindToolWindow::FindToolWindow(QWidget *parent)
m_instance = this;
m_searchButton = new QPushButton(this);
- m_searchButton->setText(QCoreApplication::translate("Core::Internal::FindDialog", "&Search", nullptr));
+ m_searchButton->setText(Tr::tr("&Search", nullptr));
m_searchButton->setDefault(true);
m_replaceButton = new QPushButton(this);
- m_replaceButton->setText(QCoreApplication::translate("Core::Internal::FindDialog", "Search && &Replace", nullptr));
+ m_replaceButton->setText(Tr::tr("Search && &Replace", nullptr));
m_searchTerm = new FancyLineEdit(this);
m_searchTerm->setFiltering(true);
m_searchLabel = new QLabel(this);
- m_searchLabel->setText(QCoreApplication::translate("Core::Internal::FindDialog", "Search f&or:", nullptr));
+ m_searchLabel->setText(Tr::tr("Search f&or:", nullptr));
m_searchLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
m_searchLabel->setBuddy(m_searchTerm);
@@ -79,16 +78,16 @@ FindToolWindow::FindToolWindow(QWidget *parent)
m_optionsWidget = new QWidget(this);
m_matchCase = new QCheckBox(m_optionsWidget);
- m_matchCase->setText(QCoreApplication::translate("Core::Internal::FindDialog", "&Case sensitive", nullptr));
+ m_matchCase->setText(Tr::tr("&Case sensitive", nullptr));
m_wholeWords = new QCheckBox(m_optionsWidget);
- m_wholeWords->setText(QCoreApplication::translate("Core::Internal::FindDialog", "Whole words o&nly", nullptr));
+ m_wholeWords->setText(Tr::tr("Whole words o&nly", nullptr));
m_regExp = new QCheckBox(m_optionsWidget);
- m_regExp->setText(QCoreApplication::translate("Core::Internal::FindDialog", "Use re&gular expressions", nullptr));
+ m_regExp->setText(Tr::tr("Use re&gular expressions", nullptr));
auto label = new QLabel(this);
- label->setText(QCoreApplication::translate("Core::Internal::FindDialog", "Sco&pe:", nullptr));
+ label->setText(Tr::tr("Sco&pe:", nullptr));
label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
label->setMinimumSize(QSize(80, 0));
label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
diff --git a/src/plugins/coreplugin/find/ifindfilter.cpp b/src/plugins/coreplugin/find/ifindfilter.cpp
index 9b57b9307dd..85b8a68be80 100644
--- a/src/plugins/coreplugin/find/ifindfilter.cpp
+++ b/src/plugins/coreplugin/find/ifindfilter.cpp
@@ -3,7 +3,8 @@
#include "ifindfilter.h"
-#include
+#include "../coreicons.h"
+#include "../coreplugintr.h"
#include
#include
@@ -315,18 +316,18 @@ QString IFindFilter::descriptionForFindFlags(FindFlags flags)
{
QStringList flagStrings;
if (flags & FindCaseSensitively)
- flagStrings.append(tr("Case sensitive"));
+ flagStrings.append(Tr::tr("Case sensitive"));
if (flags & FindWholeWords)
- flagStrings.append(tr("Whole words"));
+ flagStrings.append(Tr::tr("Whole words"));
if (flags & FindRegularExpression)
- flagStrings.append(tr("Regular expressions"));
+ flagStrings.append(Tr::tr("Regular expressions"));
if (flags & FindPreserveCase)
- flagStrings.append(tr("Preserve case"));
- QString description = tr("Flags: %1");
+ flagStrings.append(Tr::tr("Preserve case"));
+ QString description = Tr::tr("Flags: %1");
if (flagStrings.isEmpty())
- description = description.arg(tr("None"));
+ description = description.arg(Tr::tr("None"));
else
- description = description.arg(flagStrings.join(tr(", ")));
+ description = description.arg(flagStrings.join(Tr::tr(", ")));
return description;
}
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index 0beb254fcf0..0d590743b5c 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "searchresultwidget.h"
+
#include "searchresulttreeview.h"
#include "searchresulttreemodel.h"
#include "searchresulttreeitems.h"
@@ -9,15 +10,14 @@
#include "findplugin.h"
#include "itemviewfind.h"
+#include "../coreplugintr.h"
#include
-#include
#include
#include
#include
-#include
#include
#include
#include
@@ -139,29 +139,29 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
descriptionLayout->addWidget(m_label);
descriptionLayout->addWidget(m_searchTerm);
m_cancelButton = new QToolButton(topFindWidget);
- m_cancelButton->setText(tr("Cancel"));
+ m_cancelButton->setText(Tr::tr("Cancel"));
m_cancelButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
connect(m_cancelButton, &QAbstractButton::clicked, this, &SearchResultWidget::cancel);
m_searchAgainButton = new QToolButton(topFindWidget);
- m_searchAgainButton->setToolTip(tr("Repeat the search with same parameters."));
- m_searchAgainButton->setText(tr("&Search Again"));
+ m_searchAgainButton->setToolTip(Tr::tr("Repeat the search with same parameters."));
+ m_searchAgainButton->setText(Tr::tr("&Search Again"));
m_searchAgainButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
m_searchAgainButton->setVisible(false);
connect(m_searchAgainButton, &QAbstractButton::clicked, this, &SearchResultWidget::searchAgain);
- m_replaceLabel = new QLabel(tr("Repla&ce with:"), m_topReplaceWidget);
+ m_replaceLabel = new QLabel(Tr::tr("Repla&ce with:"), m_topReplaceWidget);
m_replaceTextEdit = new WideEnoughLineEdit(m_topReplaceWidget);
m_replaceLabel->setBuddy(m_replaceTextEdit);
m_replaceTextEdit->setMinimumWidth(120);
setTabOrder(m_replaceTextEdit, m_searchResultTreeView);
m_preserveCaseCheck = new QCheckBox(m_topReplaceWidget);
- m_preserveCaseCheck->setText(tr("Preser&ve case"));
+ m_preserveCaseCheck->setText(Tr::tr("Preser&ve case"));
m_preserveCaseCheck->setEnabled(false);
m_additionalReplaceWidget = new QWidget(m_topReplaceWidget);
m_additionalReplaceWidget->setVisible(false);
m_replaceButton = new QToolButton(m_topReplaceWidget);
- m_replaceButton->setToolTip(tr("Replace all occurrences."));
- m_replaceButton->setText(tr("&Replace"));
+ m_replaceButton->setToolTip(Tr::tr("Replace all occurrences."));
+ m_replaceButton->setText(Tr::tr("&Replace"));
m_replaceButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
m_replaceButton->setEnabled(false);
@@ -234,7 +234,7 @@ void SearchResultWidget::addResults(const QList &items, Search
if (!m_dontAskAgainGroup.isEmpty()) {
Id undoWarningId = Id("warninglabel/").withSuffix(m_dontAskAgainGroup);
if (m_infoBar.canInfoBeAdded(undoWarningId)) {
- InfoBarEntry info(undoWarningId, tr("This change cannot be undone."),
+ InfoBarEntry info(undoWarningId, Tr::tr("This change cannot be undone."),
InfoBarEntry::GlobalSuppression::Enabled);
m_infoBar.addInfo(info);
}
@@ -252,10 +252,10 @@ void SearchResultWidget::addResults(const QList &items, Search
return;
emit paused(true);
InfoBarEntry info(sizeWarningId,
- tr("The search resulted in more than %n items, do you still want to continue?",
+ Tr::tr("The search resulted in more than %n items, do you still want to continue?",
nullptr, SEARCHRESULT_WARNING_LIMIT));
- info.setCancelButtonInfo(tr("Cancel"), [this] { cancelAfterSizeWarning(); });
- info.addCustomButton(tr("Continue"), [this] { continueAfterSizeWarning(); });
+ info.setCancelButtonInfo(Tr::tr("Cancel"), [this] { cancelAfterSizeWarning(); });
+ info.addCustomButton(Tr::tr("Continue"), [this] { continueAfterSizeWarning(); });
m_infoBar.addInfo(info);
emit requestPopup(false/*no focus*/);
}
@@ -434,7 +434,7 @@ void SearchResultWidget::finishSearch(bool canceled, const QString &reason)
m_preserveCaseCheck->setEnabled(m_count > 0);
m_cancelButton->setVisible(false);
if (canceled)
- m_messageLabel->setText(reason.isEmpty() ? tr("Search was canceled.") : reason);
+ m_messageLabel->setText(reason.isEmpty() ? Tr::tr("Search was canceled.") : reason);
m_messageWidget->setVisible(canceled);
m_searchAgainButton->setVisible(m_searchAgainSupported);
m_searching = false;
@@ -512,11 +512,11 @@ QList SearchResultWidget::checkedItems() const
void SearchResultWidget::updateMatchesFoundLabel()
{
if (m_count > 0) {
- m_matchesFoundLabel->setText(tr("%n matches found.", nullptr, m_count));
+ m_matchesFoundLabel->setText(Tr::tr("%n matches found.", nullptr, m_count));
} else if (m_searching) {
- m_matchesFoundLabel->setText(tr("Searching..."));
+ m_matchesFoundLabel->setText(Tr::tr("Searching..."));
} else {
- m_matchesFoundLabel->setText(tr("No matches found."));
+ m_matchesFoundLabel->setText(Tr::tr("No matches found."));
}
}
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index 30cb40de51a..29c1953a084 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -2,13 +2,15 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "searchresultwindow.h"
+
#include "searchresultwidget.h"
#include "textfindconstants.h"
+#include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
+#include "../coreplugintr.h"
+#include "../icontext.h"
+#include "../icore.h"
-#include
-#include
-#include
-#include
#include
#include
#include
@@ -78,7 +80,6 @@ namespace Internal {
class SearchResultWindowPrivate : public QObject
{
- Q_DECLARE_TR_FUNCTIONS(Core::SearchResultWindow)
public:
SearchResultWindowPrivate(SearchResultWindow *window, QWidget *newSearchPanel);
bool isSearchVisible() const { return m_currentIndex > 0; }
@@ -116,7 +117,7 @@ namespace Internal {
SearchResultWindowPrivate::SearchResultWindowPrivate(SearchResultWindow *window, QWidget *nsp) :
q(window),
m_expandCollapseButton(nullptr),
- m_expandCollapseAction(new QAction(tr("Expand All"), window)),
+ m_expandCollapseAction(new QAction(Tr::tr("Expand All"), window)),
m_spacer(new QWidget),
m_spacer2(new QWidget),
m_widget(new QStackedWidget),
@@ -143,11 +144,11 @@ namespace Internal {
m_expandCollapseButton->setDefaultAction(cmd->action());
m_filterButton = new QToolButton(m_widget);
- m_filterButton->setText(tr("Filter Results"));
+ m_filterButton->setText(Tr::tr("Filter Results"));
m_filterButton->setIcon(Utils::Icons::FILTER.icon());
m_filterButton->setEnabled(false);
- QAction *newSearchAction = new QAction(tr("New Search"), this);
+ QAction *newSearchAction = new QAction(Tr::tr("New Search"), this);
newSearchAction->setIcon(Utils::Icons::NEWSEARCH_TOOLBAR.icon());
cmd = ActionManager::command(Constants::ADVANCED_FIND);
m_newSearchButton = Command::toolButtonWithAppendedShortcut(newSearchAction, cmd);
@@ -478,7 +479,7 @@ SearchResult *SearchResultWindow::startNewSearch(const QString &label,
delete d->m_searchResults.takeLast();
d->m_recentSearchesBox->removeItem(d->m_recentSearchesBox->count() - 1);
}
- d->m_recentSearchesBox->insertItem(1, tr("%1 %2").arg(label, searchTerm));
+ d->m_recentSearchesBox->insertItem(1, Tr::tr("%1 %2").arg(label, searchTerm));
}
auto widget = new SearchResultWidget;
connect(widget, &SearchResultWidget::filterInvalidated, this, [this, widget] {
@@ -601,10 +602,10 @@ void SearchResultWindowPrivate::handleExpandCollapseToolButton(bool checked)
return;
m_searchResultWidgets.at(visibleSearchIndex())->setAutoExpandResults(checked);
if (checked) {
- m_expandCollapseAction->setText(tr("Collapse All"));
+ m_expandCollapseAction->setText(Tr::tr("Collapse All"));
m_searchResultWidgets.at(visibleSearchIndex())->expandAll();
} else {
- m_expandCollapseAction->setText(tr("Expand All"));
+ m_expandCollapseAction->setText(Tr::tr("Expand All"));
m_searchResultWidgets.at(visibleSearchIndex())->collapseAll();
}
}
@@ -618,12 +619,12 @@ void SearchResultWindowPrivate::updateFilterButton()
QList SearchResultWindowPrivate::toolBarWidgets()
{
if (!m_historyLabel)
- m_historyLabel = new QLabel(tr("History:"));
+ m_historyLabel = new QLabel(Tr::tr("History:"));
if (!m_recentSearchesBox) {
m_recentSearchesBox = new QComboBox;
m_recentSearchesBox->setProperty("drawleftborder", true);
m_recentSearchesBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
- m_recentSearchesBox->addItem(tr("New Search"));
+ m_recentSearchesBox->addItem(Tr::tr("New Search"));
connect(m_recentSearchesBox, &QComboBox::activated,
this, &SearchResultWindowPrivate::setCurrentIndexWithFocus);
}
@@ -715,6 +716,14 @@ bool SearchResultWindow::canNavigate() const
return true;
}
+/*!
+ \internal
+*/
+QString SearchResultWindow::displayName() const
+{
+ return Tr::tr("Search Results");
+}
+
/*!
\internal
*/
diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h
index fd69828421e..e8758e657ce 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.h
+++ b/src/plugins/coreplugin/find/searchresultwindow.h
@@ -100,7 +100,6 @@ public:
PreserveCaseDisabled
};
-
SearchResultWindow(QWidget *newSearchPanel);
~SearchResultWindow() override;
static SearchResultWindow *instance();
@@ -108,7 +107,7 @@ public:
QWidget *outputWidget(QWidget *) override;
QList toolBarWidgets() const override;
- QString displayName() const override { return tr("Search Results"); }
+ QString displayName() const override;
int priorityInStatusBar() const override;
void visibilityChanged(bool visible) override;
bool hasFocus() const override;
diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp
index b1b1f132cfe..fc7b86ab177 100644
--- a/src/plugins/coreplugin/foldernavigationwidget.cpp
+++ b/src/plugins/coreplugin/foldernavigationwidget.cpp
@@ -3,18 +3,19 @@
#include "foldernavigationwidget.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "actionmanager/actionmanager.h"
+#include "actionmanager/command.h"
+#include "coreicons.h"
+#include "coreplugintr.h"
+#include "diffservice.h"
+#include "documentmanager.h"
+#include "editormanager/editormanager.h"
+#include "editormanager/ieditor.h"
+#include "fileutils.h"
+#include "icontext.h"
+#include "icore.h"
+#include "idocument.h"
+#include "iwizardfactory.h"
#include
@@ -250,9 +251,9 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent
m_listView(new Utils::NavigationTreeView(this)),
m_fileSystemModel(new FolderNavigationModel(this)),
m_sortProxyModel(new FolderSortProxyModel(m_fileSystemModel)),
- m_filterHiddenFilesAction(new QAction(tr("Show Hidden Files"), this)),
- m_showBreadCrumbsAction(new QAction(tr("Show Bread Crumbs"), this)),
- m_showFoldersOnTopAction(new QAction(tr("Show Folders on Top"), this)),
+ m_filterHiddenFilesAction(new QAction(Tr::tr("Show Hidden Files"), this)),
+ m_showBreadCrumbsAction(new QAction(Tr::tr("Show Bread Crumbs"), this)),
+ m_showFoldersOnTopAction(new QAction(Tr::tr("Show Folders on Top"), this)),
m_toggleSync(new QToolButton(this)),
m_toggleRootSync(new QToolButton(this)),
m_rootSelector(new QComboBox),
@@ -323,11 +324,11 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent
m_toggleSync->setIcon(Utils::Icons::LINK_TOOLBAR.icon());
m_toggleSync->setCheckable(true);
- m_toggleSync->setToolTip(tr("Synchronize with Editor"));
+ m_toggleSync->setToolTip(Tr::tr("Synchronize with Editor"));
m_toggleRootSync->setIcon(Utils::Icons::LINK.icon());
m_toggleRootSync->setCheckable(true);
- m_toggleRootSync->setToolTip(tr("Synchronize Root Directory with Editor"));
+ m_toggleRootSync->setToolTip(Tr::tr("Synchronize Root Directory with Editor"));
selectorLayout->addWidget(m_toggleRootSync);
// connections
@@ -469,7 +470,7 @@ void FolderNavigationWidget::addNewItem()
return;
const auto filePath = Utils::FilePath::fromString(m_fileSystemModel->filePath(current));
const Utils::FilePath path = filePath.isDir() ? filePath : filePath.parentDir();
- Core::ICore::showNewItemDialog(tr("New File", "Title of dialog"),
+ Core::ICore::showNewItemDialog(Tr::tr("New File", "Title of dialog"),
Utils::filtered(Core::IWizardFactory::allWizardFactories(),
Utils::equal(&Core::IWizardFactory::kind,
Core::IWizardFactory::FileWizard)),
@@ -623,7 +624,7 @@ void FolderNavigationWidget::openItem(const QModelIndex &index)
void FolderNavigationWidget::createNewFolder(const QModelIndex &parent)
{
- static const QString baseName = tr("New Folder");
+ static const QString baseName = Tr::tr("New Folder");
// find non-existing name
const QDir dir(m_fileSystemModel->filePath(parent));
const QSet existingItems
@@ -685,7 +686,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
: Utils::FilePath();
if (hasCurrentItem) {
if (!isDir)
- actionOpenFile = menu.addAction(tr("Open \"%1\"").arg(filePath.toUserOutput()));
+ actionOpenFile = menu.addAction(Tr::tr("Open \"%1\"").arg(filePath.toUserOutput()));
emit m_instance->aboutToShowContextMenu(&menu, filePath, isDir);
}
@@ -703,13 +704,13 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
menu.addAction(Core::ActionManager::command(REMOVEFILE)->action());
if (m_fileSystemModel->flags(current) & Qt::ItemIsEditable)
menu.addAction(Core::ActionManager::command(RENAMEFILE)->action());
- newFolder = menu.addAction(tr("New Folder"));
+ newFolder = menu.addAction(Tr::tr("New Folder"));
if (isDir)
- removeFolder = menu.addAction(tr("Remove Folder"));
+ removeFolder = menu.addAction(Tr::tr("Remove Folder"));
}
menu.addSeparator();
- QAction *const collapseAllAction = menu.addAction(tr("Collapse All"));
+ QAction *const collapseAllAction = menu.addAction(Tr::tr("Collapse All"));
QAction *action = menu.exec(ev->globalPos());
if (!action)
@@ -730,7 +731,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
QString errorMessage;
filePath.removeRecursively(&errorMessage);
if (!errorMessage.isEmpty())
- QMessageBox::critical(ICore::dialogParent(), tr("Error"), errorMessage);
+ QMessageBox::critical(ICore::dialogParent(), Tr::tr("Error"), errorMessage);
}
} else if (action == collapseAllAction) {
m_listView->collapseAll();
@@ -772,19 +773,19 @@ bool FolderNavigationWidget::isShowingFoldersOnTop() const
FolderNavigationWidgetFactory::FolderNavigationWidgetFactory()
{
m_instance = this;
- setDisplayName(tr("File System"));
+ setDisplayName(Tr::tr("File System"));
setPriority(400);
setId("File System");
- setActivationSequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+Y,Meta+F")
- : tr("Alt+Y,Alt+F")));
+ setActivationSequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Y,Meta+F")
+ : Tr::tr("Alt+Y,Alt+F")));
insertRootDirectory({QLatin1String("A.Computer"),
0 /*sortValue*/,
- FolderNavigationWidget::tr("Computer"),
+ Tr::tr("Computer"),
Utils::FilePath(),
Core::Icons::DESKTOP_DEVICE_SMALL.icon()});
insertRootDirectory({QLatin1String("A.Home"),
10 /*sortValue*/,
- FolderNavigationWidget::tr("Home"),
+ Tr::tr("Home"),
Utils::FilePath::fromString(QDir::homePath()),
Utils::Icons::HOME.icon()});
updateProjectsDirectoryRoot();
@@ -815,7 +816,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget()
n.widget = fnw;
auto filter = new QToolButton;
filter->setIcon(Utils::Icons::FILTER.icon());
- filter->setToolTip(tr("Options"));
+ filter->setToolTip(Tr::tr("Options"));
filter->setPopupMode(QToolButton::InstantPopup);
filter->setProperty("noArrow", true);
auto filterMenu = new QMenu(filter);
@@ -903,7 +904,7 @@ void FolderNavigationWidgetFactory::updateProjectsDirectoryRoot()
{
insertRootDirectory({QLatin1String(PROJECTSDIRECTORYROOT_ID),
20 /*sortValue*/,
- FolderNavigationWidget::tr("Projects"),
+ Tr::tr("Projects"),
Core::DocumentManager::projectsDirectory(),
Utils::Icons::PROJECT.icon()});
}
@@ -928,21 +929,21 @@ void FolderNavigationWidgetFactory::registerActions()
{
Core::Context context(C_FOLDERNAVIGATIONWIDGET);
- auto add = new QAction(tr("Add New..."), this);
+ auto add = new QAction(Tr::tr("Add New..."), this);
Core::ActionManager::registerAction(add, ADDNEWFILE, context);
connect(add, &QAction::triggered, Core::ICore::instance(), [] {
if (auto navWidget = currentFolderNavigationWidget())
navWidget->addNewItem();
});
- auto rename = new QAction(tr("Rename..."), this);
+ auto rename = new QAction(Tr::tr("Rename..."), this);
Core::ActionManager::registerAction(rename, RENAMEFILE, context);
connect(rename, &QAction::triggered, Core::ICore::instance(), [] {
if (auto navWidget = currentFolderNavigationWidget())
navWidget->editCurrentItem();
});
- auto remove = new QAction(tr("Remove..."), this);
+ auto remove = new QAction(Tr::tr("Remove..."), this);
Core::ActionManager::registerAction(remove, REMOVEFILE, context);
connect(remove, &QAction::triggered, Core::ICore::instance(), [] {
if (auto navWidget = currentFolderNavigationWidget())
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index d1654e4a485..ae5139b95c8 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -41,7 +41,6 @@ const char settingsKeyCodecForLocale[] = "General/OverrideCodecForLocale";
class GeneralSettingsWidget final : public IOptionsPageWidget
{
- Q_DECLARE_TR_FUNCTIONS(Core::Internal::GeneralSettings)
public:
explicit GeneralSettingsWidget(GeneralSettings *q);
@@ -87,37 +86,37 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
m_colorButton->setMinimumSize(QSize(64, 0));
m_colorButton->setProperty("alphaAllowed", QVariant(false));
- m_resetWarningsButton->setText(tr("Reset Warnings", "Button text"));
+ m_resetWarningsButton->setText(Tr::tr("Reset Warnings", "Button text"));
m_resetWarningsButton->setToolTip(
- tr("Re-enable warnings that were suppressed by selecting \"Do Not "
+ Tr::tr("Re-enable warnings that were suppressed by selecting \"Do Not "
"Show Again\" (for example, missing highlighter).",
nullptr));
- auto resetColorButton = new QPushButton(tr("Reset"));
- resetColorButton->setToolTip(tr("Reset to default.", "Color"));
+ auto resetColorButton = new QPushButton(Tr::tr("Reset"));
+ resetColorButton->setToolTip(Tr::tr("Reset to default.", "Color"));
Form form;
- form.addRow({tr("Color:"), m_colorButton, resetColorButton, st});
- form.addRow({tr("Theme:"), m_themeChooser});
- form.addRow({tr("Language:"), m_languageBox, st});
+ form.addRow({Tr::tr("Color:"), m_colorButton, resetColorButton, st});
+ form.addRow({Tr::tr("Theme:"), m_themeChooser});
+ form.addRow({Tr::tr("Language:"), m_languageBox, st});
if (!Utils::HostOsInfo::isMacHost()) {
- auto dpiCheckbox = new QCheckBox(tr("Enable high DPI scaling"));
+ auto dpiCheckbox = new QCheckBox(Tr::tr("Enable high DPI scaling"));
form.addRow({empty, dpiCheckbox});
const bool defaultValue = Utils::HostOsInfo::isWindowsHost();
dpiCheckbox->setChecked(ICore::settings()->value(settingsKeyDPI, defaultValue).toBool());
connect(dpiCheckbox, &QCheckBox::toggled, this, [defaultValue](bool checked) {
ICore::settings()->setValueWithDefault(settingsKeyDPI, checked, defaultValue);
QMessageBox::information(ICore::dialogParent(),
- tr("Restart Required"),
- tr("The high DPI settings will take effect after restart."));
+ Tr::tr("Restart Required"),
+ Tr::tr("The high DPI settings will take effect after restart."));
});
}
form.addRow({empty, m_showShortcutsInContextMenus});
form.addRow(Row{m_resetWarningsButton, st});
- form.addRow({tr("Text codec for tools:"), m_codecBox, st});
- Column{Group{title(tr("User Interface")), form}}.attachTo(this);
+ form.addRow({Tr::tr("Text codec for tools:"), m_codecBox, st});
+ Column{Group{title(Tr::tr("User Interface")), form}}.attachTo(this);
fillLanguageBox();
fillCodecBox();
@@ -126,7 +125,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
m_resetWarningsButton->setEnabled(canResetWarnings());
m_showShortcutsInContextMenus->setText(
- tr("Show keyboard shortcuts in context menus (default: %1)")
+ Tr::tr("Show keyboard shortcuts in context menus (default: %1)")
.arg(q->m_defaultShowShortcutsInContextMenu ? Tr::tr("on") : Tr::tr("off")));
m_showShortcutsInContextMenus->setChecked(GeneralSettings::showShortcutsInContextMenu());
@@ -152,7 +151,7 @@ void GeneralSettingsWidget::fillLanguageBox() const
{
const QString currentLocale = language();
- m_languageBox->addItem(tr(""), QString());
+ m_languageBox->addItem(Tr::tr(""), QString());
// need to add this explicitly, since there is no qm file for English
m_languageBox->addItem(QLatin1String("English"), QLatin1String("C"));
if (currentLocale == QLatin1String("C"))
@@ -234,7 +233,7 @@ void GeneralSettingsWidget::setLanguage(const QString &locale)
QtcSettings *settings = ICore::settings();
if (settings->value(QLatin1String("General/OverrideLanguage")).toString() != locale) {
RestartDialog dialog(ICore::dialogParent(),
- tr("The language change will take effect after restart."));
+ Tr::tr("The language change will take effect after restart."));
dialog.exec();
}
@@ -280,7 +279,7 @@ void GeneralSettings::setShowShortcutsInContextMenu(bool show)
GeneralSettings::GeneralSettings()
{
setId(Constants::SETTINGS_ID_INTERFACE);
- setDisplayName(GeneralSettingsWidget::tr("Interface"));
+ setDisplayName(Tr::tr("Interface"));
setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(Tr::tr("Environment"));
setCategoryIconPath(":/core/images/settingscategory_core.png");
diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp
index 0bc18a7a5a5..35ac4e1fa5b 100644
--- a/src/plugins/coreplugin/generatedfile.cpp
+++ b/src/plugins/coreplugin/generatedfile.cpp
@@ -3,7 +3,8 @@
#include "generatedfile.h"
-#include
+#include "coreplugintr.h"
+#include "editormanager/editormanager.h"
#include
#include
@@ -138,8 +139,7 @@ bool GeneratedFile::write(QString *errorMessage) const
const FilePath parentDir = m_d->path.parentDir();
if (!parentDir.isDir()) {
if (!parentDir.createDir()) {
- *errorMessage = QCoreApplication::translate("BaseFileWizard",
- "Unable to create the directory %1.")
+ *errorMessage = Tr::tr("Unable to create the directory %1.")
.arg(parentDir.toUserOutput());
return false;
}
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index cd46009d3e5..a7cf3debe3a 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -620,10 +620,10 @@ 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("%1 %2%3").arg(QLatin1String(Constants::IDE_DISPLAY_NAME),
- QLatin1String(Constants::IDE_VERSION_DISPLAY),
- ideVersionDescription);
+ ideVersionDescription = Tr::tr(" (%1)").arg(QLatin1String(Constants::IDE_VERSION_LONG));
+ return Tr::tr("%1 %2%3").arg(QLatin1String(Constants::IDE_DISPLAY_NAME),
+ QLatin1String(Constants::IDE_VERSION_DISPLAY),
+ ideVersionDescription);
}
/*!
@@ -631,7 +631,7 @@ QString ICore::versionString()
*/
QString ICore::buildCompatibilityString()
{
- return tr("Based on Qt %1 (%2, %3)").arg(QLatin1String(qVersion()),
+ return Tr::tr("Based on Qt %1 (%2, %3)").arg(QLatin1String(qVersion()),
compilerString(),
QSysInfo::buildCpuArchitecture());
}
diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp
index 0785aef406c..1e8d6ca1f18 100644
--- a/src/plugins/coreplugin/idocument.cpp
+++ b/src/plugins/coreplugin/idocument.cpp
@@ -3,6 +3,8 @@
#include "idocument.h"
+#include "coreplugintr.h"
+
#include
#include