From 8e38a03ccaba660ae801c5e12e35689b7dadb6ca Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 16 Oct 2014 16:58:58 +0200 Subject: [PATCH] Branding in greeting module. --- src/modules/greeting/GreetingPage.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/greeting/GreetingPage.cpp b/src/modules/greeting/GreetingPage.cpp index 80dacc05f..dcac8068b 100644 --- a/src/modules/greeting/GreetingPage.cpp +++ b/src/modules/greeting/GreetingPage.cpp @@ -21,6 +21,8 @@ #include #include +#include "Branding.h" + GreetingPage::GreetingPage( QWidget* parent ) : QWidget() @@ -28,10 +30,15 @@ GreetingPage::GreetingPage( QWidget* parent ) QBoxLayout *mainLayout = new QHBoxLayout; setLayout( mainLayout ); - QLabel* text = new QLabel( tr( "

Welcome to Calamares.


" - "This is some random welcome text. " - "It should change depending on the branding config." ), this ); + QLabel* text = new QLabel( tr( "

Welcome to the %1 installer.


" + "This program will ask you some questions and " + "set up %2 on your computer." ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::VersionedName ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ProductName ) ), this ); text->setAlignment( Qt::AlignCenter ); + text->setWordWrap( true ); mainLayout->addStretch(); mainLayout->addWidget( text );