From c765de654c53e13c13884214ca64d07f1bd448ef Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 15 Dec 2015 15:41:42 +0100 Subject: [PATCH] Add filesystem label role. --- src/modules/partition/core/PartitionModel.cpp | 6 ++++++ src/modules/partition/core/PartitionModel.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index 43cdc0fba..cc6695428 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -164,6 +164,12 @@ PartitionModel::data( const QModelIndex& index, int role ) const case IsFreeSpaceRole: return KPMHelpers::isPartitionFreeSpace( partition ); + case FileSystemLabelRole: + if ( partition->fileSystem().supportGetLabel() != FileSystem::cmdSupportNone && + !partition->fileSystem().label().isEmpty() ) + return partition->fileSystem().label(); + return QVariant(); + // 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 ad80733ab..ec6db2c9c 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -69,6 +69,7 @@ public: // SizeColumn, which is a human-readable string. SizeRole = Qt::UserRole + 1, IsFreeSpaceRole, + FileSystemLabelRole, OsproberNameRole, OsproberPathRole, OsproberCanBeResizedRole,