From 4088d9bd3b4c73526066f0c756456ad8c0af16f8 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 31 Mar 2015 13:13:55 -0400 Subject: [PATCH] implement http://calamares.io/bugs/browse/CAL-185 --- src/branding/default/branding.desc | 2 ++ src/modules/greeting/GreetingPage.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 6852386f8..0fd5bdd6d 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -9,6 +9,8 @@ strings: versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone" shortVersionedName: Generic 1.0 bootloaderEntryName: Generic + productURL: http://calamares.github.io/ + urlText: Known Issues images: productLogo: "squid.png" diff --git a/src/modules/greeting/GreetingPage.cpp b/src/modules/greeting/GreetingPage.cpp index 74ba07110..856b8d352 100644 --- a/src/modules/greeting/GreetingPage.cpp +++ b/src/modules/greeting/GreetingPage.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -123,11 +123,16 @@ GreetingPage::GreetingPage( QWidget* parent ) CALAMARES_RETRANSLATE( ui->mainText->setText( tr( "

Welcome to the %1 installer.


" "This program will ask you some questions and " - "set up %2 on your computer." ) + "set up %2 on your computer." + " %4 " ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::VersionedName ) ) .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); + string( Calamares::Branding::ProductName ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ProductURL ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::UrlText ) ) ); ) ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,