mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-27 01:15:38 -04:00
[welcome] [partition] Rename GlobalStorage variable used for storage
- Change name passed into GS to use "GiB" instead of "GB", for consistency. This needs to be done in consumers as well.
This commit is contained in:
parent
599b34c70e
commit
502d43d111
4 changed files with 6 additions and 6 deletions
|
@ -462,7 +462,7 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
|
|||
gs->value( "defaultFileSystemType" ).toString(),
|
||||
m_encryptWidget->passphrase(),
|
||||
gs->value( "efiSystemPartition" ).toString(),
|
||||
CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
|
||||
CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGiB" ).toDouble() ),
|
||||
m_eraseSwapChoice
|
||||
};
|
||||
|
||||
|
@ -560,7 +560,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
|
|||
|
||||
double requiredStorageGB = Calamares::JobQueue::instance()
|
||||
->globalStorage()
|
||||
->value( "requiredStorageGB" )
|
||||
->value( "requiredStorageGiB" )
|
||||
.toDouble();
|
||||
|
||||
// TODO: make this consistent
|
||||
|
|
|
@ -143,7 +143,7 @@ ReplaceWidget::onPartitionSelected()
|
|||
bool ok = false;
|
||||
double requiredSpaceB = Calamares::JobQueue::instance()
|
||||
->globalStorage()
|
||||
->value( "requiredStorageGB" )
|
||||
->value( "requiredStorageGiB" )
|
||||
.toDouble( &ok ) * 1024 * 1024 * 1024;
|
||||
|
||||
PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue