diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index a5e2ee40a..a5b46a59e 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -64,6 +64,15 @@ CreatePartitionJob::prettyDescription() const .arg( m_device->deviceNode() ); } + +QString +CreatePartitionJob::prettyStatusMessage() const +{ + return tr( "Creating new %1 partition on %2." ) + .arg( m_partition->fileSystem().name() ) + .arg( m_device->deviceNode() ); +} + Calamares::JobResult CreatePartitionJob::exec() { diff --git a/src/modules/partition/jobs/CreatePartitionJob.h b/src/modules/partition/jobs/CreatePartitionJob.h index 33ad161b8..f3f708457 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.h +++ b/src/modules/partition/jobs/CreatePartitionJob.h @@ -40,6 +40,7 @@ public: CreatePartitionJob( Device* device, Partition* partition ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; void updatePreview(); diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 37b8f8338..3564e4bb2 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -59,6 +59,16 @@ QString CreatePartitionTableJob::prettyDescription() const .arg( m_device->name() ); } + +QString +CreatePartitionTableJob::prettyStatusMessage() const +{ + return tr( "Creating new %1 partition table on %2." ) + .arg( PartitionTable::tableTypeToName( m_type ).toUpper() ) + .arg( m_device->deviceNode() ); +} + + Calamares::JobResult CreatePartitionTableJob::exec() { diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h index 92235e798..a1e9c9bf9 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.h +++ b/src/modules/partition/jobs/CreatePartitionTableJob.h @@ -40,6 +40,7 @@ public: CreatePartitionTableJob( Device* device, PartitionTable::TableType type ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; void updatePreview(); diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index ca36e80de..cca590432 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -51,6 +51,15 @@ DeletePartitionJob::prettyDescription() const .arg( m_partition->partitionPath() ); } + +QString +DeletePartitionJob::prettyStatusMessage() const +{ + return tr( "Deleting partition %1." ) + .arg( m_partition->partitionPath() ); +} + + Calamares::JobResult DeletePartitionJob::exec() { diff --git a/src/modules/partition/jobs/DeletePartitionJob.h b/src/modules/partition/jobs/DeletePartitionJob.h index 3d4771e72..f4a9e64c3 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.h +++ b/src/modules/partition/jobs/DeletePartitionJob.h @@ -40,6 +40,7 @@ public: DeletePartitionJob( Device* device, Partition* partition ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; void updatePreview(); diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 64eadfbc0..ac577d033 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -145,6 +145,13 @@ FillGlobalStorageJob::prettyDescription() const return lines.join( "
" ); } + +QString +FillGlobalStorageJob::prettyStatusMessage() const +{ + return tr( "Setting up mount points." ); +} + Calamares::JobResult FillGlobalStorageJob::exec() { diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.h b/src/modules/partition/jobs/FillGlobalStorageJob.h index c514e624b..b3609ad3f 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.h +++ b/src/modules/partition/jobs/FillGlobalStorageJob.h @@ -42,6 +42,7 @@ public: FillGlobalStorageJob( QList< Device* > devices, const QString& bootLoaderPath ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; private: QList< Device* > m_devices; diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 70ad35590..c7a9be920 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -60,9 +60,20 @@ FormatPartitionJob::prettyDescription() const "file system %2." ) .arg( m_partition->partitionPath() ) .arg( m_partition->fileSystem().name() ) - .arg( m_partition->capacity() / 1024 / 1024 ); + .arg( m_partition->capacity() / 1024 / 1024 ); } + +QString +FormatPartitionJob::prettyStatusMessage() const +{ + return tr( "Formatting partition %1 with " + "file system %2." ) + .arg( m_partition->partitionPath() ) + .arg( m_partition->fileSystem().name() ); +} + + Calamares::JobResult FormatPartitionJob::exec() { diff --git a/src/modules/partition/jobs/FormatPartitionJob.h b/src/modules/partition/jobs/FormatPartitionJob.h index 1bb8453a5..a1ab853e0 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.h +++ b/src/modules/partition/jobs/FormatPartitionJob.h @@ -39,6 +39,7 @@ public: FormatPartitionJob( Device* device, Partition* partition ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; Device* device() const diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp index 837dfba6a..171a4767d 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.cpp +++ b/src/modules/partition/jobs/ResizePartitionJob.cpp @@ -198,6 +198,18 @@ ResizePartitionJob::prettyDescription() const .arg( ( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() / 1024 / 1024 ); } + +QString +ResizePartitionJob::prettyStatusMessage() const +{ + return tr( "Resizing %2MB partition %1 to " + "%3MB." ) + .arg( partition()->partitionPath() ) + .arg( partition()->capacity() / 1024 / 1024 ) + .arg( ( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() / 1024 / 1024 ); +} + + Calamares::JobResult ResizePartitionJob::exec() { diff --git a/src/modules/partition/jobs/ResizePartitionJob.h b/src/modules/partition/jobs/ResizePartitionJob.h index 8952745f3..2b43900d6 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.h +++ b/src/modules/partition/jobs/ResizePartitionJob.h @@ -38,6 +38,7 @@ public: ResizePartitionJob( Device* device, Partition* partition, qint64 firstSector, qint64 lastSector ); QString prettyName() const override; QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; void updatePreview();