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

[finished] Adjust messages to setup mode

Browse Source 
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
This commit is contained in:
Arnaud Ferraris 2019-04-08 17:55:03 +02:00
parent e3cebd9da9
commit dddebc98b5
3 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/modules/finished/FinishedPage.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
* *
* 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
@ -33,7 +34,7 @@
#include <QProcess> #include <QProcess>
#include "Branding.h" #include "Branding.h"
#include "Settings.h"
FinishedPage::FinishedPage( QWidget* parent ) FinishedPage::FinishedPage( QWidget* parent )
: QWidget( parent ) : QWidget( parent )
@ -48,12 +49,33 @@ FinishedPage::FinishedPage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
ui->retranslateUi( this ); ui->retranslateUi( this );
ui->mainText->setText( tr( "<h1>All done.</h1><br/>" if ( Calamares::Settings::instance()->isSetupMode() )
"%1 has been installed on your computer.<br/>" {
"You may now restart into your new system, or continue " ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"using the %2 Live environment." ) "%1 has been set up on your computer.<br/>"
.arg( *Calamares::Branding::VersionedName ) "You may now start using your new system." )
.arg( *Calamares::Branding::ProductName ) ); .arg( *Calamares::Branding::VersionedName )
.arg( *Calamares::Branding::ProductName ) );
ui->restartCheckBox->setToolTip( tr ( "<html><head/><body>"
"<p>When this box is checked, your system will "
"restart immediately when you click on "
"<span style=\"font-style:italic;\">Done</span> "
"or close the setup program.</p></body></html>" ) );
}
else
{
ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"%1 has been installed on your computer.<br/>"
"You may now restart into your new system, or continue "
"using the %2 Live environment." )
.arg( *Calamares::Branding::VersionedName )
.arg( *Calamares::Branding::ProductName ) );
ui->restartCheckBox->setToolTip( tr ( "<html><head/><body>"
"<p>When this box is checked, your system will "
"restart immediately when you click on "
"<span style=\"font-style:italic;\">Done</span> "
"or close the installer.</p></body></html>" ) );
}
) )
} }
@ -106,10 +128,17 @@ void
FinishedPage::onInstallationFailed( const QString& message, const QString& details ) FinishedPage::onInstallationFailed( const QString& message, const QString& details )
{ {
Q_UNUSED( details ); Q_UNUSED( details );
ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>" if ( Calamares::Settings::instance()->isSetupMode() )
"%1 has not been installed on your computer.<br/>" ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>"
"The error message was: %2." ) "%1 has not been set up on your computer.<br/>"
.arg( *Calamares::Branding::VersionedName ) "The error message was: %2." )
.arg( message ) ); .arg( *Calamares::Branding::VersionedName )
.arg( message ) );
else
ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>"
"%1 has not been installed on your computer.<br/>"
"The error message was: %2." )
.arg( *Calamares::Branding::VersionedName )
.arg( message ) );
setRestartNowEnabled( false ); setRestartNowEnabled( false );
} }

2
src/modules/finished/FinishedPage.ui
View File

@ -92,7 +92,7 @@
<item> <item>
<widget class="QCheckBox" name="restartCheckBox"> <widget class="QCheckBox" name="restartCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot; font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;Restart checkbox tooltip&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Restart now</string> <string>&amp;Restart now</string>

10
src/modules/finished/FinishedViewStep.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org> * Copyright 2017, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
* *
* 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
@ -29,6 +30,7 @@
#include <QVariantMap> #include <QVariantMap>
#include "Branding.h" #include "Branding.h"
#include "Settings.h"
FinishedViewStep::FinishedViewStep( QObject* parent ) FinishedViewStep::FinishedViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
@ -109,8 +111,12 @@ FinishedViewStep::sendNotification()
QString( "Calamares" ), QString( "Calamares" ),
QVariant( 0U ), QVariant( 0U ),
QString( "calamares" ), QString( "calamares" ),
tr( "Installation Complete" ), Calamares::Settings::instance()->isSetupMode()
tr( "The installation of %1 is complete." ).arg( *Calamares::Branding::VersionedName ), ? tr( "Setup Complete" )
: tr( "Installation Complete" ),
Calamares::Settings::instance()->isSetupMode()
? tr( "The setup of %1 is complete." ).arg( *Calamares::Branding::VersionedName )
: tr( "The installation of %1 is complete." ).arg( *Calamares::Branding::VersionedName ),
QStringList(), QStringList(),
QVariantMap(), QVariantMap(),
QVariant( 0 ) QVariant( 0 )