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

Do not warn of data loss which might not happen.

Browse Source 
CAL-194 #comment Fixed up warnings in ChoicePage.
This commit is contained in:
Teo Mrnjavac 2015-03-11 18:13:39 +01:00
parent a25c0cf490
commit 7e7e47b6d1
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/modules/partition/gui/ChoicePage.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, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, 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
@ -115,11 +115,17 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
m_messageLabel->setText( tr( "This computer currently does not seem to have an operating system on it. " m_messageLabel->setText( tr( "This computer currently does not seem to have an operating system on it. "
"What would you like to do?" ) ); "What would you like to do?" ) );
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" if ( core->deviceModel()->rowCount() < 2 )
"<font color=\"red\">Warning: </font>This will delete all of your programs, " eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"documents, photos, music, and any other files." ) "<font color=\"red\">Warning: </font>This will delete all of your programs, "
.arg( Calamares::Branding::instance()-> "documents, photos, music, and any other files." )
string( Calamares::Branding::VersionedName ) ) ); .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
) )
replaceButton->hide(); replaceButton->hide();
@ -144,17 +150,22 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
eraseButton->setText( tr( "<b>Erase entire disk with %1 and install %2</b><br/>" if ( core->deviceModel()->rowCount() < 2 )
"<font color=\"red\">Warning: </font>This will erase the whole disk and " eraseButton->setText( tr( "<b>Erase entire disk with %1 and install %2</b><br/>"
"delete all of your %1 programs, " "<font color=\"red\">Warning: </font>This will erase the whole disk and "
"documents, photos, music, and any other files." ) "delete all of your %1 programs, "
.arg( osName ) "documents, photos, music, and any other files." )
.arg( Calamares::Branding::instance()-> .arg( osName )
string( Calamares::Branding::VersionedName ) ) ); .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>" replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>"
"<font color=\"red\">Warning: </font>This will delete all files " "You will be offered a choice of which partition to erase." )
"on the selected partition." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
) )
@ -172,15 +183,20 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" if ( core->deviceModel()->rowCount() < 2 )
"<font color=\"red\">Warning: </font>This will delete all of your programs, " eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"documents, photos, music, and any other files." ) "<font color=\"red\">Warning: </font>This will delete all of your programs, "
.arg( Calamares::Branding::instance()-> "documents, photos, music, and any other files." )
string( Calamares::Branding::VersionedName ) ) ); .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>" replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>"
"<font color=\"red\">Warning: </font>This will delete all files " "You will be offered a choice of which partition to erase." )
"on the selected partition." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
) )
@ -214,15 +230,20 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" if ( core->deviceModel()->rowCount() < 2 )
"<font color=\"red\">Warning: </font>This will delete all of your programs, " eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"documents, photos, music, and any other files." ) "<font color=\"red\">Warning: </font>This will delete all of your programs, "
.arg( Calamares::Branding::instance()-> "documents, photos, music, and any other files." )
string( Calamares::Branding::VersionedName ) ) ); .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>"
"You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>" replaceButton->setText( tr( "<b>Install %1 on an existing partition</b><br/>"
"<font color=\"red\">Warning: </font>This will delete all files " "You will be offered a choice of which partition to erase." )
"on the selected partition." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) ); string( Calamares::Branding::VersionedName ) ) );
) )