Qt UI: Implement UI.Intro.Describe and Elements

2 files changed, 59 insertions, 21 deletions

diff --git a/ui/qt5/intropage.cc b/ui/qt5/intropage.cc
index b67b534..6284ba1 100644
--- a/ui/qt5/intropage.cc
+++ b/ui/qt5/intropage.cc
@@ -34,21 +34,18 @@ IntroPage::IntroPage(QWidget *parent) : HorizonWizardPage(parent) {
     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"
-
-                   "When you're ready to answer a few questions, get "
-                   "started by choosing Next.  If you'd like more "
-                   "information about the installation procedure, "
-                   "choose Help at any time.\n\n"
-
-                   "If you are unable to use a mouse, you may press "
-                   "the Tab key to cycle between the available buttons."
-                   "  The currently selected button will be highlighted.  "
-                   "Press the Return key to make your selection."));
+                tr("Thank you for choosing the Adélie Linux operating system.  "
+                   "This installation process will only take about 10-15 minutes of your time.  "
+                   "When you're done, your computer will be up and running with the reliable, secure, libre Adélie Linux.\n\n"
+
+                   "When you're ready to answer a few questions, you can get started by choosing Next or pressing F8.  "
+                   "If you'd like more information about the installation procedure, choose Help or press F1 at any time.\n\n"
+
+                   "The installation procedure will not change anything on your computer until the final step.  "
+                   "You can safely cancel at any time, with no change to your computer, by choosing Cancel or pressing F3.\n\n"
+
+                   "If you are unable to use a mouse, you may press the Tab key to cycle between the available inputs.  "
+                   "The currently selected input will be highlighted."));
 #endif
     descLabel->setWordWrap(true);
 
diff --git a/ui/qt5/resources/intro-help.txt b/ui/qt5/resources/intro-help.txt
index 01a9caa..5908db9 100644
--- a/ui/qt5/resources/intro-help.txt
+++ b/ui/qt5/resources/intro-help.txt
@@ -1,17 +1,58 @@
 <h2>Welcome to Adélie Linux!</h2>
 
-<p>This is the <b>Horizon Installation System</b>, which will guide you through the process of installing the Adélie Linux operating system to your computer.</p>
+<p>This is the <b>Horizon Installation System</b>, which will guide you
+through the process of installing the Adélie Linux operating system to your
+computer.</p>
 
-<p>Each step of the installation system has a help screen just like this one, accessible via the 'Help' button in the lower left corner of the screen.  If you need more information about an option provided, simply open the Help screen.</p>
+<p>Each step of the installation system has a help screen just like this one,
+accessible via the 'Help' button in the lower left corner of the screen.</p>
 
 
 <hr>
 
 
-<h2>Preparing for the installation</h2>
+<h2>Using the Installation System</h2>
+
+<p>The Installation System is divided in a series of <i>pages</i>, similar in
+concept to a paper form.</p>
+
+<p>When you are finishing filling in the information on one page, you may go
+to the next one by choosing Next or pressing the F8 key.</p>
+
+<p>If you want to go back and review or change information on a previous page,
+you may go back by choosing Back or pressing the F5 key.</p>
+
+<p>If you need more information about an option provided, you may open the
+Help screen by choosing Help or pressing the F1 key.</p>
 
-<p>Please back up all of your data before beginning installation. While every effort is made to ensure that the Adélie Linux installation routines are safe and error-free, we cannot guarantee that your data will be preserved once you start the installation. If you intend on dual-booting your computer with another operating system, such as Mac OS X or Windows, ensure there is adequate disk space available to install Adélie Linux. You will need up to 1 GB for a standard desktop installation, or at least 300 MB for a server installation.</p>
+<p>If you have decided not to complete the installation procedure at this
+time, you may stop at any time by choosing Cancel or pressing the F3 key.</p>
 
-<p>If you plan on connecting to the Internet directly from your Adélie Linux computer without using a router (not common), ensure you have your Internet access credentials (typically a username and password) available before starting installation. Adélie Linux supports connecting to most ADSL and dial-up Internet providers using PPP; and cable, T1, and fibre providers using Ethernet. If you use a static IP address (not common), make sure you have your IP address, subnet, and default gateway and nameserver settings before starting installation.</p>
 
-<p>If your computer came with recovery media, we recommend that you have it available in the very unlikely event you have an issue with Adélie Linux, or your hardware has an incompatibility. This way, you will be able to quickly restore your computer to normal operation.</p>
+<hr>
+
+
+<h2>Preparing for the installation</h2>
+
+<p>Please back up all of your data before beginning installation. While every
+effort is made to ensure that the Adélie Linux installation routines are safe
+and error-free, we cannot guarantee that your data will be preserved once you
+start the installation.  If you intend on dual-booting your computer with
+another operating system, such as Mac OS X or Windows, ensure there is
+adequate disk space available to install Adélie Linux. You will need up to
+1 GB for a standard desktop installation, or at least 300 MB for a server
+installation.</p>
+
+<p>If you plan on connecting to the Internet directly from your Adélie Linux
+computer without using a router (not common), ensure you have your Internet
+access credentials (typically a username and password) available before
+starting installation.  Adélie Linux supports connecting to most ADSL and
+dial-up Internet providers using PPP; and cable, T1, and fibre providers using
+Ethernet.  If you use a static IP address (not common), make sure you have
+your IP address, subnet, and default gateway and nameserver settings before
+starting installation.</p>
+
+<p>If your computer came with recovery media, we recommend that you have it
+available in the very unlikely event you have an issue with Adélie Linux, or
+your hardware has an incompatibility.  This way, you will be able to quickly
+restore your computer to normal operation.</p>