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

[partition] Display partition labels when they exist

Browse Source 
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
This commit is contained in:
Arnaud Ferraris 2019-01-07 17:26:53 +01:00
parent 0d284759f5
commit 74a59ae68a
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/partition/gui/PartitionLabelsView.cpp
View File

@ -185,26 +185,35 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const
if ( index.data( PartitionModel::IsPartitionNewRole ).toBool() ) if ( index.data( PartitionModel::IsPartitionNewRole ).toBool() )
{ {
QString mountPoint = index.sibling( index.row(), QString label = index.data( PartitionModel::FileSystemLabelRole ).toString();
PartitionModel::MountPointColumn )
.data().toString(); if ( !label.isEmpty() )
if ( mountPoint == "/" ) {
firstLine = m_customNewRootLabel.isEmpty() ? firstLine = label;
tr( "Root" ) : }
m_customNewRootLabel;
else if ( mountPoint == "/home" )
firstLine = tr( "Home" );
else if ( mountPoint == "/boot" )
firstLine = tr( "Boot" );
else if ( mountPoint.contains( "/efi" ) &&
index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::Fat32 )
firstLine = tr( "EFI system" );
else if ( index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::LinuxSwap )
firstLine = tr( "Swap" );
else if ( !mountPoint.isEmpty() )
firstLine = tr( "New partition for %1" ).arg( mountPoint );
else else
firstLine = tr( "New partition" ); {
QString mountPoint = index.sibling( index.row(),
PartitionModel::MountPointColumn )
.data().toString();
if ( mountPoint == "/" )
firstLine = m_customNewRootLabel.isEmpty() ?
tr( "Root" ) :
m_customNewRootLabel;
else if ( mountPoint == "/home" )
firstLine = tr( "Home" );
else if ( mountPoint == "/boot" )
firstLine = tr( "Boot" );
else if ( mountPoint.contains( "/efi" ) &&
index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::Fat32 )
firstLine = tr( "EFI system" );
else if ( index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::LinuxSwap )
firstLine = tr( "Swap" );
else if ( !mountPoint.isEmpty() )
firstLine = tr( "New partition for %1" ).arg( mountPoint );
else
firstLine = tr( "New partition" );
}
} }
else if ( index.data( PartitionModel::OsproberNameRole ).toString().isEmpty() ) else if ( index.data( PartitionModel::OsproberNameRole ).toString().isEmpty() )
{ {