fixed a couple of message -> article things + some others
This commit is contained in:
parent
591c345d07
commit
01cbd8f3c6
4 changed files with 13 additions and 13 deletions
|
@ -174,7 +174,7 @@ void FeedDownloader::updateOneFeed(Feed* feed) {
|
||||||
|
|
||||||
if (filter.isNull()) {
|
if (filter.isNull()) {
|
||||||
qCriticalNN << LOGSEC_FEEDDOWNLOADER
|
qCriticalNN << LOGSEC_FEEDDOWNLOADER
|
||||||
<< "Message filter was probably deleted, removing its pointer from list of filters.";
|
<< "Article filter was probably deleted, removing its pointer from list of filters.";
|
||||||
feed_filters.removeAt(j--);
|
feed_filters.removeAt(j--);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Message filters</string>
|
<string>Article filters</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
@ -112,7 +112,7 @@
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="1" column="0" colspan="2">
|
||||||
<widget class="QGroupBox" name="m_gbDetails">
|
<widget class="QGroupBox" name="m_gbDetails">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Message filter details</string>
|
<string>Article filter details</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QFormLayout" name="formLayout">
|
<layout class="QFormLayout" name="formLayout">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
|
@ -140,7 +140,7 @@
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Title of message filter</string>
|
<string>Title of article filter</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -163,7 +163,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Your JavaScript-based message filtering logic</string>
|
<string>Your JavaScript-based article filtering logic</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
|
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Download messages for all feeds on application startup with initial delay of</string>
|
<string>Fetch articles for all feeds on application startup with initial delay of</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QCheckBox" name="m_checkAutoUpdate">
|
<widget class="QCheckBox" name="m_checkAutoUpdate">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Auto-download messages for all feeds every</string>
|
<string>Auto-fetch articles for all feeds every</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
<item row="2" column="0" colspan="2">
|
<item row="2" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="m_checkAutoUpdateOnlyUnfocused">
|
<widget class="QCheckBox" name="m_checkAutoUpdateOnlyUnfocused">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Only auto-download messages when application is unfocused</string>
|
<string>Only auto-fetch articles if application is unfocused</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -164,7 +164,7 @@
|
||||||
<item row="6" column="0">
|
<item row="6" column="0">
|
||||||
<widget class="QLabel" name="label_8">
|
<widget class="QLabel" name="label_8">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Message count format in feed list</string>
|
<string>Article count format in feed list</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="buddy">
|
<property name="buddy">
|
||||||
<cstring>m_cmbCountsFeedList</cstring>
|
<cstring>m_cmbCountsFeedList</cstring>
|
||||||
|
@ -189,7 +189,7 @@
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Enter format for count of messages 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) messages.</string>
|
<string>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.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
@ -202,14 +202,14 @@
|
||||||
<item row="8" column="0" colspan="2">
|
<item row="8" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="m_cbHideCountsIfNoUnread">
|
<widget class="QCheckBox" name="m_cbHideCountsIfNoUnread">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Hide message counts if there are no unread messages</string>
|
<string>Hide article counts if there are no unread articles</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="0" colspan="2">
|
<item row="9" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="m_checkShowTooltips">
|
<widget class="QCheckBox" name="m_checkShowTooltips">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Display tooltips for feeds and messages</string>
|
<string>Display tooltips for feeds and articles</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -42,7 +42,7 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
m_ui.m_lblLimitMessagesInfo->setText(tr("Beware of downloading too many articles, because "
|
m_ui.m_lblLimitMessagesInfo->setText(tr("Beware of downloading too many articles, because "
|
||||||
"Feedly permanently caches ALL articles of the feed forever so you might "
|
"Feedly permanently caches ALL articles of the feed, so you might "
|
||||||
"end up with thousands of articles which you will never read anyway."));
|
"end up with thousands of articles which you will never read anyway."));
|
||||||
|
|
||||||
GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
|
GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue