diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index b6ced2a1d..6584b8a54 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
https://github.com/sponsors/martinrotter
-
+
none
diff --git a/resources/graphics/banner.png b/resources/graphics/banner.png
new file mode 100755
index 000000000..0e35612ef
Binary files /dev/null and b/resources/graphics/banner.png differ
diff --git a/resources/graphics/original_sizes/banner.psd b/resources/graphics/original_sizes/banner.psd
new file mode 100755
index 000000000..821918223
Binary files /dev/null and b/resources/graphics/original_sizes/banner.psd differ
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.cpp b/src/librssguard/gui/settings/settingsfeedsmessages.cpp
index 93104dc45..b24d106f0 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.cpp
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.cpp
@@ -23,8 +23,11 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent
m_ui->m_spinStartupUpdateDelay->setMode(TimeSpinBox::Mode::MinutesSeconds);
initializeMessageDateFormats();
- GuiUtilities::setLabelAsNotice(*m_ui->label_9, false);
+ m_ui->m_helpCountsFeedsFormat->setHelpText(tr("Enter format for count of articles displayed next to each "
+ "feed/category in feed list. Use \"%all\" and \"%unread\" strings "
+ "which are placeholders for the actual count of all (or unread) articles."),
+ false);
m_ui->m_helpMultilineArticleList->setHelpText(tr("Note that enabling this might have drastic consequences on "
"performance of article list with big number of articles."),
true);
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index b07b036c9..f96f9c413 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -18,7 +18,7 @@
- Feeds
+ Feed fetching
-
@@ -80,7 +80,7 @@
- -
+
-
Feed connection timeout
@@ -90,7 +90,7 @@
- -
+
-
@@ -115,17 +115,37 @@
- -
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ Feeds list
+
+
+ -
- Feed list row height
+ Row height
m_spinHeightRowsFeeds
- -
+
-
@@ -144,17 +164,66 @@
- -
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Feed list font
+
+
+
-
+
+
+ Font preview
+
+
+ m_btnChangeFeedListFont
+
+
+
+ -
+
+
+ &Change font
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
- Article count format in feed list
+ Article count format
m_cmbCountsFeedList
- -
+
-
@@ -170,40 +239,32 @@
- -
-
-
-
- true
-
-
-
- Enter format for count of articles displayed next to each feed/category in feed list. Use "%all" and "%unread" strings which are placeholders for the actual count of all (or unread) articles.
-
-
- Qt::AlignCenter
-
-
- true
-
-
+
-
+
- -
+
-
Hide article counts if there are no unread articles
- -
+
-
+
+
+ Allow only basic keyboard shortcuts for feed/article list
+
+
+
+ -
Display tooltips for feeds and articles
- -
-
+
-
+
Qt::Vertical
@@ -215,45 +276,6 @@
- -
-
-
- Allow only basic keyboard shortcuts for feed/article list
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Feed list font
-
-
-
-
-
-
- Font preview
-
-
- m_btnChangeFeedListFont
-
-
-
- -
-
-
- &Change font
-
-
-
-
-
-
@@ -290,56 +312,13 @@
-
-
-
- Display real icons of feeds in list of articles instead of read/unread icons
-
-
-
- -
Bring application window to front once article is opened in external web browser
- -
-
-
- Keep article selection in the middle of the article list viewport
-
-
-
- -
-
-
- Article list row height
-
-
- m_spinHeightRowsMessages
-
-
-
- -
-
-
-
- 150
- 0
-
-
-
- px
-
-
- -1
-
-
- 100
-
-
-
- -
+
-
Image attachments height
@@ -349,7 +328,7 @@
- -
+
-
px
@@ -362,86 +341,8 @@
- -
-
-
- Use custom date/time format
-
-
- true
-
-
- true
-
-
-
- -
-
-
-
- 150
- 0
-
-
-
- true
-
-
-
- -
-
-
- Custom date/time format for today's articles
-
-
- true
-
-
- true
-
-
-
- -
-
-
-
- 150
- 0
-
-
-
- true
-
-
-
- -
+
-
-
-
-
-
- Article list font
-
-
-
-
-
-
- Font preview
-
-
- m_btnChangeMessageListFont
-
-
-
- -
-
-
- &Change font
-
-
-
-
-
-
-
@@ -483,7 +384,7 @@
- -
+
-
Qt::Vertical
@@ -496,14 +397,28 @@
- -
-
+
+
+
+
+ Articles list
+
+
+
-
+
- Enable multiline article list items
+ Display real icons of feeds instead of read/unread icons
- -
+
-
+
+
+ Keep article selection in the middle of the article list viewport
+
+
+
+ -
@@ -513,7 +428,46 @@
- -
+
-
+
+
+ Row height
+
+
+ m_spinHeightRowsMessages
+
+
+
+ -
+
+
+
+ 150
+ 0
+
+
+
+ px
+
+
+ -1
+
+
+ 100
+
+
+
+ -
+
+
+ Top/bottom row padding
+
+
+ m_spinPaddingRowsMessages
+
+
+
+ -
@@ -532,13 +486,101 @@
- -
-
+
-
+
- Article list top/bottom row padding
+ Use custom date/time format
-
- m_spinPaddingRowsMessages
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+
+ 150
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Custom date/time format for today's articles
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+
+ 150
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Article list font
+
+
+
-
+
+
+ Font preview
+
+
+ m_btnChangeMessageListFont
+
+
+
+ -
+
+
+ &Change font
+
+
+
+
+
+
+ -
+
+
+ Enable multiline items
@@ -562,35 +604,18 @@
- m_tabFeedsMessages
m_checkUpdateAllFeedsOnStartup
m_spinStartupUpdateDelay
m_checkAutoUpdate
m_spinAutoUpdateInterval
m_checkAutoUpdateOnlyUnfocused
m_spinFeedUpdateTimeout
- m_spinHeightRowsFeeds
- m_btnChangeFeedListFont
- m_cmbCountsFeedList
- m_cbHideCountsIfNoUnread
- m_cbListsRestrictedShortcuts
- m_checkShowTooltips
m_checkRemoveReadMessagesOnExit
m_cmbIgnoreContentsChanges
m_checkDisplayPlaceholders
m_cbShowEnclosuresDirectly
- m_checkDisplayFeedIcons
m_checkBringToForegroundAfterMsgOpened
- m_checkKeppMessagesInTheMiddle
- m_checkMultilineArticleList
- m_spinHeightRowsMessages
- m_spinPaddingRowsMessages
m_spinHeightImageAttachments
- m_checkMessagesDateTimeFormat
- m_cmbMessagesDateTimeFormat
- m_checkMessagesTimeFormat
- m_cmbMessagesTimeFormat
- m_btnChangeMessageListFont
m_btnChangeMessagesFont