applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 01:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Switch to convenience function for MiB

Browse source
This commit is contained in:
Adriaan de Groot 2017-12-14 16:00:46 -05:00
parent 38688bab47
commit 5c4286eebf
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/partition/jobs/SetPartitionFlagsJob.cpp
View file

@ -22,6 +22,7 @@
#include "SetPartitionFlagsJob.h"
#include "utils/Logger.h"
#include "utils/Units.h"
// KPMcore
#include <core/device.h>
@ -30,6 +31,8 @@
#include <ops/setpartflagsoperation.h>
#include <util/report.h>
using CalamaresUtils::BytesToMiB;
SetPartFlagsJob::SetPartFlagsJob( Device* device,
Partition* partition,
PartitionTable::Flags flags )
@ -47,7 +50,7 @@ SetPartFlagsJob::prettyName() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Set flags on %1MB %2 partition." )
.arg( partition()->capacity() /1024 /1024 )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
return tr( "Set flags on new partition." );
@ -66,7 +69,7 @@ SetPartFlagsJob::prettyDescription() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Clear flags on %1MB <strong>%2</strong> partition." )
.arg( partition()->capacity() /1024 /1024 )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
return tr( "Clear flags on new partition." );
@ -81,7 +84,7 @@ SetPartFlagsJob::prettyDescription() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Flag %1MB <strong>%2</strong> partition as "
"<strong>%3</strong>." )
.arg( partition()->capacity() /1024 /1024 )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );
@ -102,7 +105,7 @@ SetPartFlagsJob::prettyStatusMessage() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Clearing flags on %1MB <strong>%2</strong> partition." )
.arg( partition()->capacity() /1024 /1024 )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
return tr( "Clearing flags on new partition." );
@ -117,7 +120,7 @@ SetPartFlagsJob::prettyStatusMessage() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Setting flags <strong>%3</strong> on "
"%1MB <strong>%2</strong> partition." )
.arg( partition()->capacity() /1024 /1024 )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );