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

Library/Unit Test/Custom Widget Wizard: Add Target page.

Browse Source 
Handle target page correctly. Remove static enumerations
of page ids by member variables to handle differing
page setups. Fix page switching logic in library wizard.

Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2010-03-05 11:24:31 +01:00
parent cba54bf47d
commit dc54e3f46b
8 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
View File

@@ -35,16 +35,16 @@
namespace Qt4ProjectManager {
namespace Internal {
enum { IntroPageId, WidgetsPageId, PluginPageId };
enum { IntroPageId = 0};
CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
const QIcon &icon,
const QList<QWizardPage*> &extensionPages,
QWidget *parent) :
ProjectExplorer::BaseProjectWizardDialog(parent),
BaseQt4ProjectWizardDialog(false, parent),
m_widgetsPage(new CustomWidgetWidgetsWizardPage),
m_pluginPage(new CustomWidgetPluginWizardPage)
m_pluginPage(new CustomWidgetPluginWizardPage),
m_widgetPageId(-1), m_pluginPageId(-1)
{
setWindowIcon(icon);
setWindowTitle(templateName);
@@ -52,8 +52,9 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
setIntroDescription(tr("This wizard generates a Qt4 Designer Custom Widget "
"or a Qt4 Designer Custom Widget Collection project."));
setPage(WidgetsPageId, m_widgetsPage);
setPage(PluginPageId, m_pluginPage);
addTargetsPage(BaseQt4ProjectWizardDialog::desktopTarget());
m_widgetPageId = addPage(m_widgetsPage);
m_pluginPageId = addPage(m_pluginPage);
foreach (QWizardPage *p, extensionPages)
addPage(p);
@@ -73,14 +74,8 @@ void CustomWidgetWizardDialog::setFileNamingParameters(const FileNamingParameter
void CustomWidgetWizardDialog::slotCurrentIdChanged(int id)
{
switch (id) {
case IntroPageId:
case WidgetsPageId:
break;
case PluginPageId:
if (id == m_pluginPageId)
m_pluginPage->init(m_widgetsPage);
break;
}
}
QSharedPointer<PluginOptions> CustomWidgetWizardDialog::pluginOptions() const