From a9ac1f12521f6dcac287766e6ee5ed5c643e88e7 Mon Sep 17 00:00:00 2001 From: Serg Podtynnyi Date: Sat, 4 Feb 2023 21:57:38 +0700 Subject: [PATCH] Add Page count and Publisher columns BUG: 374561 --- src/kitemviews/kfileitemmodel.cpp | 4 ++++ src/kitemviews/kfileitemmodel.h | 2 +- src/kitemviews/private/kbaloorolesprovider.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index c08f8e964b..5e6f9af01b 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -2118,6 +2118,8 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b, const case RatingRole: case WidthRole: case HeightRole: + case PublisherRole: + case PageCountRole: case WordCountRole: case LineCountRole: case TrackRole: @@ -2644,6 +2646,8 @@ const KFileItemModel::RoleInfoMap* KFileItemModel::rolesInfoMap(int& count) { "comment", CommentRole, kli18nc("@label", "Comment"), KLazyLocalizedString(), true, false }, { "title", TitleRole, kli18nc("@label", "Title"), kli18nc("@label", "Document"), true, true }, { "author", AuthorRole, kli18nc("@label", "Author"), kli18nc("@label", "Document"), true, true }, + { "publisher", PublisherRole, kli18nc("@label", "Publisher"), kli18nc("@label", "Document"), true, true }, + { "pageCount", PageCountRole, kli18nc("@label", "Page Count"), kli18nc("@label", "Document"), true, true }, { "wordCount", WordCountRole, kli18nc("@label", "Word Count"), kli18nc("@label", "Document"), true, true }, { "lineCount", LineCountRole, kli18nc("@label", "Line Count"), kli18nc("@label", "Document"), true, true }, { "imageDateTime", ImageDateTimeRole, kli18nc("@label", "Date Photographed"), kli18nc("@label", "Image"), true, true }, diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 74aec17a94..368ab76d88 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -298,7 +298,7 @@ private: GroupRole, TypeRole, ExtensionRole, DestinationRole, PathRole, DeletionTimeRole, // User visible roles available with Baloo: CommentRole, TagsRole, RatingRole, DimensionsRole, WidthRole, HeightRole, ImageDateTimeRole, OrientationRole, - WordCountRole, TitleRole, AuthorRole, LineCountRole, ArtistRole, GenreRole, AlbumRole, DurationRole, TrackRole, ReleaseYearRole, + PublisherRole, PageCountRole, WordCountRole, TitleRole, AuthorRole, LineCountRole, ArtistRole, GenreRole, AlbumRole, DurationRole, TrackRole, ReleaseYearRole, BitrateRole, OriginUrlRole, AspectRatioRole, FrameRateRole, // Non-visible roles: IsDirRole, IsLinkRole, IsHiddenRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole, diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index dd6df0aa77..f6d4dddb72 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -36,6 +36,8 @@ namespace { { Property::Comment, QByteArrayLiteral("comment") }, { Property::Title, QByteArrayLiteral("title") }, { Property::Author, QByteArrayLiteral("author") }, + { Property::Publisher, QByteArrayLiteral("publisher") }, + { Property::PageCount, QByteArrayLiteral("pageCount") }, { Property::WordCount, QByteArrayLiteral("wordCount") }, { Property::LineCount, QByteArrayLiteral("lineCount") }, { Property::Width, QByteArrayLiteral("width") },