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

ProjectExplorer: Fix translation issues

Browse Source 
Add missing Q_OBJECT macro, use sensible contexts, and use "simpler"
namespace resolution (for QTBUG-64007)

Change-Id: I2417a7a40e8ba0ff4bfdff34d2a4c57d8dcdeb00
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2017-10-23 13:46:54 +02:00
committed by Tobias Hunger
parent 68589a3fbc
commit 19bb8e34f8
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/applicationlauncher.cpp
View File

@@ -57,9 +57,11 @@
*/ */
using namespace Utils; using namespace Utils;
using namespace ProjectExplorer::Internal;
namespace ProjectExplorer { namespace ProjectExplorer {
using namespace Internal;
namespace Internal { namespace Internal {
enum State { Inactive, Run }; enum State { Inactive, Run };

10
src/plugins/projectexplorer/projectwelcomepage.cpp
View File

@@ -233,7 +233,10 @@ protected:
class SessionDelegate : public BaseDelegate class SessionDelegate : public BaseDelegate
{ {
protected: protected:
QString entryType() override { return tr("session", "Appears in \"Open session <name>\""); } QString entryType() override
{
return ProjectWelcomePage::tr("session", "Appears in \"Open session <name>\"");
}
QRect toolTipArea(const QRect &itemRect, const QModelIndex &idx) const override QRect toolTipArea(const QRect &itemRect, const QModelIndex &idx) const override
{ {
// in expanded state bottom contains 'Clone', 'Rename', etc links, where the tool tip // in expanded state bottom contains 'Clone', 'Rename', etc links, where the tool tip
@@ -413,7 +416,10 @@ private:
class ProjectDelegate : public BaseDelegate class ProjectDelegate : public BaseDelegate
{ {
QString entryType() override { return tr("project", "Appears in \"Open project <name>\""); } QString entryType() override
{
return ProjectWelcomePage::tr("project", "Appears in \"Open project <name>\"");
}
int shortcutRole() const override { return ProjectModel::ShortcutRole; } int shortcutRole() const override { return ProjectModel::ShortcutRole; }
public: public:

10
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -988,9 +988,9 @@ void RunControlPrivate::onWorkerStarted(RunWorker *worker)
continueStart(); continueStart();
return; return;
} }
showError(tr("Unexpected run control state %1 when worker %2 started.") showError(RunControl::tr("Unexpected run control state %1 when worker %2 started.")
.arg(stateName(state)) .arg(stateName(state))
.arg(worker->d->id)); .arg(worker->d->id));
} }
void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg) void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
@@ -1576,14 +1576,14 @@ void RunWorkerPrivate::timerEvent(QTimerEvent *ev)
if (startWatchdogCallback) if (startWatchdogCallback)
startWatchdogCallback(); startWatchdogCallback();
else else
q->reportFailure(tr("Worker start timed out.")); q->reportFailure(RunWorker::tr("Worker start timed out."));
return; return;
} }
if (ev->timerId() == stopWatchdogTimerId) { if (ev->timerId() == stopWatchdogTimerId) {
if (stopWatchdogCallback) if (stopWatchdogCallback)
stopWatchdogCallback(); stopWatchdogCallback();
else else
q->reportFailure(tr("Worker stop timed out.")); q->reportFailure(RunWorker::tr("Worker stop timed out."));
return; return;
} }
} }

2
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -517,6 +517,8 @@ private:
class PROJECTEXPLORER_EXPORT SimpleTargetRunner : public RunWorker class PROJECTEXPLORER_EXPORT SimpleTargetRunner : public RunWorker
{ {
Q_OBJECT
public: public:
explicit SimpleTargetRunner(RunControl *runControl); explicit SimpleTargetRunner(RunControl *runControl);