diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-14 13:51:58 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-14 13:51:58 -0600 |
| commit | 4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0 (patch) | |
| tree | 098af4775cf19e2536f0ad1e11ef4e17bd7dfbae /ui | |
| parent | dbadd242be012ff684620bd80f689fc8a541f762 (diff) | |
| download | horizon-4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0.tar.gz horizon-4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0.tar.bz2 horizon-4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0.tar.xz horizon-4cbda8effeecaaa6a9ff592d50b1d1f9b66d98d0.zip | |
Qt UI: Move Firmware page before Partition
This ensures that disk controllers that need firmware can have it loaded.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt5/horizonwizard.cc | 14 | ||||
| -rw-r--r-- | ui/qt5/horizonwizard.hh | 6 |
2 files changed, 10 insertions, 10 deletions
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); diff --git a/ui/qt5/horizonwizard.hh b/ui/qt5/horizonwizard.hh index 3252d5b..0b12466 100644 --- a/ui/qt5/horizonwizard.hh +++ b/ui/qt5/horizonwizard.hh @@ -38,14 +38,14 @@ public: enum { Page_Intro, /* introduction */ Page_Input, /* keyboard layout */ +#ifdef NON_LIBRE_FIRMWARE + Page_Firmware, /* firmware */ +#endif /* NON_LIBRE_FIRMWARE */ Page_Partition, /* partitioning */ Page_PartitionDisk, /* disk selection */ Page_PartitionChoose, /* erase, use free, manual, use existing */ Page_PartitionManual, /* manual */ Page_PartitionMount, /* choose mountpoints - manual and existing */ -#ifdef NON_LIBRE_FIRMWARE - Page_Firmware, /* firmware */ -#endif /* NON_LIBRE_FIRMWARE */ Page_Network, /* network type selection (DHCP/static) */ Page_Network_Iface, /* network interface selection */ Page_Network_Wireless, /* wireless */ |