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

Maemo: Show the name of deploy steps in their associated widgets.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-26 12:40:26 +02:00
parent ddbc717d90
commit 0822c900da
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
View File

@@ -48,6 +48,8 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
using namespace ProjectExplorer;
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {
@@ -57,8 +59,7 @@ MaemoDeployStepWidget::MaemoDeployStepWidget(AbstractLinuxDeviceDeployStep *step
m_step(step) m_step(step)
{ {
ui->setupUi(this); ui->setupUi(this);
ProjectExplorer::BuildStepList * const list BuildStepList * const list = step->maemoDeployConfig()->stepList();
= step->maemoDeployConfig()->stepList();
connect(list, SIGNAL(stepInserted(int)), SIGNAL(updateSummary())); connect(list, SIGNAL(stepInserted(int)), SIGNAL(updateSummary()));
connect(list, SIGNAL(stepMoved(int,int)), SIGNAL(updateSummary())); connect(list, SIGNAL(stepMoved(int,int)), SIGNAL(updateSummary()));
connect(list, SIGNAL(stepRemoved(int)), SIGNAL(updateSummary())); connect(list, SIGNAL(stepRemoved(int)), SIGNAL(updateSummary()));
@@ -96,8 +97,7 @@ void MaemoDeployStepWidget::handleDeviceUpdate()
void MaemoDeployStepWidget::handleStepToBeRemoved(int step) void MaemoDeployStepWidget::handleStepToBeRemoved(int step)
{ {
ProjectExplorer::BuildStepList * const list BuildStepList * const list = m_step->maemoDeployConfig()->stepList();
= m_step->maemoDeployConfig()->stepList();
const AbstractLinuxDeviceDeployStep * const alds const AbstractLinuxDeviceDeployStep * const alds
= dynamic_cast<AbstractLinuxDeviceDeployStep *>(list->steps().at(step)); = dynamic_cast<AbstractLinuxDeviceDeployStep *>(list->steps().at(step));
if (alds && alds == m_step) if (alds && alds == m_step)
@@ -112,8 +112,8 @@ QString MaemoDeployStepWidget::summaryText() const
+ tr("Cannot deploy: %1").arg(error) + tr("Cannot deploy: %1").arg(error)
+ QLatin1String("</font>"); + QLatin1String("</font>");
} }
return tr("<b>Deploy to device</b>: %1") return tr("<b>%1 to device</b>: %2").arg(dynamic_cast<BuildStep *>(m_step)->displayName(),
.arg(MaemoGlobal::deviceConfigurationName(m_step->helper().deviceConfig())); MaemoGlobal::deviceConfigurationName(m_step->helper().deviceConfig()));
} }
QString MaemoDeployStepWidget::displayName() const QString MaemoDeployStepWidget::displayName() const