Deploy steps: Hide details button if applicable

Task-number: QTCREATORBUG-6674

Change-Id: I3cca8a75b1108f4fede09191cfed76c8fcf44c0e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com>
This commit is contained in:
Nikolai Kosjar
2011-12-09 13:22:57 +01:00
parent d229705d7b
commit 9c7b9fd9f2
6 changed files with 43 additions and 0 deletions

View File

@@ -83,6 +83,8 @@ public:
return QLatin1String("<b>") + displayName() + QLatin1String("</b>"); return QLatin1String("<b>") + displayName() + QLatin1String("</b>");
} }
virtual bool showWidget() const { return false; }
private: private:
Q_SLOT void handleStepToBeRemoved(int step) Q_SLOT void handleStepToBeRemoved(int step)
{ {
@@ -133,6 +135,7 @@ public:
virtual QString displayName() const { virtual QString displayName() const {
return m_buildStep ? m_buildStep.data()->displayName() : QString(); return m_buildStep ? m_buildStep.data()->displayName() : QString();
} }
virtual bool showWidget() const { return false; }
private: private:
const QWeakPointer<const BuildStep> m_buildStep; const QWeakPointer<const BuildStep> m_buildStep;
}; };

View File

@@ -678,6 +678,11 @@ QString S60DeployStepWidget::displayName() const
return tr("Deploy SIS Package"); return tr("Deploy SIS Package");
} }
bool S60DeployStepWidget::showWidget() const
{
return false;
}
// #pragma mark -- S60DeployStepFactory // #pragma mark -- S60DeployStepFactory
S60DeployStepFactory::S60DeployStepFactory(QObject *parent) : S60DeployStepFactory::S60DeployStepFactory(QObject *parent) :

View File

@@ -215,6 +215,7 @@ public:
QString summaryText() const; QString summaryText() const;
QString displayName() const; QString displayName() const;
bool showWidget() const;
}; };
} // Internal } // Internal

View File

@@ -69,6 +69,8 @@ public:
QString displayName() const { return QString(); } QString displayName() const { return QString(); }
bool showWidget() const { return false; }
private: private:
const TarPackageCreationStep * const m_step; const TarPackageCreationStep * const m_step;
}; };

View File

@@ -32,6 +32,7 @@
#include "uploadandinstalltarpackagestep.h" #include "uploadandinstalltarpackagestep.h"
#include "remotelinuxdeployconfiguration.h" #include "remotelinuxdeployconfiguration.h"
#include "remotelinuxdeploystepwidget.h"
#include "remotelinuxpackageinstaller.h" #include "remotelinuxpackageinstaller.h"
#include "tarpackagecreationstep.h" #include "tarpackagecreationstep.h"
@@ -41,11 +42,33 @@ using namespace ProjectExplorer;
namespace RemoteLinux { namespace RemoteLinux {
namespace Internal { namespace Internal {
namespace {
class ConfigWidget : public BuildStepConfigWidget
{
Q_OBJECT
public:
ConfigWidget(UploadAndInstallTarPackageStep *step) : m_widget(step)
{
connect(&m_widget, SIGNAL(updateSummary()), SIGNAL(updateSummary()));
}
~ConfigWidget() {}
private:
QString summaryText() const { return m_widget.summaryText(); }
QString displayName() const { return m_widget.displayName(); }
bool showWidget() const { return false; }
RemoteLinuxDeployStepWidget m_widget;
};
} // anonymous namespace
class UploadAndInstallTarPackageServicePrivate class UploadAndInstallTarPackageServicePrivate
{ {
public: public:
RemoteLinuxTarPackageInstaller installer; RemoteLinuxTarPackageInstaller installer;
}; };
} // namespace Internal } // namespace Internal
using namespace Internal; using namespace Internal;
@@ -99,6 +122,11 @@ bool UploadAndInstallTarPackageStep::initInternal(QString *error)
return m_deployService->isDeploymentPossible(error); return m_deployService->isDeploymentPossible(error);
} }
BuildStepConfigWidget *UploadAndInstallTarPackageStep::createConfigWidget()
{
return new ConfigWidget(this);
}
QString UploadAndInstallTarPackageStep::stepId() QString UploadAndInstallTarPackageStep::stepId()
{ {
return QLatin1String("MaemoUploadAndInstallTarPackageStep"); return QLatin1String("MaemoUploadAndInstallTarPackageStep");
@@ -110,3 +138,5 @@ QString UploadAndInstallTarPackageStep::displayName()
} }
} //namespace RemoteLinux } //namespace RemoteLinux
#include "uploadandinstalltarpackagestep.moc"

View File

@@ -68,6 +68,8 @@ public:
bool initInternal(QString *error = 0); bool initInternal(QString *error = 0);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static QString stepId(); static QString stepId();
static QString displayName(); static QString displayName();