Add prettyStatusMessage to Clear* and Check* partitioning jobs.

This commit is contained in:
Teo Mrnjavac 2015-06-13 02:24:58 +02:00
parent eae237211f
commit 3855998fe5
6 changed files with 27 additions and 1 deletions

View File

@ -34,6 +34,14 @@ CheckFileSystemJob::prettyName() const
return tr( "Checking file system on partition %1." ).arg( path ); return tr( "Checking file system on partition %1." ).arg( path );
} }
QString
CheckFileSystemJob::prettyStatusMessage() const
{
return prettyName();
}
Calamares::JobResult Calamares::JobResult
CheckFileSystemJob::exec() CheckFileSystemJob::exec()
{ {

View File

@ -31,6 +31,7 @@ public:
CheckFileSystemJob( Partition* partition ); CheckFileSystemJob( Partition* partition );
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
}; };

View File

@ -44,6 +44,14 @@ ClearMountsJob::prettyName() const
} }
QString
ClearMountsJob::prettyStatusMessage() const
{
return tr( "Clearing mounts for partitioning operations on %1." )
.arg( m_device->deviceNode() );
}
Calamares::JobResult Calamares::JobResult
ClearMountsJob::exec() ClearMountsJob::exec()
{ {

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
@ -33,6 +33,7 @@ class ClearMountsJob : public Calamares::Job
public: public:
explicit ClearMountsJob( Device* device ); explicit ClearMountsJob( Device* device );
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
private: private:
QString tryUmount( const QString& partPath ); QString tryUmount( const QString& partPath );

View File

@ -39,6 +39,13 @@ ClearTempMountsJob::prettyName() const
} }
QString
ClearTempMountsJob::prettyStatusMessage() const
{
return tr( "Clearing all temporary mounts." );
}
Calamares::JobResult Calamares::JobResult
ClearTempMountsJob::exec() ClearTempMountsJob::exec()
{ {

View File

@ -33,6 +33,7 @@ class ClearTempMountsJob : public Calamares::Job
public: public:
explicit ClearTempMountsJob(); explicit ClearTempMountsJob();
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
}; };