From 603d4df7c9bcdf9deac68a77c0ea55e8d0a01d7a Mon Sep 17 00:00:00 2001
From: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Date: Wed, 2 Mar 2011 16:31:15 +0100
Subject: [PATCH] Ovi Store Wizard: Disabled Next button was still visible
replaced by call to isComplete() with a few more signales
---
.../qt-s60/s60publishingbuildsettingspageovi.cpp | 11 +++++------
.../qt-s60/s60publishingbuildsettingspageovi.h | 5 ++++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
index 9ab92478fcb..34150c35a1a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
@@ -71,7 +71,7 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
m_ui->chooseBuildConfigDropDown->addItem(qt4bc->displayName(), QVariant::fromValue(static_cast<ProjectExplorer::BuildConfiguration *>(qt4bc)));
- m_bc = 0;
+ m_bc = NULL;
// todo more intelligent selection? prefer newer versions?
foreach (Qt4BuildConfiguration *qt4bc, list)
@@ -84,17 +84,15 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
m_ui->chooseBuildConfigDropDown->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
int focusedIndex = m_ui->chooseBuildConfigDropDown->findData(QVariant::fromValue(m_bc));
m_ui->chooseBuildConfigDropDown->setCurrentIndex(focusedIndex);
-
m_publisher->setBuildConfiguration(static_cast<Qt4BuildConfiguration *>(m_bc));
-
//change the build configuration if the user changes it
connect(m_ui->chooseBuildConfigDropDown, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigChosen()));
+ connect(this, SIGNAL(buildChosen()), SIGNAL(completeChanged()));
}
-void S60PublishingBuildSettingsPageOvi::initializePage()
+bool S60PublishingBuildSettingsPageOvi::isComplete() const
{
- if (!m_bc)
- wizard()->button(QWizard::NextButton)->setDisabled(true);
+ return (m_bc != NULL);
}
void S60PublishingBuildSettingsPageOvi::buildConfigChosen()
@@ -104,6 +102,7 @@ void S60PublishingBuildSettingsPageOvi::buildConfigChosen()
return;
m_bc = m_ui->chooseBuildConfigDropDown->itemData(currentIndex).value<ProjectExplorer::BuildConfiguration *>();
m_publisher->setBuildConfiguration(static_cast<Qt4BuildConfiguration *>(m_bc));
+ emit buildChosen();
}
S60PublishingBuildSettingsPageOvi::~S60PublishingBuildSettingsPageOvi()
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
index d9f069a253a..000b7063be8 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
@@ -58,7 +58,10 @@ public:
explicit S60PublishingBuildSettingsPageOvi(S60PublisherOvi *publisher, const ProjectExplorer::Project *project, QWidget *parent = 0);
~S60PublishingBuildSettingsPageOvi();
- void initializePage();
+ virtual bool isComplete() const;
+
+signals:
+ void buildChosen();
private slots:
void buildConfigChosen();
--
GitLab