applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[finished] More (display) modes for restarting

Browse source 
- Use a named enum instead of a collection of booleans
 - Support old-style configuration but complain about it
 - Update AppImage config as well

The new setup allows four different restart modes: never,
always, user-unchecked and user-checked. The user-modes
are interactive and give the user a choice (defaulting to
unchecked-don't-restart and checked-do-restart respectively).
The non-interactive versions vary in how they are
displayed.
This commit is contained in:
Adriaan de Groot 2019-05-06 10:35:09 +02:00
parent e281a74552
commit f3c86810a1
6 changed files with 96 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/modules/finished/FinishedViewStep.cpp
View file

@ -20,9 +20,13 @@
#include "FinishedViewStep.h"
#include "FinishedPage.h"
#include "Branding.h"
#include "JobQueue.h"
#include "Settings.h"
#include "utils/Logger.h"
#include "utils/NamedEnum.h"
#include "utils/Variant.h"
#include <QtDBus/QDBusConnection>
@ -30,8 +34,20 @@
#include <QtDBus/QDBusReply>
#include <QVariantMap>
#include "Branding.h"
#include "Settings.h"
static const NamedEnumTable< FinishedViewStep::RestartMode >&
modeNames()
{
using Mode = FinishedViewStep::RestartMode;
static const NamedEnumTable< Mode > names{
{ QStringLiteral( "never" ), Mode::Never },
{ QStringLiteral( "user-unchecked" ), Mode::UserUnchecked },
{ QStringLiteral( "user-checked" ), Mode::UserChecked },
{ QStringLiteral( "always" ), Mode::Always }
} ;
return names;
}
FinishedViewStep::FinishedViewStep( QObject* parent )
: Calamares::ViewStep( parent )
@ -157,13 +173,26 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d
void
FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
m_widget->setRestartNowEnabled( restartNowEnabled );
RestartMode mode = RestartMode::Never;
bool restartNowChecked = restartNowEnabled && CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
m_widget->setRestartNowChecked( restartNowChecked );
QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" );
if ( restartMode.isEmpty() )
{
if ( configurationMap.contains( "restartNowEnabled" ) )
cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings";
if ( restartNowEnabled )
bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
if ( !restartNowEnabled )
mode = RestartMode::Never;
else
mode = restartNowChecked ? RestartMode::UserChecked : RestartMode::UserUnchecked;
}
m_widget->setRestart( mode );
if ( mode != RestartMode::Never )
{
QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" );
if ( restartNowCommand.isEmpty() )