diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-02-25 23:23:09 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-02-25 23:23:09 -0600 |
commit | dcc45c4b24418aa363e2a7ee2fe0b929e0fca8b2 (patch) | |
tree | 7e3cdefc621b4a395bff1b89b777b28f0882e769 /welcomepage.cc | |
parent | 93ebeb837625d9db5bbc8a5575f73eded60d5b8d (diff) | |
download | horizon-qt5-dcc45c4b24418aa363e2a7ee2fe0b929e0fca8b2.tar.gz horizon-qt5-dcc45c4b24418aa363e2a7ee2fe0b929e0fca8b2.tar.bz2 horizon-qt5-dcc45c4b24418aa363e2a7ee2fe0b929e0fca8b2.tar.xz horizon-qt5-dcc45c4b24418aa363e2a7ee2fe0b929e0fca8b2.zip |
Layout fixes for Networking and Welcome pages
Diffstat (limited to 'welcomepage.cc')
-rw-r--r-- | welcomepage.cc | 32 |
1 files changed, 29 insertions, 3 deletions
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); } |