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

Fix untranslated messages

Browse Source 
Change-Id: I21ff7f3f70116944ba08ea18bdeeb258c0984f09
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Sergey Belyashov
2015-04-23 23:57:48 +03:00
parent da2b1cfa4e
commit 31eaf32ab4
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -93,7 +93,7 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt
m_tools << new Uncrustify::Uncrustify(this); m_tools << new Uncrustify::Uncrustify(this);
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
menu->menu()->setTitle(QLatin1String("Beautifier")); menu->menu()->setTitle(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
for (int i = 0, total = m_tools.count(); i < total; ++i) { for (int i = 0, total = m_tools.count(); i < total; ++i) {

3
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -670,7 +670,8 @@ void MainWindow::registerDefaultActions()
// Show Sidebar Action // Show Sidebar Action
m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Constants::ICON_TOGGLE_SIDEBAR)), m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Constants::ICON_TOGGLE_SIDEBAR)),
tr(Constants::TR_SHOW_SIDEBAR), this); QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR),
this);
m_toggleSideBarAction->setCheckable(true); m_toggleSideBarAction->setCheckable(true);
cmd = ActionManager::registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR); cmd = ActionManager::registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR);
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);

5
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -40,6 +40,7 @@
#include "id.h" #include "id.h"
#include "imode.h" #include "imode.h"
#include <QCoreApplication>
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
@@ -222,9 +223,9 @@ void NavigationWidget::updateToggleText()
d->m_toggleSideBarAction->setEnabled(haveData && NavigationWidgetPlaceHolder::m_current); d->m_toggleSideBarAction->setEnabled(haveData && NavigationWidgetPlaceHolder::m_current);
if (isShown()) if (isShown())
d->m_toggleSideBarAction->setToolTip(tr(Constants::TR_HIDE_SIDEBAR)); d->m_toggleSideBarAction->setToolTip(QCoreApplication::translate("Core", Constants::TR_HIDE_SIDEBAR));
else else
d->m_toggleSideBarAction->setToolTip(tr(Constants::TR_SHOW_SIDEBAR)); d->m_toggleSideBarAction->setToolTip(QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR));
} }
void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder) void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder)

10
src/plugins/help/helpwidget.cpp
View File

@@ -54,6 +54,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/styledbar.h> #include <utils/styledbar.h>
#include <QCoreApplication>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QHelpEngine> #include <QHelpEngine>
#include <QHelpSearchEngine> #include <QHelpSearchEngine>
@@ -132,15 +133,18 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
} }
if (style != SideBarWidget) { if (style != SideBarWidget) {
m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)), m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
tr(Core::Constants::TR_SHOW_SIDEBAR), toolBar); QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR),
toolBar);
m_toggleSideBarAction->setCheckable(true); m_toggleSideBarAction->setCheckable(true);
m_toggleSideBarAction->setChecked(false); m_toggleSideBarAction->setChecked(false);
cmd = Core::ActionManager::registerAction(m_toggleSideBarAction, cmd = Core::ActionManager::registerAction(m_toggleSideBarAction,
Core::Constants::TOGGLE_SIDEBAR, context); Core::Constants::TOGGLE_SIDEBAR, context);
connect(m_toggleSideBarAction, &QAction::toggled, m_toggleSideBarAction, connect(m_toggleSideBarAction, &QAction::toggled, m_toggleSideBarAction,
[this](bool checked) { [this](bool checked) {
m_toggleSideBarAction->setText(checked ? tr(Core::Constants::TR_HIDE_SIDEBAR) m_toggleSideBarAction->setText(
: tr(Core::Constants::TR_SHOW_SIDEBAR)); QCoreApplication::translate("Core",
checked ? Core::Constants::TR_HIDE_SIDEBAR
: Core::Constants::TR_SHOW_SIDEBAR));
}); });
addSideBar(); addSideBar();
m_toggleSideBarAction->setChecked(m_sideBar->isVisibleTo(this)); m_toggleSideBarAction->setChecked(m_sideBar->isVisibleTo(this));