tr()-fixes for 2.4.

Change-Id: Iaf94e8b634cd68bc8a5eaacc65df47fc40f2b3c7
Reviewed-on: http://codereview.qt-project.org/6173

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

src/plugins/debugger/qml/qmlcppengine.cpp

@@ -571,7 +571,7 @@ void QmlCppEngine::slaveEngineStateChanged
                     notifyInferiorStopOk();
             } else {
                 if (d->m_activeEngine != cppEngine()) {
-                    showStatusMessage(tr("Cpp debugger activated"));
+                    showStatusMessage(tr("C++ debugger activated"));
                     d->m_activeEngine = cppEngine();
                 }
                 switch (state()) {

src/plugins/projectexplorer/projectwelcomepagewidget.cpp

-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
-
-#include "projectwelcomepagewidget.h"
-#include "projectexplorer.h"
-#include "ui_projectwelcomepagewidget.h"
-
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/id.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/dialogs/iwizard.h>
-#include <coreplugin/filemanager.h>
-
-#include <utils/stringutils.h>
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QPair>
-#include <QtGui/QLabel>
-
-#include <QtCore/QDebug>
-
-#define MAX_RECENT_PROJECT_ITEMS 6
-
-#ifdef Q_OS_MAC
-#  define MAX_RECENT_SESSION_ITEMS 8
-#else
-#  define MAX_RECENT_SESSION_ITEMS 9
-#endif
-
-/*!
-    \class ProjectExplorer::Internal::ProjectWelcomePageWidget
-
-   \brief Welcome page listing projects and sessions.
-*/
-
-using namespace ProjectExplorer::Internal;
-
-bool ProjectWelcomePageWidget::WelcomePageData::operator==(const WelcomePageData &rhs) const
-{
-    return previousSession == rhs.previousSession
-        && activeSession   == rhs.activeSession
-        && sessionList     == rhs.sessionList
-        && projectList     == rhs.projectList;
-}
-
-bool ProjectWelcomePageWidget::WelcomePageData::operator!=(const WelcomePageData &rhs) const
-{
-    return previousSession != rhs.previousSession
-        || activeSession   != rhs.activeSession
-        || sessionList     != rhs.sessionList
-        || projectList     != rhs.projectList;
-}
-
-QDebug operator<<(QDebug dgb, const ProjectWelcomePageWidget::WelcomePageData &d)
-{
-    dgb.nospace() << "PreviousSession=" << d.previousSession
-        << " activeSession=" << d.activeSession
-        << " sessionList=" << d.sessionList
-        << " projectList=" << d.projectList;
-    return dgb;
-}
-
-ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ProjectWelcomePageWidget)
-{
-    ui->setupUi(this);
-    updateWelcomePage(WelcomePageData());
-
-    connect(ui->sessTreeWidget, SIGNAL(activated(QString)), SLOT(slotSessionClicked(QString)));
-    connect(ui->projTreeWidget, SIGNAL(activated(QString)), SLOT(slotProjectClicked(QString)));
-    connect(ui->createNewProjectButton, SIGNAL(clicked()), SLOT(slotCreateNewProject()));
-    connect(ui->openProjectButton, SIGNAL(clicked()),
-            ProjectExplorer::ProjectExplorerPlugin::instance(),
-            SLOT(openOpenProjectDialog()));
-    connect(ui->manageSessionsButton, SIGNAL(clicked()), SIGNAL(manageSessions()));
-
-    ui->createNewProjectButton->setIcon(
-            QIcon::fromTheme(QLatin1String("document-new"), ui->createNewProjectButton->icon()));
-    ui->openProjectButton->setIcon(
-            QIcon::fromTheme(QLatin1String("document-open"), ui->openProjectButton->icon()));
-}
-
-ProjectWelcomePageWidget::~ProjectWelcomePageWidget()
-{
-    delete ui;
-}
-
-void ProjectWelcomePageWidget::updateWelcomePage(const WelcomePageData &welcomePageData)
-{
-    // Update only if data are modified
-    if (welcomePageData == lastData)
-        return;
-    lastData = welcomePageData;
-
-    setUpdatesEnabled(false);
-    ui->sessTreeWidget->clear();
-    ui->projTreeWidget->clear();
-
-    if (welcomePageData.sessionList.count() > 0) {
-        int items = 0;
-        foreach (const QString &s, welcomePageData.sessionList) {
-            if (++items > MAX_RECENT_SESSION_ITEMS)
-                break;
-            QString str = s;
-            if (welcomePageData.activeSession.isEmpty()) {
-                if (s == welcomePageData.previousSession)
-                    str = tr("%1 (last session)").arg(s);
-            } else {
-                if (s == welcomePageData.activeSession)
-                    str = tr("%1 (current session)").arg(s);
-            }
-            ui->sessTreeWidget->addItem(str, s);
-        }
-        ui->sessTreeWidget->updateGeometry();
-    }
-
-    typedef QPair<QString, QString> QStringPair;
-    if (welcomePageData.projectList.count() > 0) {
-        int items = 0;
-        QFontMetrics fm = fontMetrics();
-        foreach (const QStringPair &it, welcomePageData.projectList) {
-            if (++items > MAX_RECENT_PROJECT_ITEMS)
-                break;
-            const QFileInfo fi(it.first);
-            QString label = "<b>" + it.second +
-                    "</b><br><font color=gray>" +
-                    fm.elidedText(QDir::toNativeSeparators(Utils::withTildeHomePath(it.first)),
-                                  Qt::ElideMiddle, 250);
-            ui->projTreeWidget->addItem(label, it.first,
-                                        QDir::toNativeSeparators(fi.absolutePath()));
-        }
-        ui->projTreeWidget->updateGeometry();
-    }
-    setUpdatesEnabled(true);
-}
-
-void ProjectWelcomePageWidget::activateEditMode()
-{
-    Core::ModeManager *modeManager = Core::ModeManager::instance();
-    if (modeManager->currentMode() == modeManager->mode(Core::Constants::MODE_WELCOME))
-        modeManager->activateMode(Core::Constants::MODE_EDIT);
-}
-
-void ProjectWelcomePageWidget::slotSessionClicked(const QString &data)
-{
-    emit requestSession(data);
-    activateEditMode();
-}
-
-void ProjectWelcomePageWidget::slotProjectClicked(const QString &data)
-{
-    emit requestProject(data);
-    activateEditMode();
-}
-
-void ProjectWelcomePageWidget::slotCreateNewProject()
-{
-    Core::ICore::instance()->showNewItemDialog(tr("New Project"),
-                                               Core::IWizard::wizardsOfKind(Core::IWizard::ProjectWizard));
-}

src/plugins/projectexplorer/runsettingspropertiespage.cpp

@@ -89,7 +89,7 @@ QString RunSettingsPanelFactory::id() const
 
 QString RunSettingsPanelFactory::displayName() const
 {
-    return tr("Run Settings");
+    return RunSettingsWidget::tr("Run Settings");
 }
 
 bool RunSettingsPanelFactory::supports(Target *target)
@@ -108,8 +108,8 @@ PropertiesPanel *RunSettingsPanelFactory::createPanel(Target *target)
     l->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
     l->setContentsMargins(QMargins());
     panel->setWidget(w);
-    panel->setIcon(QIcon(":/projectexplorer/images/RunSettings.png"));
-    panel->setDisplayName(tr("Run Settings"));
+    panel->setIcon(QIcon(QLatin1String(":/projectexplorer/images/RunSettings.png")));
+    panel->setDisplayName(RunSettingsWidget::tr("Run Settings"));
     return panel;
 }