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

Add separate FileSystemTypeRole to PM, and output FS PrettyNames.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-16 15:47:11 +01:00
parent 2986625cfd
commit df13b3ba08
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
} }
} }
if ( col == FileSystemColumn ) if ( col == FileSystemColumn )
return partition->fileSystem().name(); return KPMHelpers::prettyNameForFileSystemType( partition->fileSystem().type() );
if ( col == MountPointColumn ) if ( col == MountPointColumn )
return PartitionInfo::mountPoint( partition ); return PartitionInfo::mountPoint( partition );
if ( col == SizeColumn ) if ( col == SizeColumn )
@ -173,6 +173,9 @@ PartitionModel::data( const QModelIndex& index, int role ) const
return partition->fileSystem().label(); return partition->fileSystem().label();
return QVariant(); return QVariant();
case FileSystemTypeRole:
return partition->fileSystem().type();
// Osprober roles: // Osprober roles:
case OsproberNameRole: case OsproberNameRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )

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

@ -71,6 +71,7 @@ public:
IsFreeSpaceRole, IsFreeSpaceRole,
IsPartitionNewRole, IsPartitionNewRole,
FileSystemLabelRole, FileSystemLabelRole,
FileSystemTypeRole,
OsproberNameRole, OsproberNameRole,
OsproberPathRole, OsproberPathRole,
OsproberCanBeResizedRole, OsproberCanBeResizedRole,