From 208ff870e92b3d776f5c18070b057728ac91741a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 21 Oct 2021 09:16:07 +0200 Subject: [PATCH] trim start/end whitespace off feed title in lists --- src/librssguard/core/messagesmodel.cpp | 6 +++++- src/librssguard/services/abstract/rootitem.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp index fa6fcf963..0aa49c92a 100644 --- a/src/librssguard/core/messagesmodel.cpp +++ b/src/librssguard/core/messagesmodel.cpp @@ -307,9 +307,13 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const { return dt.toString(m_customDateFormat); } } + else if (index_column == MSG_DB_FEED_TITLE_INDEX) { + // Trim feed title. + return data(idx, Qt::ItemDataRole::EditRole).toString().trimmed(); + } else if (index_column == MSG_DB_CONTENTS_INDEX) { // Do not display full contents here. - QString contents = data(idx, Qt::EditRole).toString().mid(0, 64).simplified() + QL1S("..."); + QString contents = data(idx, Qt::ItemDataRole::EditRole).toString().mid(0, 64).simplified() + QL1S("..."); return contents; } diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp index 62429b158..2f078f26b 100644 --- a/src/librssguard/services/abstract/rootitem.cpp +++ b/src/librssguard/services/abstract/rootitem.cpp @@ -164,7 +164,7 @@ QVariant RootItem::data(int column, int role) const { case Qt::ItemDataRole::DisplayRole: if (column == FDS_MODEL_TITLE_INDEX) { - return m_title; + return m_title.trimmed(); } else if (column == FDS_MODEL_COUNTS_INDEX) { int count_unread = countOfUnreadMessages();