napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ProductUrl/ProductUrlText optional.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-01 18:11:38 +02:00
parent 00d3205ed3
commit a1e643044e
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/greeting/GreetingPage.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2015, Anke Boersma <demm@kaosx.us>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -120,20 +121,38 @@ GreetingPage::GreetingPage( QWidget* parent )
ui->mainText->setWordWrap( true );
ui->mainText->setOpenExternalLinks( true );
if ( Calamares::Branding::instance()->
string( Calamares::Branding::ProductUrl ).isEmpty() ||
Calamares::Branding::instance()->
string( Calamares::Branding::ProductUrlText ).isEmpty() )
{
CALAMARES_RETRANSLATE(
ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>"
"This program will ask you some questions and "
"set up %2 on your computer."
"set up %2 on your computer." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ProductName ) ) );
)
}
else
{
CALAMARES_RETRANSLATE(
ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>"
"This program will ask you some questions and "
"set up %2 on your computer.<br/>"
"<a href=\"%3\"> %4 </a>" )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ProductName ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ProductURL ) )
string( Calamares::Branding::ProductUrl ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::UrlText ) ) );
string( Calamares::Branding::ProductUrlText ) ) );
)
}
ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
CalamaresUtils::Original,