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

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

@ -184,6 +184,14 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const
QString firstLine, secondLine; QString firstLine, secondLine;
if ( index.data( PartitionModel::IsPartitionNewRole ).toBool() ) if ( index.data( PartitionModel::IsPartitionNewRole ).toBool() )
{
QString label = index.data( PartitionModel::FileSystemLabelRole ).toString();
if ( !label.isEmpty() )
{
firstLine = label;
}
else
{ {
QString mountPoint = index.sibling( index.row(), QString mountPoint = index.sibling( index.row(),
PartitionModel::MountPointColumn ) PartitionModel::MountPointColumn )
@ -206,6 +214,7 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const
else else
firstLine = tr( "New partition" ); firstLine = tr( "New partition" );
} }
}
else if ( index.data( PartitionModel::OsproberNameRole ).toString().isEmpty() ) else if ( index.data( PartitionModel::OsproberNameRole ).toString().isEmpty() )
{ {
firstLine = index.data().toString(); firstLine = index.data().toString();