mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-17 11:45:37 -04:00
Merge pull request #209 from demmm/master
add URL option in greeting page
This commit is contained in:
commit
331333aa1a
4 changed files with 21 additions and 7 deletions
|
@ -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"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -52,7 +52,9 @@ QStringList Branding::s_stringEntryStrings =
|
|||
"versionedName",
|
||||
"shortVersionedName",
|
||||
"shortProductName",
|
||||
"bootloaderEntryName"
|
||||
"bootloaderEntryName",
|
||||
"productURL",
|
||||
"urlText"
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -44,7 +44,9 @@ public:
|
|||
VersionedName,
|
||||
ShortVersionedName,
|
||||
ShortProductName,
|
||||
BootloaderEntryName
|
||||
BootloaderEntryName,
|
||||
ProductURL,
|
||||
UrlText
|
||||
};
|
||||
|
||||
enum ImageEntry : short
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* 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,19 @@ GreetingPage::GreetingPage( QWidget* parent )
|
|||
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."
|
||||
" Remember, this installer is still in an early stage.<br/>"
|
||||
"Not implemented yet is LUKS/LVM or RAID and<br/>"
|
||||
"using one of the automated partitioning options for UEFI installs.<br/>"
|
||||
"For <b>GPT partioning on BIOS</b> systems and other instructions, read<a href=\"%3\"> %4 </a>" )
|
||||
.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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue