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

Display current filesystem label as a column in the main partition view.

Browse Source
This commit is contained in:
shainer 2016-07-23 22:28:22 +01:00 committed by Adriaan de Groot
parent 405fc3dfc2
commit 1cfdc8044c
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/core/PartitionModel.cpp
View File

@ -167,6 +167,10 @@ PartitionModel::data( const QModelIndex& index, int role ) const
{ {
return CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); return CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() );
} }
if ( col == FileSystemLabelColumn )
{
return partition->fileSystem().label();
}
if ( col == MountPointColumn ) if ( col == MountPointColumn )
{ {
return PartitionInfo::mountPoint( partition ); return PartitionInfo::mountPoint( partition );
@ -296,6 +300,8 @@ PartitionModel::headerData( int section, Qt::Orientation, int role ) const
return tr( "Name" ); return tr( "Name" );
case FileSystemColumn: case FileSystemColumn:
return tr( "File System" ); return tr( "File System" );
case FileSystemLabelColumn:
return tr( "File System Label" );
case MountPointColumn: case MountPointColumn:
return tr( "Mount Point" ); return tr( "Mount Point" );
case SizeColumn: case SizeColumn:

1
src/modules/partition/core/PartitionModel.h
View File

@ -79,6 +79,7 @@ public:
{ {
NameColumn, NameColumn,
FileSystemColumn, FileSystemColumn,
FileSystemLabelColumn,
MountPointColumn, MountPointColumn,
SizeColumn, SizeColumn,
ColumnCount // Must remain last ColumnCount // Must remain last