From 5967de4afb4e00f136baab49cacd11b7f9b725bb Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 15 Nov 2019 14:36:03 -0600 Subject: Qt UI: Add UI.Network.Automatic page and logic --- ui/qt5/networkifacepage.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'ui/qt5/networkifacepage.cc') diff --git a/ui/qt5/networkifacepage.cc b/ui/qt5/networkifacepage.cc index 4d292fb..3fbd6e5 100644 --- a/ui/qt5/networkifacepage.cc +++ b/ui/qt5/networkifacepage.cc @@ -12,6 +12,7 @@ #include "networkifacepage.hh" #include "horizonwizard.hh" +#include "netdhcppage.hh" #include #include @@ -96,6 +97,16 @@ int NetworkIfacePage::nextId() const { case HorizonWizard::Wireless: return HorizonWizard::Page_Network_Wireless; default: - return HorizonWizard::Page_DateTime; + return HorizonWizard::Page_Network_DHCP; } } + +bool NetworkIfacePage::validatePage() { + /* What a hack! + * + * Independent Pages means the DHCP page is never cleaned, even when Back + * is chosen. So, we have to do it from here. */ + horizonWizard()->removePage(HorizonWizard::Page_Network_DHCP); + horizonWizard()->setPage(HorizonWizard::Page_Network_DHCP, new NetDHCPPage); + return true; +} -- cgit v1.2.3-60-g2f50