FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "remove duplicates" option. N/A now.

Browse Source
This commit is contained in:
Martin Rotter 2016-02-23 10:32:26 +01:00
parent bc06e90a07
commit 5ac5eb8fa2
4 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/dialogs/formsettings.cpp
View File

@ -248,7 +248,6 @@ void FormSettings::loadFeedsMessages() {
m_ui->m_checkUpdateAllFeedsOnStartup->setChecked(m_settings->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool());
m_ui->m_cmbCountsFeedList->addItems(QStringList() << "(%unread)" << "[%unread]" << "%unread/%all" << "%unread-%all" << "[%unread|%all]");
m_ui->m_cmbCountsFeedList->setEditText(m_settings->value(GROUP(Feeds), SETTING(Feeds::CountFormat)).toString());
m_ui->m_checkRemoveDuplicateMessages->setChecked(m_settings->value(GROUP(Messages), SETTING(Messages::RemoveDuplicates)).toBool());
initializeMessageDateFormats();
@ -286,7 +285,6 @@ void FormSettings::saveFeedsMessages() {
m_settings->setValue(GROUP(Messages), Messages::UseCustomDate, m_ui->m_checkMessagesDateTimeFormat->isChecked());
m_settings->setValue(GROUP(Messages), Messages::CustomDateFormat,
m_ui->m_cmbMessagesDateTimeFormat->itemData(m_ui->m_cmbMessagesDateTimeFormat->currentIndex()).toString());
m_settings->setValue(GROUP(Messages), Messages::RemoveDuplicates, m_ui->m_checkRemoveDuplicateMessages->isChecked());
// Save fonts.
m_settings->setValue(GROUP(Messages), Messages::PreviewerFontStandard, m_ui->m_cmbMessageFontStandard->currentFont().family());

21
src/gui/dialogs/formsettings.ui
View File

@ -1456,21 +1456,21 @@ Authors of this application are NOT responsible for lost data.</string>
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkRemoveReadMessagesOnExit">
<property name="text">
<string>Remove all read messages from all feeds on application exit</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkKeppMessagesInTheMiddle">
<property name="text">
<string>Keep message selection in the middle of the message list viewport</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="QCheckBox" name="m_checkMessagesDateTimeFormat">
<property name="text">
<string>Use custom date/time format (overrides format loaded from active localization)</string>
@ -1483,20 +1483,10 @@ Authors of this application are NOT responsible for lost data.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="QComboBox" name="m_cmbMessagesDateTimeFormat"/>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkRemoveDuplicateMessages">
<property name="toolTip">
<string>When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped.</string>
</property>
<property name="text">
<string>Remove duplicate messages (standard account only)</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Internal message browser fonts</string>
@ -1696,7 +1686,6 @@ Authors of this application are NOT responsible for lost data.</string>
<tabstop>m_checkKeppMessagesInTheMiddle</tabstop>
<tabstop>m_checkMessagesDateTimeFormat</tabstop>
<tabstop>m_cmbMessagesDateTimeFormat</tabstop>
<tabstop>m_checkRemoveDuplicateMessages</tabstop>
<tabstop>m_rbDownloadsAskEachFile</tabstop>
<tabstop>m_rbDownloadsSaveAllIntoDirectory</tabstop>
<tabstop>m_txtDownloadsTargetDirectory</tabstop>

3
src/miscellaneous/settings.cpp
View File

@ -63,9 +63,6 @@ DVALUE(bool) Messages::ClearReadOnExitDef = false;
DKEY Messages::KeepCursorInCenter = "keep_cursor_center";
DVALUE(bool) Messages::KeepCursorInCenterDef = false;
DKEY Messages::RemoveDuplicates = "remove_duplicates";
DVALUE(bool) Messages::RemoveDuplicatesDef = false;
DKEY Messages::PreviewerFontStandard = "previewer_font_standard";
NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QString();

3
src/miscellaneous/settings.h
View File

@ -78,9 +78,6 @@ namespace Messages {
KEY KeepCursorInCenter;
VALUE(bool) KeepCursorInCenterDef;
KEY RemoveDuplicates;
VALUE(bool) RemoveDuplicatesDef;
KEY PreviewerFontStandard;
NON_CONST_VALUE(QString) PreviewerFontStandardDef;
}