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

[partition] Don't show capacity of new LVM VGs in DeviceModel.

Browse Source
This commit is contained in:
Caio 2018-06-07 17:49:25 -03:00
parent 208d58bcd9
commit e5351cdf3c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/partition/core/DeviceModel.cpp
View File

@ -79,10 +79,18 @@ DeviceModel::data( const QModelIndex& index, int role ) const
if ( device->name().isEmpty() ) if ( device->name().isEmpty() )
return device->deviceNode(); return device->deviceNode();
else else
return tr( "%1 - %2 (%3)" ) {
.arg( device->name() ) if ( device->capacity() != 1 )
.arg( KFormat().formatByteSize( device->capacity() ) ) return tr( "%1 - %2 (%3)" )
.arg( device->deviceNode() ); .arg( device->name() )
.arg( KFormat().formatByteSize( device->capacity() ) )
.arg( device->deviceNode() );
// Newly LVM VGs don't have capacity property yet (i.e. always has 1B capacity), so don't show it for a while
else
return tr( "%1 - (%2)" )
.arg( device->name() )
.arg( device->deviceNode() );
}
case Qt::DecorationRole: case Qt::DecorationRole:
return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk, return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk,
CalamaresUtils::Original, CalamaresUtils::Original,