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

Merge pull request #210 from calamares/revert-209-master

Browse Source 
Revert "add URL option in greeting page"
This commit is contained in:
demmm 2015-03-19 10:44:55 -04:00
commit b81e46b6ef
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/branding/default/branding.desc
View File

@ -9,8 +9,6 @@ strings:
versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone" versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone"
shortVersionedName: Generic 1.0 shortVersionedName: Generic 1.0
bootloaderEntryName: Generic bootloaderEntryName: Generic
productURL: http://calamares.github.io/
urlText: Known Issues
images: images:
productLogo: "squid.png" productLogo: "squid.png"

6
src/libcalamaresui/Branding.cpp
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -52,9 +52,7 @@ QStringList Branding::s_stringEntryStrings =
"versionedName", "versionedName",
"shortVersionedName", "shortVersionedName",
"shortProductName", "shortProductName",
"bootloaderEntryName", "bootloaderEntryName"
"productURL",
"urlText"
}; };

6
src/libcalamaresui/Branding.h
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -44,9 +44,7 @@ public:
VersionedName, VersionedName,
ShortVersionedName, ShortVersionedName,
ShortProductName, ShortProductName,
BootloaderEntryName, BootloaderEntryName
ProductURL,
UrlText
}; };
enum ImageEntry : short enum ImageEntry : short

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

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -123,19 +123,11 @@ GreetingPage::GreetingPage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>" ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>"
"This program will ask you some questions and " "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()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) string( Calamares::Branding::VersionedName ) )
.arg( Calamares::Branding::instance()-> .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, ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,