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

Beautifier: Add constant for a tool's display name

Browse Source 
Change-Id: I9cc50ad06d7515f5fc82394cbfb71e7327e7d9e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Lorenz Haas
2014-03-05 22:25:48 +01:00
committed by David Schulz
parent 0b7312e8bc
commit 73ec0c5db4
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/beautifier/artisticstyle/artisticstyle.cpp
View File

@@ -69,7 +69,7 @@ ArtisticStyle::~ArtisticStyle()
bool ArtisticStyle::initialize() bool ArtisticStyle::initialize()
{ {
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID);
menu->menu()->setTitle(QLatin1String("Artistic Style")); menu->menu()->setTitle(QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME));
m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd Core::Command *cmd
@@ -132,7 +132,7 @@ void ArtisticStyle::formatFile()
if (cfgFileName.isEmpty()) { if (cfgFileName.isEmpty()) {
BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile(
QLatin1String("Artistic Style"))); QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME)));
} else { } else {
BeautifierPlugin::formatCurrentFile(QStringList() BeautifierPlugin::formatCurrentFile(QStringList()
<< m_settings->command() << m_settings->command()

1
src/plugins/beautifier/artisticstyle/artisticstyleconstants.h
View File

@@ -34,6 +34,7 @@ namespace Beautifier {
namespace Constants { namespace Constants {
namespace ArtisticStyle { namespace ArtisticStyle {
const char DISPLAY_NAME[] = "Artistic Style";
const char ACTION_FORMATFILE[] = "ArtisticStyle.FormatFile"; const char ACTION_FORMATFILE[] = "ArtisticStyle.FormatFile";
const char MENU_ID[] = "ArtisticStyle.Menu"; const char MENU_ID[] = "ArtisticStyle.Menu";
const char OPTION_ID[] = "ArtisticStyle"; const char OPTION_ID[] = "ArtisticStyle";

4
src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
View File

@@ -52,8 +52,8 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
{ {
ui->setupUi(this); ui->setupUi(this);
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->command->setPromptDialogTitle( ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Artistic Style"))); QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME)));
connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool))); connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
ui->configurations->setSettings(m_settings); ui->configurations->setSettings(m_settings);
} }

6
src/plugins/beautifier/uncrustify/uncrustify.cpp
View File

@@ -69,7 +69,7 @@ Uncrustify::~Uncrustify()
bool Uncrustify::initialize() bool Uncrustify::initialize()
{ {
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID);
menu->menu()->setTitle(QLatin1String("Uncrustify")); menu->menu()->setTitle(QLatin1String(Constants::Uncrustify::DISPLAY_NAME));
m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd Core::Command *cmd
@@ -126,8 +126,8 @@ void Uncrustify::formatFile()
cfgFileName = m_settings->styleFileName(m_settings->customStyle()); cfgFileName = m_settings->styleFileName(m_settings->customStyle());
if (cfgFileName.isEmpty()) { if (cfgFileName.isEmpty()) {
BeautifierPlugin::showError( BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile(
BeautifierPlugin::msgCannotGetConfigurationFile(QLatin1String("uncrustify"))); QLatin1String(Constants::Uncrustify::DISPLAY_NAME)));
} else { } else {
BeautifierPlugin::formatCurrentFile(QStringList() BeautifierPlugin::formatCurrentFile(QStringList()
<< m_settings->command() << m_settings->command()

1
src/plugins/beautifier/uncrustify/uncrustifyconstants.h
View File

@@ -34,6 +34,7 @@ namespace Beautifier {
namespace Constants { namespace Constants {
namespace Uncrustify { namespace Uncrustify {
const char DISPLAY_NAME[] = "Uncrustify";
const char ACTION_FORMATFILE[] = "Uncrustify.FormatFile"; const char ACTION_FORMATFILE[] = "Uncrustify.FormatFile";
const char MENU_ID[] = "Uncrustify.Menu"; const char MENU_ID[] = "Uncrustify.Menu";
const char OPTION_ID[] = "Uncrustify"; const char OPTION_ID[] = "Uncrustify";

4
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
View File

@@ -52,8 +52,8 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
{ {
ui->setupUi(this); ui->setupUi(this);
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->command->setPromptDialogTitle( ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Uncrustify"))); QLatin1String(Constants::Uncrustify::DISPLAY_NAME)));
connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool))); connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
ui->configurations->setSettings(m_settings); ui->configurations->setSettings(m_settings);
} }