Commit f45fdef4 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

factoring

parent dbf053c3
......@@ -96,8 +96,8 @@ void Plugin_HTMLExport::slotActivate()
GalleryInfo info;
info.readConfig();
QWidget* parent=QApplication::activeWindow();
QPointer<Wizard> wizard = new Wizard(parent, &info, interface);
if (wizard->exec()==QDialog::Rejected)
QPointer<Wizard> wizard = new Wizard(parent, &info);
if (wizard->exec() == QDialog::Rejected)
{
delete wizard;
return;
......
......@@ -224,7 +224,7 @@ struct Wizard::Private
}
};
Wizard::Wizard(QWidget* const parent, GalleryInfo* const info, Interface* const interface)
Wizard::Wizard(QWidget* const parent, GalleryInfo* const info)
: KPWizardDialog(parent)
{
d = new Private;
......@@ -258,28 +258,28 @@ Wizard::Wizard(QWidget* const parent, GalleryInfo* const info, Interface* const
// ---------------------------------------------------------------
d->mCollectionSelector = interface->imageCollectionSelector(this);
d->mCollectionSelector = iface()->imageCollectionSelector(this);
d->mCollectionSelectorPage = addPage(d->mCollectionSelector, i18n("Collection Selection"));
updateCollectionSelectorPageValidity();
connect(d->mCollectionSelector, SIGNAL(selectionChanged()),
SLOT(updateCollectionSelectorPageValidity()));
this, SLOT(updateCollectionSelectorPageValidity()));
d->mThemePage=new ThemePage(this, i18n("Theme"));
d->mThemePage = new ThemePage(this, i18n("Theme"));
d->initThemePage();
connect(d->mThemePage->mThemeList, SIGNAL(itemSelectionChanged()),
this, SLOT(slotThemeSelectionChanged()) );
d->mThemeParametersPage = new ThemeParametersPage(this, i18n("Theme Parameters"));
d->mImageSettingsPage=new ImageSettingsPage(this, i18n("Image Settings"));
d->mOutputPage=new OutputPage(this, i18n("Output"));
d->mImageSettingsPage = new ImageSettingsPage(this, i18n("Image Settings"));
d->mOutputPage = new OutputPage(this, i18n("Output"));
d->mOutputPage->kcfg_destUrl->setMode(KFile::Directory);
connect(d->mOutputPage->kcfg_destUrl, SIGNAL(textChanged(QString)),
this, SLOT(updateFinishPageValidity()) );
d->mConfigManager=new KConfigDialogManager(this, d->mInfo);
d->mConfigManager = new KConfigDialogManager(this, d->mInfo);
d->mConfigManager->updateWidgets();
// Set page states
......
......@@ -51,7 +51,7 @@ class Wizard : public KPWizardDialog
public:
Wizard(QWidget* const parent, GalleryInfo* constinfo, Interface* const);
Wizard(QWidget* const parent, GalleryInfo* constinfo);
~Wizard();
protected Q_SLOTS:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment