housekeeping and styling tweaks

5 files changed, 28 insertions, 16 deletions

diff --git a/mk b/mk
index 32278bb65..4e6e62878 100755
--- a/mk
+++ b/mk
@@ -14,10 +14,10 @@ sudo echo -n
 
 Print "\n--- verifying dependencies ---\n"
 if   pacman --version 2> /dev/null | grep libalpm > /dev/null
-then BASE_PKGS="$(pacman -Qg base-devel | cut -d ' ' -f 2)"
-     CALAMARES_PKGS="boost boost-libs ckbcomp dmidecode extra-cmake-modules git gptfdisk \
-                     hwinfo icu kconfig kcoreaddons ki18n kparts kpmcore kservice        \
-                     kwindowsystem libpwquality polkit-qt5 python                        \
+then BASE_PKGS="$(pacman -Sg base-devel | cut -d ' ' -f 2)"
+     CALAMARES_PKGS="boost boost-libs ckbcomp dmidecode extra-cmake-modules gptfdisk \
+                     hwinfo icu kconfig kcoreaddons ki18n kparts kpmcore kservice    \
+                     kwindowsystem libpwquality polkit-qt5 python                    \
                      qt5-base qt5-svg qt5-tools qt5ct solid yaml-cpp" # squashfs-tools os-prober
 #      PARABOLA_PKGS="arch-install-scripts"
      PKGS="$BASE_PKGS $CALAMARES_PKGS $PARABOLA_PKGS"
diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index b6694d1f4..d9c9e1456 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -106,6 +106,11 @@ strings:
 
 # These images are loaded from the branding module directory.
 #
+# productBanner is an optional image, which if present, will be shown
+#       on the welcome page of the application, above the welcome text.
+#       It is intended to have a width much greater than height.
+#       It is displayed at 64px height (also on HiDPI).
+#       Recommended size is 64px tall, and up to 460px wide.
 # productIcon is used as the window icon, and will (usually) be used
 #       by the window manager to represent the application. This image
 #       should be square, and may be displayed by the window manager
@@ -121,8 +126,9 @@ strings:
 #
 # These filenames can also use substitutions from os-release (see above).
 images:
-    productLogo:         "squid.png"
+    productBanner:       "banner.png"
     productIcon:         "squid.png"
+    productLogo:         "squid.png"
     productWelcome:      "languages.png"
 
 # The slideshow is displayed during execution steps (e.g. when the
diff --git a/src/branding/parabola/branding.desc b/src/branding/parabola/branding.desc
index e23e47fb7..0f8fb1924 100644
--- a/src/branding/parabola/branding.desc
+++ b/src/branding/parabola/branding.desc
@@ -30,5 +30,5 @@ slideshow:    'show.qml'
 style:
   sidebarBackground:    '#202020'
   sidebarText:          '#FFFFFF'
-  sidebarTextSelect:    '#8888FF'
-  sidebarTextHighlight: '#444488'
+  sidebarTextHighlight: '#333366'
+  sidebarTextSelect:    '#CCCCFF'
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 9d2c03fdc..d3579b565 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -51,7 +51,6 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent )
     , m_languages( nullptr )
     , m_conf( conf )
 {
-
     connect( Calamares::ModuleManager::instance(),
              &Calamares::ModuleManager::requirementsComplete,
              m_checkingWidget,
@@ -62,13 +61,13 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent )
              &CheckerContainer::requirementsProgress );
     ui->setupUi( this );
 
-    ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() * 2 );
+    const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
+    ui->verticalLayout->insertSpacing( 1, defaultFontHeight * 2 );
     initLanguages();
 
     ui->mainText->setAlignment( Qt::AlignCenter );
     ui->mainText->setWordWrap( true );
     ui->mainText->setOpenExternalLinks( true );
-    ui->mainText->setFont( QFont( "Bitstream Vera Sans", 8, QFont::Bold ) );
 
     cDebug() << "Welcome string" << Calamares::Branding::instance()->welcomeStyleCalamares()
              << *Calamares::Branding::VersionedName;
@@ -78,25 +77,33 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent )
     ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap(
         CalamaresUtils::Information,
         CalamaresUtils::Original,
-        2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() ) ) );
+        2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
     connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox );
 
-    int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText );
+    // insert system-check widget below welcome text
+    const int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText );
     ui->verticalLayout->insertWidget( welcome_text_idx + 1, m_checkingWidget );
 
+    // insert optional logo banner image above welcome text
     Calamares::Branding::ImageEntry bannerImage = Calamares::Branding::ProductBanner;
     QString bannerPath = Calamares::Branding::instance()->imagePath( bannerImage );
-    if ( !bannerPath.isEmpty() )
+    if ( QFile::exists( bannerPath ) )
     {
         QPixmap bannerPixmap = QPixmap( bannerPath );
         if ( !bannerPixmap.isNull() )
         {
             QLabel* bannerLabel = new QLabel;
-            int min_h = WelcomePage::BANNER_H + (CalamaresUtils::defaultFontHeight() * 2);
             bannerLabel->setPixmap( bannerPixmap );
+            bannerLabel->setMinimumHeight( 64 );
             bannerLabel->setAlignment( Qt::AlignCenter );
-            bannerLabel->setMinimumHeight( min_h );
+            ui->verticalLayout->insertSpacing( welcome_text_idx, defaultFontHeight );
             ui->verticalLayout->insertWidget( welcome_text_idx, bannerLabel );
+
+            // adjust layout
+            QString defaultFontFamily = CalamaresUtils::defaultFont().defaultFamily();
+            ui->mainText->setFont( QFont( defaultFontFamily, 8, QFont::Bold ) );
+            ui->verticalLayout->removeItem( ui->verticalSpacer );
+            ui->verticalLayout->removeItem( ui->verticalSpacer_4 );
         }
     }
 }
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index 8be1366d8..17fedc812 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -75,7 +75,6 @@ private:
     CheckerContainer* m_checkingWidget;
     CalamaresUtils::Locale::LabelModel* m_languages;
 
-    static const int BANNER_H = 64;
     Config* m_conf;
 };