Add prettyStatusMessage to all partitioning jobs.

CAL-235 #comment Improved status messages for jobs while installing.
main
Teo Mrnjavac 10 years ago
parent 3855998fe5
commit 2a0ad54fd5

@ -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()
{

@ -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();

@ -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()
{

@ -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();

@ -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()
{

@ -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();

@ -145,6 +145,13 @@ FillGlobalStorageJob::prettyDescription() const
return lines.join( "<br/>" );
}
QString
FillGlobalStorageJob::prettyStatusMessage() const
{
return tr( "Setting up mount points." );
}
Calamares::JobResult
FillGlobalStorageJob::exec()
{

@ -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;

@ -60,9 +60,20 @@ FormatPartitionJob::prettyDescription() const
"file system <strong>%2</strong>." )
.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()
{

@ -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

@ -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()
{

@ -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();

Loading…
Cancel
Save