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

Merge pull request #1116 from a-wai/issue-1100

Browse Source 
Complete setup mode messages adjustements
This commit is contained in:
Adriaan de Groot 2019-04-11 11:38:48 +02:00 committed by GitHub
commit 3d2ad9f55f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 103 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calamares/CalamaresWindow.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
@ -53,8 +54,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
, m_viewManager( nullptr ) , m_viewManager( nullptr )
{ {
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
setWindowTitle( tr( "%1 Installer" ) setWindowTitle( Calamares::Settings::instance()->isSetupMode()
.arg( *Calamares::Branding::ProductName ) ); ? tr( "%1 Setup Program" ).arg( *Calamares::Branding::ProductName )
: tr( "%1 Installer" ).arg( *Calamares::Branding::ProductName )
);
) )
const Calamares::Branding* const branding = Calamares::Branding::instance(); const Calamares::Branding* const branding = Calamares::Branding::instance();

31
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 );
if ( Calamares::Settings::instance()->isSetupMode() )
{
ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"%1 has been set up on your computer.<br/>"
"You may now start using your new system." )
.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/>" ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"%1 has been installed on your computer.<br/>" "%1 has been installed on your computer.<br/>"
"You may now restart into your new system, or continue " "You may now restart into your new system, or continue "
"using the %2 Live environment." ) "using the %2 Live environment." )
.arg( *Calamares::Branding::VersionedName ) .arg( *Calamares::Branding::VersionedName )
.arg( *Calamares::Branding::ProductName ) ); .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,6 +128,13 @@ void
FinishedPage::onInstallationFailed( const QString& message, const QString& details ) FinishedPage::onInstallationFailed( const QString& message, const QString& details )
{ {
Q_UNUSED( details ); Q_UNUSED( details );
if ( Calamares::Settings::instance()->isSetupMode() )
ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>"
"%1 has not been set up on your computer.<br/>"
"The error message was: %2." )
.arg( *Calamares::Branding::VersionedName )
.arg( message ) );
else
ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>" ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>"
"%1 has not been installed on your computer.<br/>" "%1 has not been installed on your computer.<br/>"
"The error message was: %2." ) "The error message was: %2." )

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 )

9
src/modules/plasmalnf/PlasmaLnfPage.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* 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
@ -22,6 +23,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "Settings.h"
#include <QAbstractButton> #include <QAbstractButton>
@ -64,6 +66,13 @@ PlasmaLnfPage::PlasmaLnfPage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
{ {
ui->retranslateUi( this ); ui->retranslateUi( this );
if ( Calamares::Settings::instance()->isSetupMode() )
ui->generalExplanation->setText( tr(
"Please choose a look-and-feel for the KDE Plasma Desktop. "
"You can also skip this step and configure the look-and-feel "
"once the system is set up. Clicking on a look-and-feel "
"selection will give you a live preview of that look-and-feel.") );
else
ui->generalExplanation->setText( tr( ui->generalExplanation->setText( tr(
"Please choose a look-and-feel for the KDE Plasma Desktop. " "Please choose a look-and-feel for the KDE Plasma Desktop. "
"You can also skip this step and configure the look-and-feel " "You can also skip this step and configure the look-and-feel "

6
src/modules/summary/SummaryPage.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
@ -25,6 +26,7 @@
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "Settings.h"
#include "ViewManager.h" #include "ViewManager.h"
#include <QBoxLayout> #include <QBoxLayout>
@ -46,6 +48,10 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
QLabel* headerLabel = new QLabel( this ); QLabel* headerLabel = new QLabel( this );
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
if ( Calamares::Settings::instance()->isSetupMode() )
headerLabel->setText( tr( "This is an overview of what will happen once you start "
"the setup procedure." ) );
else
headerLabel->setText( tr( "This is an overview of what will happen once you start " headerLabel->setText( tr( "This is an overview of what will happen once you start "
"the install procedure." ) ); "the install procedure." ) );
) )

18
src/modules/users/UsersPage.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, 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>
* *
* Portions from the Manjaro Installation Framework * Portions from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org> * by Roland Singer <roland@manjaro.org>
@ -31,6 +32,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "Settings.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>
@ -106,7 +108,21 @@ UsersPage::UsersPage( QWidget* parent )
ui->hostname_extra_label_2->setMaximumWidth( 3 * boxWidth ); ui->hostname_extra_label_2->setMaximumWidth( 3 * boxWidth );
ui->password_extra_label_3->setMaximumWidth( 3 * boxWidth ); ui->password_extra_label_3->setMaximumWidth( 3 * boxWidth );
CALAMARES_RETRANSLATE( ui->retranslateUi( this ); ) CALAMARES_RETRANSLATE(
ui->retranslateUi( this );
if ( Calamares::Settings::instance()->isSetupMode() )
{
ui->username_extra_label_2->setText( tr( "<small>If more than one person will "
"use this computer, you can create multiple "
"accounts after setup.</small>" ) );
}
else
{
ui->username_extra_label_2->setText( tr( "<small>If more than one person will "
"use this computer, you can create multiple "
"accounts after installation.</small>" ) );
}
)
} }

2
src/modules/users/page_usersetup.ui
View File

@ -197,7 +197,7 @@
<string notr="true">font-weight: normal</string> <string notr="true">font-weight: normal</string>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</string> <string>&lt;Username extra label 2 text&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

11
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -3,6 +3,7 @@
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org> * Copyright 2017, Gabriel Craciunescu <crazy@frugalware.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
@ -30,7 +31,7 @@
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Units.h" #include "utils/Units.h"
#include "Settings.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -141,7 +142,9 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return QString(); }, //we hide it [this]{ return QString(); }, //we hide it
[this]{ return tr( "The installer is not running with administrator rights." ); }, [this]{ return Calamares::Settings::instance()->isSetupMode()
? tr( "The setup program is not running with administrator rights." )
: tr( "The installer is not running with administrator rights." ); },
isRoot, isRoot,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
@ -149,7 +152,9 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return QString(); }, // we hide it [this]{ return QString(); }, // we hide it
[this]{ return tr( "The screen is too small to display the installer." ); }, [this]{ return Calamares::Settings::instance()->isSetupMode()
? tr( "The screen is too small to display the setup program." )
: tr( "The screen is too small to display the installer." ); },
enoughScreen, enoughScreen,
false false
} ); } );