napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Use GiB and MiB consistently

Browse Source
This commit is contained in:
Adriaan de Groot 2019-05-06 16:47:11 +02:00
parent 502d43d111
commit d3783ef293
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/partition/gui/ChoicePage.cpp
View File

@ -563,8 +563,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
->value( "requiredStorageGiB" ) ->value( "requiredStorageGiB" )
.toDouble(); .toDouble();
// TODO: make this consistent qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 );
qint64 requiredStorageB = qRound64( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
m_afterPartitionSplitterWidget->setSplitPartition( m_afterPartitionSplitterWidget->setSplitPartition(
part->partitionPath(), part->partitionPath(),
@ -967,11 +966,11 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
qint64 sizeNext ) qint64 sizeNext )
{ {
Q_UNUSED( path ) Q_UNUSED( path )
sizeLabel->setText( tr( "%1 will be shrunk to %2MB and a new " sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new "
"%3MB partition will be created for %4." ) "%3MiB partition will be created for %4." )
.arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() )
.arg( size / ( 1024 * 1024 ) ) .arg( CalamaresUtils::BytesToMiB( size ) )
.arg( sizeNext / ( 1024 * 1024 ) ) .arg( CalamaresUtils::BytesToMiB( sizeNext ) )
.arg( *Calamares::Branding::ShortProductName ) ); .arg( *Calamares::Branding::ShortProductName ) );
} ); } );