fix #473

2021-08-23 07:42:37 +02:00 · 2021-08-23 07:42:37 +02:00 · a164eb0a94
commit a164eb0a94
parent f23b7a6ef0
5 changed files with 44 additions and 17 deletions
--- a/src/librssguard/gui/settings/settingsfeedsmessages.cpp
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.cpp
@ -28,7 +28,12 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent
 #if defined(USE_WEBENGINE)
  m_ui->m_tabMessages->layout()->removeWidget(m_ui->m_checkDisplayPlaceholders);
  m_ui->m_checkDisplayPlaceholders->hide();
+
+  connect(m_ui->m_cbShowEnclosuresDirectly, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
 #else
+  m_ui->m_tabMessages->layout()->removeWidget(m_ui->m_cbShowEnclosuresDirectly);
+  m_ui->m_cbShowEnclosuresDirectly->hide());
+
  connect(m_ui->m_checkDisplayPlaceholders, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
 #endif

@ -147,6 +152,9 @@ void SettingsFeedsMessages::loadSettings() {

 #if !defined (USE_WEBENGINE)
  m_ui->m_checkDisplayPlaceholders->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::DisplayImagePlaceholders)).toBool());
+#else
+  m_ui->m_cbShowEnclosuresDirectly->setChecked(settings()->value(GROUP(Messages),
+                                                                 SETTING(Messages::DisplayEnclosuresInMessage)).toBool());
 #endif

  m_ui->m_checkMessagesDateTimeFormat->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::UseCustomDate)).toBool());
@ -207,6 +215,10 @@ void SettingsFeedsMessages::saveSettings() {

 #if !defined (USE_WEBENGINE)
  settings()->setValue(GROUP(Messages), Messages::DisplayImagePlaceholders, m_ui->m_checkDisplayPlaceholders->isChecked());
+#else
+  settings()->setValue(GROUP(Messages),
+                       Messages::DisplayEnclosuresInMessage,
+                       m_ui->m_cbShowEnclosuresDirectly->isChecked());
 #endif

  settings()->setValue(GROUP(Messages), Messages::CustomDateFormat,
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@ -247,28 +247,28 @@
         </property>
        </widget>
       </item>
-       <item row="2" column="0" colspan="2">
+       <item row="3" column="0" colspan="2">
        <widget class="QCheckBox" name="m_checkDisplayFeedIcons">
         <property name="text">
          <string>Display real icons of feeds in list of articles instead of read/unread icons</string>
         </property>
        </widget>
       </item>
-       <item row="3" column="0" colspan="2">
+       <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="m_checkBringToForegroundAfterMsgOpened">
         <property name="text">
          <string>Bring application window to front once article is opened in external web browser</string>
         </property>
        </widget>
       </item>
-       <item row="4" column="0" colspan="2">
+       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="m_checkKeppMessagesInTheMiddle">
         <property name="text">
          <string>Keep article selection in the middle of the article list viewport</string>
         </property>
        </widget>
       </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Height or rows in article list (-1 = default height)</string>
@ -278,7 +278,7 @@
         </property>
        </widget>
       </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
        <widget class="QSpinBox" name="m_spinHeightRowsMessages">
         <property name="minimum">
          <number>-1</number>
@ -288,7 +288,7 @@
         </property>
        </widget>
       </item>
-       <item row="6" column="0">
+       <item row="7" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Height of image attachments</string>
@ -298,7 +298,7 @@
         </property>
        </widget>
       </item>
-       <item row="6" column="1">
+       <item row="7" column="1">
        <widget class="QSpinBox" name="m_spinHeightImageAttachments">
         <property name="minimum">
          <number>22</number>
@ -308,7 +308,7 @@
         </property>
        </widget>
       </item>
-       <item row="8" column="0" colspan="2">
+       <item row="9" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <widget class="QGroupBox" name="groupBox_5">
@ -377,7 +377,7 @@
         </item>
        </layout>
       </item>
-       <item row="7" column="0">
+       <item row="8" column="0">
        <widget class="QCheckBox" name="m_checkMessagesDateTimeFormat">
         <property name="text">
          <string>Use custom date/time format (overrides format loaded from active localization)</string>
@ -390,10 +390,10 @@
         </property>
        </widget>
       </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
        <widget class="QComboBox" name="m_cmbMessagesDateTimeFormat"/>
       </item>
-       <item row="10" column="0" colspan="2">
+       <item row="11" column="0" colspan="2">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
@ -406,6 +406,13 @@
         </property>
        </spacer>
       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_cbShowEnclosuresDirectly">
+         <property name="text">
+          <string>Display attached pictures directly in article</string>
+         </property>
+        </widget>
+       </item>
      </layout>
     </widget>
    </widget>
@ -434,6 +441,7 @@
  <tabstop>m_checkShowTooltips</tabstop>
  <tabstop>m_checkRemoveReadMessagesOnExit</tabstop>
  <tabstop>m_checkDisplayPlaceholders</tabstop>
+  <tabstop>m_cbShowEnclosuresDirectly</tabstop>
  <tabstop>m_checkDisplayFeedIcons</tabstop>
  <tabstop>m_checkBringToForegroundAfterMsgOpened</tabstop>
  <tabstop>m_checkKeppMessagesInTheMiddle</tabstop>
--- a/src/librssguard/gui/webviewer.cpp
+++ b/src/librssguard/gui/webviewer.cpp
@ -120,15 +120,14 @@ void WebViewer::loadMessages(const QList<Message>& messages, RootItem* root) {
      enclosures += skin.m_enclosureMarkup.arg(enc_url,
                                               QSL("&#129527;"), enclosure.m_mimeType);

-      /*
-         if (enclosure.m_mimeType.startsWith(QSL("image/"))) {
-         // Add thumbnail image.
-         enclosure_images += skin.m_enclosureImageMarkup.arg(
+      if (enclosure.m_mimeType.startsWith(QSL("image/")) &&
+          qApp->settings()->value(GROUP(Messages), SETTING(Messages::DisplayEnclosuresInMessage)).toBool()) {
+        // Add thumbnail image.
+        enclosure_images += skin.m_enclosureImageMarkup.arg(
          enclosure.m_url,
          enclosure.m_mimeType,
          qApp->settings()->value(GROUP(Messages), SETTING(Messages::MessageHeadImageHeight)).toString());
-         }
-       */
+      }
    }

    messages_layout.append(single_message_layout
--- a/src/librssguard/miscellaneous/settings.cpp
+++ b/src/librssguard/miscellaneous/settings.cpp
@ -80,6 +80,11 @@ DKEY Messages::ID = "messages";
 DKEY Messages::MessageHeadImageHeight = "message_head_image_height";
 DVALUE(int) Messages::MessageHeadImageHeightDef = 36;

+#if defined (USE_WEBENGINE)
+DKEY Messages::DisplayEnclosuresInMessage = "show_enclosures_in_message";
+DVALUE(bool) Messages::DisplayEnclosuresInMessageDef = false;
+#endif
+
 DKEY Messages::EnableMessagePreview = "enable_message_preview";
 DVALUE(bool) Messages::EnableMessagePreviewDef = true;

--- a/src/librssguard/miscellaneous/settings.h
+++ b/src/librssguard/miscellaneous/settings.h
@ -99,6 +99,9 @@ namespace Messages {
  KEY MessageHeadImageHeight;
  VALUE(int) MessageHeadImageHeightDef;

+  KEY DisplayEnclosuresInMessage;
+  VALUE(bool) DisplayEnclosuresInMessageDef;
+
  KEY EnableMessagePreview;
  VALUE(bool) EnableMessagePreviewDef;