From 778b06e94e96a21766f16fe78f2e82ab51ec7d73 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 23 Aug 2021 07:49:54 +0200 Subject: [PATCH] fix attachament inline height --- resources/skins/vergilius/html_enclosure_image.html | 2 +- .../gui/settings/settingsfeedsmessages.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/skins/vergilius/html_enclosure_image.html b/resources/skins/vergilius/html_enclosure_image.html index d23c8b5e7..fd617f8ac 100755 --- a/resources/skins/vergilius/html_enclosure_image.html +++ b/resources/skins/vergilius/html_enclosure_image.html @@ -1 +1 @@ -%2 \ No newline at end of file +%2 \ No newline at end of file diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.cpp b/src/librssguard/gui/settings/settingsfeedsmessages.cpp index 3766eca88..ecd415a56 100644 --- a/src/librssguard/gui/settings/settingsfeedsmessages.cpp +++ b/src/librssguard/gui/settings/settingsfeedsmessages.cpp @@ -30,10 +30,15 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent m_ui->m_checkDisplayPlaceholders->hide(); connect(m_ui->m_cbShowEnclosuresDirectly, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings); + connect(m_ui->m_spinHeightImageAttachments, static_cast(&QSpinBox::valueChanged), + this, &SettingsFeedsMessages::dirtifySettings); #else m_ui->m_tabMessages->layout()->removeWidget(m_ui->m_cbShowEnclosuresDirectly); m_ui->m_cbShowEnclosuresDirectly->hide()); + m_ui->m_tabMessages->layout()->removeWidget(m_ui->m_spinHeightImageAttachments); + m_ui->m_spinHeightImageAttachments->hide()); + connect(m_ui->m_checkDisplayPlaceholders, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings); #endif @@ -56,8 +61,6 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_spinStartupUpdateDelay, static_cast(&QDoubleSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); - connect(m_ui->m_spinHeightImageAttachments, static_cast(&QSpinBox::valueChanged), - this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_spinHeightRowsMessages, static_cast(&QSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_spinHeightRowsFeeds, static_cast(&QSpinBox::valueChanged), @@ -147,12 +150,13 @@ void SettingsFeedsMessages::loadSettings() { m_ui->m_spinStartupUpdateDelay->setValue(settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateStartupDelay)).toDouble()); m_ui->m_cmbCountsFeedList->addItems(QStringList() << "(%unread)" << "[%unread]" << "%unread/%all" << "%unread-%all" << "[%unread|%all]"); m_ui->m_cmbCountsFeedList->setEditText(settings()->value(GROUP(Feeds), SETTING(Feeds::CountFormat)).toString()); - m_ui->m_spinHeightImageAttachments->setValue(settings()->value(GROUP(Messages), SETTING(Messages::MessageHeadImageHeight)).toInt()); m_ui->m_checkShowTooltips->setChecked(settings()->value(GROUP(Feeds), SETTING(Feeds::EnableTooltipsFeedsMessages)).toBool()); #if !defined (USE_WEBENGINE) m_ui->m_checkDisplayPlaceholders->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::DisplayImagePlaceholders)).toBool()); #else + m_ui->m_spinHeightImageAttachments->setValue(settings()->value(GROUP(Messages), + SETTING(Messages::MessageHeadImageHeight)).toInt()); m_ui->m_cbShowEnclosuresDirectly->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::DisplayEnclosuresInMessage)).toBool()); #endif @@ -210,12 +214,12 @@ void SettingsFeedsMessages::saveSettings() { settings()->setValue(GROUP(Feeds), Feeds::FeedsUpdateStartupDelay, m_ui->m_spinStartupUpdateDelay->value()); settings()->setValue(GROUP(Feeds), Feeds::CountFormat, m_ui->m_cmbCountsFeedList->currentText()); settings()->setValue(GROUP(Messages), Messages::UseCustomDate, m_ui->m_checkMessagesDateTimeFormat->isChecked()); - settings()->setValue(GROUP(Messages), Messages::MessageHeadImageHeight, m_ui->m_spinHeightImageAttachments->value()); settings()->setValue(GROUP(Feeds), Feeds::EnableTooltipsFeedsMessages, m_ui->m_checkShowTooltips->isChecked()); #if !defined (USE_WEBENGINE) settings()->setValue(GROUP(Messages), Messages::DisplayImagePlaceholders, m_ui->m_checkDisplayPlaceholders->isChecked()); #else + settings()->setValue(GROUP(Messages), Messages::MessageHeadImageHeight, m_ui->m_spinHeightImageAttachments->value()); settings()->setValue(GROUP(Messages), Messages::DisplayEnclosuresInMessage, m_ui->m_cbShowEnclosuresDirectly->isChecked());