Layout fixes for Networking and Welcome pages

4 files changed, 67 insertions, 9 deletions

diff --git a/horizonwizard.hh b/horizonwizard.hh
index 57cb685..3428266 100644
--- a/horizonwizard.hh
+++ b/horizonwizard.hh
@@ -5,10 +5,23 @@
 
 class HorizonWizard : public QWizard
 {
-        enum { Page_Welcome, Page_Partition, Page_Networking, Page_Software,
-               Page_AdvancedSoftware, Page_Startup, Page_Commit, Page_Save,
-               Page_Finished, Page_CustomStart };
 public:
+        enum { Page_Welcome, /* introduction */
+               Page_Partition, /* partitioning */
+               Page_NetworkDetect, /* detect interfaces/carriers */
+               Page_Networking, /* network type selection */
+               Page_Network_SimpleWireless, /* simple -> wifi */
+               Page_Network_SimpleWired, /* simple -> wired */
+               Page_Network_Advanced, /* advanced network config */
+               Page_Software, /* software selection */
+               Page_AdvancedSoftware, /* advanced software selection */
+               Page_Startup, /* boot loader config, if arch needed */
+               Page_Commit, /* confirm committing to disk */
+               Page_Save, /* save the installfile */
+               Page_Finished, /* done */
+               Page_CustomStart /* custom pages have IDs starting here */
+        };
+
         HorizonWizard(QWidget *parent = 0);
 };
 
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;
+        }
+}
diff --git a/networkingpage.hh b/networkingpage.hh
index 6a880ca..a861f01 100644
--- a/networkingpage.hh
+++ b/networkingpage.hh
@@ -4,6 +4,7 @@
 #include "horizonwizardpage.hh"
 
 #include <QButtonGroup>
+#include <QRadioButton>
 
 class NetworkingPage : public HorizonWizardPage
 {
@@ -11,8 +12,10 @@ public:
         NetworkingPage(QWidget *parent = 0);
 
         bool isComplete() const;
+        int nextId() const;
 private:
         QButtonGroup *radioGroup;
+        QRadioButton *simple, *advanced, *skip;
 };
 
 #endif // NETWORKINGPAGE_HH
diff --git a/welcomepage.cc b/welcomepage.cc
index 1fee9c5..4f5489a 100644
--- a/welcomepage.cc
+++ b/welcomepage.cc
@@ -6,13 +6,38 @@
 WelcomePage::WelcomePage(QWidget *parent) : HorizonWizardPage(parent)
 {
         QLabel *descLabel;
+        QVBoxLayout *layout;
 
         loadWatermark("welcome");
         setTitle(tr("Welcome to Adélie Linux"));
 
+#ifdef NOT_NATIVE
         descLabel = new QLabel(
-                    tr("This process will only take about 10-15 minutes of "
-                       "your time.  After you're done, your computer will "
+                    tr("<p>"
+                       "Horizon will guide you through creation of a basic "
+                       "<code>installfile</code> "
+                       "for installing Adélie Linux on another computer."
+                       "<p>"
+                       "<b>IMPORTANT:</b> Not all advanced settings will "
+                       "be available to you.  You may be allowed to "
+                       "specify an invalid or non-bootable disk layout or "
+                       "network configuration.  For best results, always "
+                       "run System Installation directly on the computer "
+                       "you wish to run Adélie Linux."
+                       "<p>"
+                       "For more information about the "
+                       "<code>installfile</code> "
+                       "format and syntax, see the "
+                       "<a href='http://docs.adelielinux.org/'>"
+                       "Adélie Linux Installation Guide</a> on the "
+                       "Internet."));
+        descLabel->setOpenExternalLinks(true);
+        descLabel->setTextFormat(Qt::RichText);
+#else
+        descLabel = new QLabel(
+                    tr("The streamlined installation process for Adélie"
+                       "Linux will only take about 10-15 minutes of your "
+                       "time.  After you're done, your computer will be"
                        "running the reliable, secure, libre Adélie Linux "
                        "operating system.\n\n"
 
@@ -20,9 +45,10 @@ WelcomePage::WelcomePage(QWidget *parent) : HorizonWizardPage(parent)
                        "started by choosing Next.  If you'd like more "
                        "information about the installation procedure, "
                        "choose Help at any time."));
+#endif
         descLabel->setWordWrap(true);
 
-        QVBoxLayout *layout = new QVBoxLayout;
+        layout = new QVBoxLayout;
         layout->addWidget(descLabel);
         setLayout(layout);
 }