Layout fixes for Networking and Welcome pages

1 files changed, 19 insertions, 3 deletions

diff --git a/networkingpage.cc b/networkingpage.cc
index 7859a37..c7860ff 100644
--- a/networkingpage.cc
+++ b/networkingpage.cc
@@ -1,13 +1,13 @@
 #include "networkingpage.hh"
+#include "horizonwizard.hh"
 
+#include <cstdint>
 #include <QLabel>
-#include <QRadioButton>
 #include <QVBoxLayout>
 
 NetworkingPage::NetworkingPage(QWidget *parent) : HorizonWizardPage(parent)
 {
         QLabel *descLabel;
-        QRadioButton *simple, *advanced, *skip;
         QVBoxLayout *layout;
 
         loadWatermark("network");
@@ -31,7 +31,7 @@ NetworkingPage::NetworkingPage(QWidget *parent) : HorizonWizardPage(parent)
                  "or via a modem/router"));
         advanced = new QRadioButton(tr(
                    "&Advanced - my computer connects to an enterprise "
-                   "network or\nI use a static IP address/VPN/802.1X"));
+                   "network or I use a\nstatic IP address, VPN, or 802.1X"));
         skip = new QRadioButton(tr(
                    "S&kip - I don't want to connect to a network or the "
                    "Internet right now"));
@@ -59,3 +59,19 @@ bool NetworkingPage::isComplete() const
 {
         return (radioGroup->checkedButton() != nullptr);
 }
+
+int NetworkingPage::nextId() const
+{
+        if(radioGroup->checkedButton() == simple)
+        {
+                return HorizonWizard::Page_Network_SimpleWired;
+        }
+        else if(radioGroup->checkedButton() == advanced)
+        {
+                return HorizonWizard::Page_Network_Advanced;
+        }
+        else
+        {
+                return HorizonWizard::Page_Software;
+        }
+}