diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 1cbfefd5c71..d7f83d547aa 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -96,8 +96,8 @@ QDebug operator<<(QDebug dgb, const WelcomeMode::WelcomePageData &d)
return dgb;
}
-// Format a title + ruler for projects/session labels
-static inline QString devTitleLabel(const QString &text)
+// Format a title + ruler for title labels
+static inline QString titleLabel(const QString &text)
{
QString rc = QLatin1String(
""
@@ -121,8 +121,13 @@ WelcomeMode::WelcomeMode() :
m_d->rssFetcher = new RSSFetcher(8, this);
m_d->m_welcomePage = new QWidget(m_d->m_widget);
m_d->ui.setupUi(m_d->m_welcomePage);
- m_d->ui.projTitleLabel->setText(devTitleLabel(tr("Projects")));
- m_d->ui.titleLabel->setText(devTitleLabel(tr("Sessions")));
+ m_d->ui.projTitleLabel->setText(titleLabel(tr("Projects")));
+ m_d->ui.recentSessionsTitleLabel->setText(titleLabel(tr("Sessions")));
+ m_d->ui.tutorialsTitleLabel->setText(titleLabel(tr("Tutorials")));
+ m_d->ui.demoTitleLabel->setText(titleLabel(tr("Qt Demos and Examples")));
+ m_d->ui.didYouKnowTitleLabel->setText(titleLabel(tr("Did you know?")));
+ m_d->ui.labsTitleLabel->setText(titleLabel(tr("News from the Qt Labs")));
+ m_d->ui.sitesTitleLabel->setText(titleLabel(tr("Qt Websites")));
m_d->ui.sessTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.projTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.newsTreeWidget->viewport()->setAutoFillBackground(false);
diff --git a/src/plugins/coreplugin/welcomemode.ui b/src/plugins/coreplugin/welcomemode.ui
index 588c700e247..8bdb10eb536 100644
--- a/src/plugins/coreplugin/welcomemode.ui
+++ b/src/plugins/coreplugin/welcomemode.ui
@@ -202,7 +202,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
-
- 1
+ 2
@@ -213,7 +213,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
24
-
-
+
0
@@ -231,15 +231,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Tutorials</span></p>
-<hr /></body></html>
-
+
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -302,7 +294,7 @@ p, li { white-space: pre-wrap; }
-
-
+
0
@@ -320,15 +312,7 @@ p, li { white-space: pre-wrap; }
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Qt Demos and Examples</span></p>
-<hr /></body></html>
-
+
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -361,7 +345,7 @@ p, li { white-space: pre-wrap; }
-
-
+
0
@@ -379,21 +363,13 @@ p, li { white-space: pre-wrap; }
-
-
+
0
0
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Did you know?</span></p>
-<hr /></body></html>
-
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -474,7 +450,7 @@ p, li { white-space: pre-wrap; }
-
-
+
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -661,7 +637,7 @@ p, li { white-space: pre-wrap; }
24
-
-
+
QFrame::NoFrame
@@ -670,21 +646,13 @@ p, li { white-space: pre-wrap; }
-
-
+
0
0
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">News from the Qt Labs</span></p>
-<hr /></body></html>
-
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -747,7 +715,7 @@ p, li { white-space: pre-wrap; }
-
-
+
QFrame::NoFrame
@@ -756,21 +724,13 @@ p, li { white-space: pre-wrap; }
-
-
+
0
0
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Qt Websites</span></p>
-<hr /></body></html>
-
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -908,7 +868,7 @@ p, li { white-space: pre-wrap; }
-
-
+
Qt::Vertical
@@ -924,7 +884,7 @@ p, li { white-space: pre-wrap; }
-
-
+
Qt::Vertical
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 610225d7b23..d232537d4a9 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -2834,6 +2834,11 @@ bool GdbEngine::hasDebuggingHelperForType(const QString &type) const
return m_dumperHelper.type(type) != QtDumperHelper::UnknownType;
}
+static inline QString msgRetrievingWatchData(int pending)
+{
+ return GdbEngine::tr("Retrieving data for watch view (%n requests pending)...", 0, pending);
+}
+
void GdbEngine::runDirectDebuggingHelper(const WatchData &data, bool dumpChildren)
{
Q_UNUSED(dumpChildren);
@@ -2849,9 +2854,7 @@ void GdbEngine::runDirectDebuggingHelper(const WatchData &data, bool dumpChildre
var.setValue(data);
postCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
- q->showStatusMessage(
- tr("Retrieving data for watch view (%1 requests pending)...")
- .arg(m_pendingRequests + 1), 10000);
+ q->showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
}
void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
@@ -2891,9 +2894,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
var.setValue(data);
postCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
- q->showStatusMessage(
- tr("Retrieving data for watch view (%1 requests pending)...")
- .arg(m_pendingRequests + 1), 10000);
+ q->showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
// retrieve response
postCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
@@ -3165,8 +3166,7 @@ void GdbEngine::handleQueryDebuggingHelper(const GdbResultRecord &record, const
// );
} else {
m_debuggingHelperState = DebuggingHelperAvailable;
- q->showStatusMessage(tr("%1 custom dumpers found.")
- .arg(m_dumperHelper.typeCount()));
+ q->showStatusMessage(tr("%n custom dumpers found.", 0, m_dumperHelper.typeCount()));
}
//qDebug() << m_dumperHelper.toString(true);
//qDebug() << m_availableSimpleDebuggingHelpers << "DATA DUMPERS AVAILABLE";
@@ -3448,7 +3448,7 @@ void GdbEngine::handleDebuggingHelperValue3(const GdbResultRecord &record,
} else {
int l = list.size();
//: In string list
- data.setValue(tr("<%1 items>").arg(l));
+ data.setValue(tr("<%n items>", 0, l));
data.setChildCount(list.size());
data.setAllUnneeded();
insertData(data);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 0ddb1bf9d5e..cb5edbd6c37 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -525,21 +525,21 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mproject->addMenu(mpo, Constants::G_PROJECT_BUILD);
// build action
- m_buildProjectOnlyAction = new QAction(tr("Build Project Only"), this);
+ m_buildProjectOnlyAction = new QAction(tr("Build"), this);
cmd = am->registerAction(m_buildProjectOnlyAction, Constants::BUILDPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_buildProjectOnlyAction->text());
mpo->addAction(cmd);
// rebuild action
- m_rebuildProjectOnlyAction = new QAction(tr("Rebuild Project only"), this);
+ m_rebuildProjectOnlyAction = new QAction(tr("Rebuild"), this);
cmd = am->registerAction(m_rebuildProjectOnlyAction, Constants::REBUILDPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_rebuildProjectOnlyAction->text());
mpo->addAction(cmd);
// clean action
- m_cleanProjectOnlyAction = new QAction(tr("Clean Project only"), this);
+ m_cleanProjectOnlyAction = new QAction(tr("Clean"), this);
cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_cleanProjectOnlyAction->text());
@@ -1276,16 +1276,10 @@ void ProjectExplorerPlugin::updateActions()
m_unloadAction->setEnabled(m_currentProject != 0);
if (m_currentProject == 0) {
m_unloadAction->setText(tr("Close Project"));
- m_buildProjectOnlyMenu->setTitle(tr("Project only"));
- m_buildProjectOnlyAction->setText(tr("Build Project only"));
- m_rebuildProjectOnlyAction->setText(tr("Rebuild Project only"));
- m_cleanProjectOnlyAction->setText(tr("Clean Project only"));
+ m_buildProjectOnlyMenu->setTitle(tr("Current Project"));
} else {
m_unloadAction->setText(tr("Close Project \"%1\"").arg(m_currentProject->name()));
- m_buildProjectOnlyMenu->setTitle(tr("Project \"%1\" only").arg(m_currentProject->name()));
- m_buildProjectOnlyAction->setText(tr("Build Project \"%1\" only").arg(m_currentProject->name()));
- m_rebuildProjectOnlyAction->setText(tr("Rebuild Project \"%1\" only").arg(m_currentProject->name()));
- m_cleanProjectOnlyAction->setText(tr("Clean Project \"%1\" only").arg(m_currentProject->name()));
+ m_buildProjectOnlyMenu->setTitle(tr("Project \"%1\"").arg(m_currentProject->name()));
}
m_buildAction->setEnabled(enableBuildActions);