From df13b3ba082dee59590beb96a3de31cd33cf6daf Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 16 Dec 2015 15:47:11 +0100 Subject: [PATCH] Add separate FileSystemTypeRole to PM, and output FS PrettyNames. --- src/modules/partition/core/PartitionModel.cpp | 5 ++++- src/modules/partition/core/PartitionModel.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index 6f2897551..0cf4203fa 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -143,7 +143,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const } } if ( col == FileSystemColumn ) - return partition->fileSystem().name(); + return KPMHelpers::prettyNameForFileSystemType( partition->fileSystem().type() ); if ( col == MountPointColumn ) return PartitionInfo::mountPoint( partition ); if ( col == SizeColumn ) @@ -173,6 +173,9 @@ PartitionModel::data( const QModelIndex& index, int role ) const return partition->fileSystem().label(); return QVariant(); + case FileSystemTypeRole: + return partition->fileSystem().type(); + // Osprober roles: case OsproberNameRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h index dd279fe99..aab74bac8 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -71,6 +71,7 @@ public: IsFreeSpaceRole, IsPartitionNewRole, FileSystemLabelRole, + FileSystemTypeRole, OsproberNameRole, OsproberPathRole, OsproberCanBeResizedRole,