diff --git a/src/librssguard/gui/dialogs/formmain.ui b/src/librssguard/gui/dialogs/formmain.ui index 1e20196cf..d954191af 100644 --- a/src/librssguard/gui/dialogs/formmain.ui +++ b/src/librssguard/gui/dialogs/formmain.ui @@ -860,9 +860,6 @@ true - - true - &Sort alphabetically diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp index e2410760a..bdfa85dd5 100644 --- a/src/librssguard/gui/feedsview.cpp +++ b/src/librssguard/gui/feedsview.cpp @@ -836,9 +836,9 @@ void FeedsView::setupAppearance() { setUniformRowHeights(true); setAnimated(true); - setSortingEnabled(true); + setSortingEnabled(false); setItemsExpandable(true); - setAutoExpandDelay(0); + setAutoExpandDelay(200); setExpandsOnDoubleClick(true); setEditTriggers(QAbstractItemView::EditTrigger::NoEditTriggers); setIndentation(FEEDS_VIEW_INDENTATION); diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui index 87f4eba7a..01741bd27 100644 --- a/src/librssguard/gui/settings/settingsfeedsmessages.ui +++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui @@ -115,19 +115,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -263,19 +250,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -304,98 +278,111 @@ - - - - Display attached pictures directly in article - - - - + Bring application window to front once article is opened in external web browser - - - - Limit height of images + + + + Internal article viewer - - m_spinHeightImageAttachments - - - - - - - -1 - - - 4000 - - - -1 - - - - - - - - - Article browser font - - + + + + + Display attached pictures directly in article + + + + + - + - Font preview + Limit height of pictures - m_btnChangeMessagesFont + m_spinHeightImageAttachments - - - &Change font + + + -1 + + + 4000 + + + -1 + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + + + + Article browser font + + + + + + Font preview + + + m_btnChangeMessagesFont + + + + + + + &Change font + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + @@ -545,6 +532,23 @@ + + + + Show relative time for articles not older than + + + + + + + -1 + + + 300 + + + @@ -571,36 +575,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Show relative time for articles not older than - - - - - - - -1 - - - 300 - - - @@ -627,20 +601,19 @@ m_spinAutoUpdateInterval m_checkAutoUpdateOnlyUnfocused m_spinFeedUpdateTimeout - m_checkRemoveReadMessagesOnExit - m_cmbIgnoreContentsChanges - m_cbFixupArticleDatetime - m_cbShowEnclosuresDirectly - m_checkBringToForegroundAfterMsgOpened - m_spinHeightImageAttachments - m_btnChangeMessagesFont - m_tabFeedsMessages m_spinHeightRowsFeeds m_btnChangeFeedListFont m_cmbCountsFeedList m_cbHideCountsIfNoUnread m_cbListsRestrictedShortcuts m_checkShowTooltips + m_checkRemoveReadMessagesOnExit + m_cmbIgnoreContentsChanges + m_cbFixupArticleDatetime + m_checkBringToForegroundAfterMsgOpened + m_cbShowEnclosuresDirectly + m_spinHeightImageAttachments + m_btnChangeMessagesFont m_checkDisplayFeedIcons m_checkKeppMessagesInTheMiddle m_checkMultilineArticleList @@ -650,8 +623,9 @@ m_cmbMessagesDateTimeFormat m_checkMessagesTimeFormat m_cmbMessagesTimeFormat - m_btnChangeMessageListFont m_spinRelativeArticleTime + m_btnChangeMessageListFont + m_tabFeedsMessages diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 54fcb3814..d9b5c5b7d 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -636,7 +636,7 @@ void Application::showGuiMessage(Notification::Event event, action.m_action); } else if (dest.m_statusBar && mainForm()->statusBar() != nullptr && mainForm()->statusBar()->isVisible()) { - mainForm()->statusBar()->showMessage(msg.m_message); + mainForm()->statusBar()->showMessage(msg.m_message, 3000); } else { qDebugNN << LOGSEC_CORE << "Silencing GUI message:" << QUOTE_W_SPACE_DOT(msg.m_message);