Changeset 1061 for Vago/trunk/Vago/bgImageWizard

Timestamp:

Dec 9, 2016, 8:04:18 PM (8 years ago)

Author:

s10k

Message:

Added Vago 1.3

Location:

Vago/trunk/Vago/bgImageWizard

Files:

• bgimagepagefinal.h (modified) (1 diff)
• bgimagewizard.cpp (modified) (3 diffs)
• bgimagewizard.h (modified) (1 diff)

Vago/trunk/Vago/bgImageWizard/bgimagepagefinal.h

@@ -4 +4 @@
 #include <QWizardPage>
 #include <QImage>
+#include <pugixml.hpp>
+
 #include "utilvago.h"
-#include "libs/pugixml/pugixml.hpp"
 #include "converter.h"
 

Vago/trunk/Vago/bgImageWizard/bgimagewizard.cpp

@@ -2 +2 @@
 
 BGImageWizard::BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger)
+:AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, true)
 {
     this->appDir = appDir;
@@ -10 +11 @@
 }
 
-int BGImageWizard::exec(){
-
-    QPushButton *restartButton = new QPushButton("Restart");
-    this->myWizard.setButton(QWizard::CustomButton1,restartButton);
-    this->myWizard.setOption(QWizard::HaveCustomButton1, true);
-
-    connect(&this->myWizard, SIGNAL(currentIdChanged(int)), this, SLOT(pageChanged(int)));
-    connect(restartButton, SIGNAL(clicked(bool)), this, SLOT(restartWizard()));
-
-    this->myWizard.setWindowIcon(QIcon(":/new/icons/background_image.png"));
-
-    //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
-#ifdef Q_OS_WIN
-    this->myWizard.resize(640,480);
-#else
-    this->myWizard.resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better
-    // because the components on mac use more space
-#endif
-    QRect position = this->myWizard.frameGeometry();
-    position.moveCenter(QDesktopWidget().availableGeometry().center());
-    this->myWizard.move(position.topLeft());
-    //
+void BGImageWizard::exec(){
 
     BGImagePage2 *page2 = new BGImagePage2(this->myLogger);
@@ -37 +17 @@
     BGImagePageFinal *pageFinal = new BGImagePageFinal(this->appDir, this->myLogger, this->bgImagesLocation);
 
-    this->myWizard.addPage(createIntroPage());
+    this->myWizard.addPage
+    (
+        createIntroPage
+        (
+            "Welcome to the Oni Background Image Wizard.\n"
+            "This wizard will allow you to create in a few and simple steps Oni background images (TXMB) "
+            "that can be used in the menus or as backgrounds screens for the levels."
+        )
+    );
+
     this->myWizard.addPage(page2);
     this->myWizard.addPage(page3);
     this->myWizard.addPage(pageFinal);
 
-    this->myWizard.setWindowTitle("Background Image Wizard");
-
-    if(this->myWizard.exec()){ //modal and wait for finalization
-
-    }
-
-    return 0;
+    showWizard("Background Image Wizard", ":/new/icons/background_image.png");
 }
 
-QWizardPage* BGImageWizard::createIntroPage() {
-    QWizardPage *page = new QWizardPage;
-    page->setTitle("Introduction");
+void BGImageWizard::beforeClose(QDialog::DialogCode){
 
-    QLabel *label = new QLabel("Welcome to the Oni Background Image Wizard.\n"
-                               "This wizard will allow you to create in a few and simple steps Oni background images (TXMB) "
-                               "that can be used in the menus or as backgrounds screens for the levels.");
-    label->setWordWrap(true);
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->addWidget(label);
-    page->setLayout(layout);
-
-    return page;
 }
-
-void BGImageWizard::restartWizard(){
-    this->myWizard.restart();
-}
-
-void BGImageWizard::pageChanged(int pageId){
-    // Last page?
-    if(pageId==3){
-       this->myWizard.setOption(QWizard::HaveCustomButton1, true); // set visible
-       this->myWizard.button(QWizard::BackButton)->setEnabled(false); // disable back button, use restart if needed
-        return;
-    }
-   this->myWizard.setOption(QWizard::HaveCustomButton1, false); // set invisible
-   this->myWizard.button(QWizard::BackButton)->setEnabled(true); // set enable back button
-}

Vago/trunk/Vago/bgImageWizard/bgimagewizard.h

@@ -2 +2 @@
 #define BGIMAGEWIZARD_H
 
-// System includes
-#include <QString>
-#include <QWizard>
-#include <QWizardPage>
-#include <QLabel>
-#include <QDesktopWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
-
 // Local includes
+#include "abstractwizard.h"
 #include "bgimagepage2.h"
 #include "bgimagepage3.h"
 #include "bgimagepagefinal.h"
 
-class BGImageWizard: public QObject // for signals and slots
+class BGImageWizard: public AbstractWizard // for signals and slots
 {
-    Q_OBJECT // for signals and slots
-public:
+protected:
     BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger);
-    int exec();
+    void exec();
 private:
-    QWizard myWizard;
-    QWizardPage *createIntroPage();
-
-    Logger *myLogger;
-    QString workspaceWizardLocation;
     QString bgImagesLocation;
-    QString appDir;
-    QSettings *vagoSettings;
-private slots:
-    void restartWizard();
-    void pageChanged(int pageId);
+private:
+    void beforeClose(QDialog::DialogCode resultStatus);
 };