--- Vago/trunk/Vago/packageWizard/packagewizard.h	2013/03/31 19:02:16	771
+++ s10k/Vago/packageWizard/packagewizard.h	2017/12/30 13:43:28	1092
@@ -1,35 +1,26 @@
 #ifndef PACKAGEWIZARD_H
 #define PACKAGEWIZARD_H
 
-#include "logger.h"
+#include "abstractwizard.h"
 #include "packagepage2.h"
 #include "packagepage3.h"
 #include "packagepage4.h"
 #include "packagepagefinal.h"
-#include "zip.h"
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QRect>
-#include <QDesktopWidget>
-#include <QTextStream>
-#include <QSettings>
 
-class PackageWizard
+#include <JlCompress.h>
+
+class PackageWizard: public AbstractWizard // for signals and slots
 {
-public:
-    PackageWizard(QString workspaceWizardLocation,QSettings *vagoSettings, Logger *myLogger);
-    int exec();
 private:
-    QWizardPage *createIntroPage();
-    void copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist);
-    void createPackage(const QWizard &myWizard, PackagePage4 *page4);
-    void checkForZipError(Zip::ErrorCode ec);
-
-    Logger *myLogger;
-    QString workspaceWizardLocation;
     QString packagesLocation;
-    QSettings *vagoSettings;
+    PackagePage4 *page4Pointer = nullptr;
+private:
+    void copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist);
+    void createPackage();
+    void beforeClose(QDialog::DialogCode resultStatus);
+protected:
+    PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger);
+    void exec();
 };
 
 #endif // PACKAGEWIZARD_H