Merge the installtype, install and locate wizard pages into one page …

…with a QStackedWidget.
ioquake · May 15, 2014 · c32abd4 · c32abd4
1 parent 6da3a41
commit c32abd4
Show file tree

Hide file tree

Showing 17 changed files with 327 additions and 368 deletions.
diff --git a/installwizard.cpp b/installwizard.cpp
@@ -2,10 +2,8 @@
 #include "installwizard.h"
 #include "ui_installwizard.h"
 #include "installwizard_installtype.h"
-#include "installwizard_locate.h"
 #include "installwizard_copy.h"
 #include "installwizard_eula.h"
-#include "installwizard_install.h"
 #include "installwizard_patch.h"
 #include "installwizard_finished.h"
 #include "settings.h"
@@ -26,17 +24,11 @@ InstallWizard::InstallWizard(QWidget *parent, Settings *settings) :
     ui->setupUi(this);
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
 
-    setPage(Page_InstallType, new InstallWizard_InstallType(this));
-
-#ifdef Q_OS_WIN32
-    setPage(Page_Locate, new InstallWizard_LocatePage(this, settings));
-#endif
-
-    setPage(Page_Install, new InstallWizard_Install());
-    setPage(Page_Eula, new InstallWizard_Eula());
-    setPage(Page_Copy, new InstallWizard_Copy());
-    setPage(Page_Patch, new InstallWizard_Patch());
-    setPage(Page_Finished, new InstallWizard_Finished());
+    setPage(Page_InstallType, new InstallWizard_InstallType(this, settings));
+    setPage(Page_Eula, new InstallWizard_Eula(this));
+    setPage(Page_Copy, new InstallWizard_Copy(this));
+    setPage(Page_Patch, new InstallWizard_Patch(this));
+    setPage(Page_Finished, new InstallWizard_Finished(this));
 }
 
 InstallWizard::~InstallWizard()

diff --git a/installwizard.h b/installwizard.h
@@ -21,8 +21,6 @@ class InstallWizard : public QWizard
     enum
     {
         Page_InstallType,
-        Page_Locate,
-        Page_Install,
         Page_Eula,
         Page_Copy,
         Page_Patch,

diff --git a/installwizard.ui b/installwizard.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>640</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/installwizard_copy.ui b/installwizard_copy.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>640</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/installwizard_eula.ui b/installwizard_eula.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>640</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/installwizard_finished.ui b/installwizard_finished.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>640</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/installwizard_install.cpp b/installwizard_install.cpp
diff --git a/installwizard_install.h b/installwizard_install.h
diff --git a/installwizard_install.ui b/installwizard_install.ui