From 4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 14 Feb 2020 13:51:58 -0600
Subject: Qt UI: Move Firmware page before Partition

This ensures that disk controllers that need firmware can have it loaded.
---
 ui/qt5/horizonwizard.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui/qt5/horizonwizard.cc')

diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
index 90024c4..6166946 100644
--- a/ui/qt5/horizonwizard.cc
+++ b/ui/qt5/horizonwizard.cc
@@ -38,11 +38,11 @@ extern "C" {
 
 #include "intropage.hh"
 #include "inputpage.hh"
-#include "partitionpage.hh"
-#include "partitiondiskpage.hh"
 #ifdef NON_LIBRE_FIRMWARE
 #include "firmwarepage.hh"
 #endif  /* NON_LIBRE_FIRMWARE */
+#include "partitionpage.hh"
+#include "partitiondiskpage.hh"
 #include "networkingpage.hh"
 #include "networkifacepage.hh"
 #include "netsimplewifipage.hh"
@@ -62,14 +62,14 @@ extern "C" {
 static std::map<int, std::string> help_id_map = {
     {HorizonWizard::Page_Intro, "intro"},
     {HorizonWizard::Page_Input, "input"},
+#ifdef NON_LIBRE_FIRMWARE
+    {HorizonWizard::Page_Firmware, "firmware"},
+#endif  /* NON_LIBRE_FIRMWARE */
     {HorizonWizard::Page_Partition, "partition"},
     {HorizonWizard::Page_PartitionDisk, "partition-disk"},
     {HorizonWizard::Page_PartitionChoose, "partition-manipulation"},
     {HorizonWizard::Page_PartitionManual, "partition-manual"},
     {HorizonWizard::Page_PartitionMount, "partition-mountpoints"},
-#ifdef NON_LIBRE_FIRMWARE
-    {HorizonWizard::Page_Firmware, "firmware"},
-#endif  /* NON_LIBRE_FIRMWARE */
     {HorizonWizard::Page_Network, "network-start"},
     {HorizonWizard::Page_Network_Iface, "network-iface"},
     {HorizonWizard::Page_Network_Wireless, "network-wifi"},
@@ -207,11 +207,11 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) {
 
     setPage(Page_Intro, new IntroPage);
     setPage(Page_Input, new InputPage);
-    setPage(Page_Partition, new PartitionPage);
-    setPage(Page_PartitionDisk, new PartitionDiskPage);
 #ifdef NON_LIBRE_FIRMWARE
     setPage(Page_Firmware, new FirmwarePage);
 #endif  /* NON_LIBRE_FIRMWARE */
+    setPage(Page_Partition, new PartitionPage);
+    setPage(Page_PartitionDisk, new PartitionDiskPage);
     setPage(Page_Network, new NetworkingPage);
     setPage(Page_Network_Iface, new NetworkIfacePage);
     setPage(Page_Network_Wireless, new NetworkSimpleWirelessPage);
-- 
cgit v1.2.3-60-g2f50