From d750885e759885e754d33e6318f5475a6b23a5fe Mon Sep 17 00:00:00 2001 From: demmm Date: Thu, 19 Mar 2015 10:44:34 -0400 Subject: [PATCH] Revert "add URL option in greeting page" --- src/branding/default/branding.desc | 2 -- src/libcalamaresui/Branding.cpp | 6 ++---- src/libcalamaresui/Branding.h | 6 ++---- src/modules/greeting/GreetingPage.cpp | 14 +++----------- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 95ef196fc..d6913c1e9 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -9,8 +9,6 @@ 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/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 225761552..997bb59b4 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014-2015, Teo Mrnjavac + * Copyright 2014, 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 @@ -52,9 +52,7 @@ QStringList Branding::s_stringEntryStrings = "versionedName", "shortVersionedName", "shortProductName", - "bootloaderEntryName", - "productURL", - "urlText" + "bootloaderEntryName" }; diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 8f09c435e..bddea1b70 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014-2015, Teo Mrnjavac + * Copyright 2014, 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 @@ -44,9 +44,7 @@ public: VersionedName, ShortVersionedName, ShortProductName, - BootloaderEntryName, - ProductURL, - UrlText + BootloaderEntryName }; enum ImageEntry : short diff --git a/src/modules/greeting/GreetingPage.cpp b/src/modules/greeting/GreetingPage.cpp index cc4c5492e..74ba07110 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-2015, Teo Mrnjavac + * Copyright 2014, 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,19 +123,11 @@ 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." - " Remember, this installer is still in an early stage.
" - "Not implemented yet is LUKS/LVM or RAID and
" - "using one of the automated partitioning options for UEFI installs.
" - "For GPT partioning on BIOS systems and other instructions, read %4 " ) + "set up %2 on your computer." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::VersionedName ) ) .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductURL ) ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::UrlText ) ) ); + string( Calamares::Branding::ProductName ) ) ); ) ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,