diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 69ad3a4aec96616d0e009cc3feab912ac3f226d3..30a39d0d7fc2d0df08f5b6935833d3aa81f16e46 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -71,7 +71,7 @@ bool ArtisticStyle::initialize()
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID);
menu->menu()->setTitle(QLatin1String("Artistic Style"));
- m_formatFile = new QAction(tr("Format Current File"), this);
+ m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd
= Core::ActionManager::registerAction(m_formatFile,
Constants::ArtisticStyle::ACTION_FORMATFILE,
@@ -131,7 +131,8 @@ void ArtisticStyle::formatFile()
cfgFileName = m_settings->styleFileName(m_settings->customStyle());
if (cfgFileName.isEmpty()) {
- BeautifierPlugin::showError(tr("Cannot get configuration file for Artistic Style."));
+ BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile(
+ QLatin1String("Artistic Style")));
} else {
BeautifierPlugin::formatCurrentFile(QStringList()
<< m_settings->command()
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
index 457a9e4b8af53ddcf681cbd3584192d35782bbed..2f0c82f240541a55e5d8cf717cabeed1f7994bda 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
@@ -34,6 +34,7 @@
#include "artisticstylesettings.h"
#include "../beautifierconstants.h"
+#include "../beautifierplugin.h"
#include <coreplugin/icore.h>
@@ -51,7 +52,8 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
{
ui->setupUi(this);
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
- ui->command->setPromptDialogTitle(tr("Artistic Style Command"));
+ ui->command->setPromptDialogTitle(
+ BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Artistic Style")));
connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
ui->configurations->setSettings(m_settings);
}
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index 023b950bd568400f937087f8471820775978706f..c3c8bcd34abf3a90426f3ef339a7c207784aa9c4 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -291,6 +291,29 @@ void BeautifierPlugin::showError(const QString &error)
Core::MessageManager::write(tr("ERROR in Beautifier: %1").arg(error.trimmed()));
}
+QString BeautifierPlugin::msgCannotGetConfigurationFile(const QString &command)
+{
+ return tr("Cannot get configuration file for %1.").arg(command);
+}
+
+QString BeautifierPlugin::msgFormatCurrentFile()
+{
+ //: Menu entry
+ return tr("Format Current File");
+}
+
+QString BeautifierPlugin::msgFormatSelectedText()
+{
+ //: Menu entry
+ return tr("Format Selected Text");
+}
+
+QString BeautifierPlugin::msgCommandPromptDialogTitle(const QString &command)
+{
+ //: File dialog title for path chooser when choosing binary
+ return tr("%1 Command").arg(command);
+}
+
} // namespace Internal
} // namespace Beautifier
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h
index 2e4910e042323780647b17521c6c553d53934872..e1b0da5e278722427cc2c1a7f669ae3860ce976a 100644
--- a/src/plugins/beautifier/beautifierplugin.h
+++ b/src/plugins/beautifier/beautifierplugin.h
@@ -56,6 +56,11 @@ public:
static void formatCurrentFile(QStringList command);
static void showError(const QString &error);
+ static QString msgCannotGetConfigurationFile(const QString &command);
+ static QString msgFormatCurrentFile();
+ static QString msgFormatSelectedText();
+ static QString msgCommandPromptDialogTitle(const QString &command);
+
private slots:
void updateActions(Core::IEditor *editor = 0);
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 5c6f929cbb543dfe75883f9e1877c9362587f458..8de29e5ab8d37650c750682f6a123472da86c1ec 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -69,7 +69,7 @@ bool ClangFormat::initialize()
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ClangFormat::MENU_ID);
menu->menu()->setTitle(QLatin1String("ClangFormat"));
- m_formatFile = new QAction(tr("Format Current File"), this);
+ m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd
= Core::ActionManager::registerAction(m_formatFile,
Constants::ClangFormat::ACTION_FORMATFILE,
@@ -77,7 +77,7 @@ bool ClangFormat::initialize()
menu->addAction(cmd);
connect(m_formatFile, SIGNAL(triggered()), this, SLOT(formatFile()));
- m_formatRange = new QAction(tr("Format Selected Text"), this);
+ m_formatRange = new QAction(BeautifierPlugin::msgFormatSelectedText(), this);
cmd = Core::ActionManager::registerAction(m_formatRange,
Constants::ClangFormat::ACTION_FORMATSELECTED,
Core::Context(Core::Constants::C_GLOBAL));
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
index 5ef69a62f4d32eac34f23372707642baeb71b5e1..6dbc167435a10105779986009ea2d81c58b7c6b8 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
@@ -34,6 +34,7 @@
#include "clangformatsettings.h"
#include "../beautifierconstants.h"
+#include "../beautifierplugin.h"
#include <coreplugin/icore.h>
@@ -53,7 +54,8 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
ui->options->setEnabled(false);
ui->predefinedStyle->addItems(m_settings->predefinedStyles());
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
- ui->command->setPromptDialogTitle(tr("Clang Format Command"));
+ ui->command->setPromptDialogTitle(
+ BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Clang Format")));
connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
ui->configurations->setSettings(m_settings);
}
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index dfcaf3fa44d15922577d6e637c7cd64930380ab4..f06925717442f662cf111270199f35a1ae2fd704 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -71,7 +71,7 @@ bool Uncrustify::initialize()
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID);
menu->menu()->setTitle(QLatin1String("Uncrustify"));
- m_formatFile = new QAction(tr("Format Current File"), this);
+ m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd
= Core::ActionManager::registerAction(m_formatFile,
Constants::Uncrustify::ACTION_FORMATFILE,
@@ -126,7 +126,8 @@ void Uncrustify::formatFile()
cfgFileName = m_settings->styleFileName(m_settings->customStyle());
if (cfgFileName.isEmpty()) {
- BeautifierPlugin::showError(tr("Cannot get configuration file for uncrustify."));
+ BeautifierPlugin::showError(
+ BeautifierPlugin::msgCannotGetConfigurationFile(QLatin1String("uncrustify")));
} else {
BeautifierPlugin::formatCurrentFile(QStringList()
<< m_settings->command()
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index 77e25902987354783228333e279bf3031880c46c..9c04e16448426bcd20fb37e4f5289d7974f79bf3 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -34,6 +34,7 @@
#include "uncrustifysettings.h"
#include "../beautifierconstants.h"
+#include "../beautifierplugin.h"
#include <coreplugin/icore.h>
@@ -51,7 +52,8 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
{
ui->setupUi(this);
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
- ui->command->setPromptDialogTitle(tr("Uncrustify Command"));
+ ui->command->setPromptDialogTitle(
+ BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Uncrustify")));
connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
ui->configurations->setSettings(m_settings);
}