diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp index 3dfddd10f..14a4069f7 100755 --- a/src/gui/dialogs/formsettings.cpp +++ b/src/gui/dialogs/formsettings.cpp @@ -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()); diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui index 36c0f0db3..87258c123 100755 --- a/src/gui/dialogs/formsettings.ui +++ b/src/gui/dialogs/formsettings.ui @@ -1456,21 +1456,21 @@ Authors of this application are NOT responsible for lost data. QFormLayout::AllNonFixedFieldsGrow - + Remove all read messages from all feeds on application exit - + Keep message selection in the middle of the message list viewport - + Use custom date/time format (overrides format loaded from active localization) @@ -1483,20 +1483,10 @@ Authors of this application are NOT responsible for lost data. - + - - - - When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped. - - - Remove duplicate messages (standard account only) - - - - + Internal message browser fonts @@ -1696,7 +1686,6 @@ Authors of this application are NOT responsible for lost data. m_checkKeppMessagesInTheMiddle m_checkMessagesDateTimeFormat m_cmbMessagesDateTimeFormat - m_checkRemoveDuplicateMessages m_rbDownloadsAskEachFile m_rbDownloadsSaveAllIntoDirectory m_txtDownloadsTargetDirectory diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 10424ccba..c039843c2 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -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(); diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index e3247c6c4..9ba13b009 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -78,9 +78,6 @@ namespace Messages { KEY KeepCursorInCenter; VALUE(bool) KeepCursorInCenterDef; - KEY RemoveDuplicates; - VALUE(bool) RemoveDuplicatesDef; - KEY PreviewerFontStandard; NON_CONST_VALUE(QString) PreviewerFontStandardDef; }