|
|
|
@ -29,22 +29,20 @@
|
|
|
|
#include "utils/NamedEnum.h"
|
|
|
|
#include "utils/NamedEnum.h"
|
|
|
|
#include "utils/Variant.h"
|
|
|
|
#include "utils/Variant.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <QVariantMap>
|
|
|
|
#include <QtDBus/QDBusConnection>
|
|
|
|
#include <QtDBus/QDBusConnection>
|
|
|
|
#include <QtDBus/QDBusInterface>
|
|
|
|
#include <QtDBus/QDBusInterface>
|
|
|
|
#include <QtDBus/QDBusReply>
|
|
|
|
#include <QtDBus/QDBusReply>
|
|
|
|
#include <QVariantMap>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const NamedEnumTable< FinishedViewStep::RestartMode >&
|
|
|
|
static const NamedEnumTable< FinishedViewStep::RestartMode >&
|
|
|
|
modeNames()
|
|
|
|
modeNames()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
using Mode = FinishedViewStep::RestartMode;
|
|
|
|
using Mode = FinishedViewStep::RestartMode;
|
|
|
|
|
|
|
|
|
|
|
|
static const NamedEnumTable< Mode > names{
|
|
|
|
static const NamedEnumTable< Mode > names { { QStringLiteral( "never" ), Mode::Never },
|
|
|
|
{ QStringLiteral( "never" ), Mode::Never },
|
|
|
|
|
|
|
|
{ QStringLiteral( "user-unchecked" ), Mode::UserUnchecked },
|
|
|
|
{ QStringLiteral( "user-unchecked" ), Mode::UserUnchecked },
|
|
|
|
{ QStringLiteral( "user-checked" ), Mode::UserChecked },
|
|
|
|
{ QStringLiteral( "user-checked" ), Mode::UserChecked },
|
|
|
|
{ QStringLiteral( "always" ), Mode::Always }
|
|
|
|
{ QStringLiteral( "always" ), Mode::Always } };
|
|
|
|
} ;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return names;
|
|
|
|
return names;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -56,10 +54,8 @@ FinishedViewStep::FinishedViewStep( QObject* parent )
|
|
|
|
, m_notifyOnFinished( false )
|
|
|
|
, m_notifyOnFinished( false )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto jq = Calamares::JobQueue::instance();
|
|
|
|
auto jq = Calamares::JobQueue::instance();
|
|
|
|
connect( jq, &Calamares::JobQueue::failed,
|
|
|
|
connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed );
|
|
|
|
m_widget, &FinishedPage::onInstallationFailed );
|
|
|
|
connect( jq, &Calamares::JobQueue::failed, this, &FinishedViewStep::onInstallationFailed );
|
|
|
|
connect( jq, &Calamares::JobQueue::failed,
|
|
|
|
|
|
|
|
this, &FinishedViewStep::onInstallationFailed );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
emit nextStatusChanged( true );
|
|
|
|
emit nextStatusChanged( true );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -68,7 +64,9 @@ FinishedViewStep::FinishedViewStep( QObject* parent )
|
|
|
|
FinishedViewStep::~FinishedViewStep()
|
|
|
|
FinishedViewStep::~FinishedViewStep()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ( m_widget && m_widget->parent() == nullptr )
|
|
|
|
if ( m_widget && m_widget->parent() == nullptr )
|
|
|
|
|
|
|
|
{
|
|
|
|
m_widget->deleteLater();
|
|
|
|
m_widget->deleteLater();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -119,30 +117,36 @@ FinishedViewStep::sendNotification()
|
|
|
|
// If the installation failed, don't send notification popup;
|
|
|
|
// If the installation failed, don't send notification popup;
|
|
|
|
// there's a (modal) dialog popped up with the failure notice.
|
|
|
|
// there's a (modal) dialog popped up with the failure notice.
|
|
|
|
if ( installFailed )
|
|
|
|
if ( installFailed )
|
|
|
|
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
QDBusInterface notify( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" );
|
|
|
|
QDBusInterface notify(
|
|
|
|
|
|
|
|
"org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" );
|
|
|
|
if ( notify.isValid() )
|
|
|
|
if ( notify.isValid() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QDBusReply<uint> r = notify.call( "Notify",
|
|
|
|
const auto* branding = Calamares::Branding::instance();
|
|
|
|
|
|
|
|
QDBusReply< uint > r = notify.call(
|
|
|
|
|
|
|
|
"Notify",
|
|
|
|
QString( "Calamares" ),
|
|
|
|
QString( "Calamares" ),
|
|
|
|
QVariant( 0U ),
|
|
|
|
QVariant( 0U ),
|
|
|
|
QString( "calamares" ),
|
|
|
|
QString( "calamares" ),
|
|
|
|
|
|
|
|
Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) : tr( "Installation Complete" ),
|
|
|
|
Calamares::Settings::instance()->isSetupMode()
|
|
|
|
Calamares::Settings::instance()->isSetupMode()
|
|
|
|
? tr( "Setup Complete" )
|
|
|
|
? tr( "The setup of %1 is complete." ).arg( branding->versionedName() )
|
|
|
|
: tr( "Installation Complete" ),
|
|
|
|
: tr( "The installation of %1 is complete." ).arg( branding->versionedName() ),
|
|
|
|
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 ) );
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( !r.isValid() )
|
|
|
|
if ( !r.isValid() )
|
|
|
|
|
|
|
|
{
|
|
|
|
cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error();
|
|
|
|
cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
cWarning() << "Could not get dbus interface for notifications at end of installation." << notify.lastError();
|
|
|
|
cWarning() << "Could not get dbus interface for notifications at end of installation." << notify.lastError();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -152,7 +156,9 @@ FinishedViewStep::onActivate()
|
|
|
|
m_widget->setUpRestart();
|
|
|
|
m_widget->setUpRestart();
|
|
|
|
|
|
|
|
|
|
|
|
if ( m_notifyOnFinished )
|
|
|
|
if ( m_notifyOnFinished )
|
|
|
|
|
|
|
|
{
|
|
|
|
sendNotification();
|
|
|
|
sendNotification();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -179,23 +185,31 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
if ( restartMode.isEmpty() )
|
|
|
|
if ( restartMode.isEmpty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ( configurationMap.contains( "restartNowEnabled" ) )
|
|
|
|
if ( configurationMap.contains( "restartNowEnabled" ) )
|
|
|
|
|
|
|
|
{
|
|
|
|
cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings";
|
|
|
|
cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
|
|
|
|
bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
|
|
|
|
bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
|
|
|
|
bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
|
|
|
|
|
|
|
|
|
|
|
|
if ( !restartNowEnabled )
|
|
|
|
if ( !restartNowEnabled )
|
|
|
|
|
|
|
|
{
|
|
|
|
mode = RestartMode::Never;
|
|
|
|
mode = RestartMode::Never;
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
mode = restartNowChecked ? RestartMode::UserChecked : RestartMode::UserUnchecked;
|
|
|
|
mode = restartNowChecked ? RestartMode::UserChecked : RestartMode::UserUnchecked;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool ok = false;
|
|
|
|
bool ok = false;
|
|
|
|
mode = modeNames().find( restartMode, ok );
|
|
|
|
mode = modeNames().find( restartMode, ok );
|
|
|
|
if ( !ok )
|
|
|
|
if ( !ok )
|
|
|
|
|
|
|
|
{
|
|
|
|
cWarning() << "Configuring the finished module with bad restartNowMode" << restartMode;
|
|
|
|
cWarning() << "Configuring the finished module with bad restartNowMode" << restartMode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
m_widget->setRestart( mode );
|
|
|
|
m_widget->setRestart( mode );
|
|
|
|
|
|
|
|
|
|
|
|
@ -203,18 +217,21 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" );
|
|
|
|
QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" );
|
|
|
|
if ( restartNowCommand.isEmpty() )
|
|
|
|
if ( restartNowCommand.isEmpty() )
|
|
|
|
|
|
|
|
{
|
|
|
|
restartNowCommand = QStringLiteral( "shutdown -r now" );
|
|
|
|
restartNowCommand = QStringLiteral( "shutdown -r now" );
|
|
|
|
|
|
|
|
}
|
|
|
|
m_widget->setRestartNowCommand( restartNowCommand );
|
|
|
|
m_widget->setRestartNowCommand( restartNowCommand );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false );
|
|
|
|
m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
QString FinishedViewStep::modeName(FinishedViewStep::RestartMode m)
|
|
|
|
QString
|
|
|
|
|
|
|
|
FinishedViewStep::modeName( FinishedViewStep::RestartMode m )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool ok = false;
|
|
|
|
bool ok = false;
|
|
|
|
return modeNames().find( m, ok ); // May be QString()
|
|
|
|
return modeNames().find( m, ok ); // May be QString()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin<FinishedViewStep>(); )
|
|
|
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin< FinishedViewStep >(); )
|
|
|
|
|
Adriaan de Groot
5 years ago