effectivelly implemented #1371 - added a switch to switch entire arti…

…cle list if all selected items are RTL
martinrotter · Oct 8, 2024 · a57a6ab · a57a6ab
1 parent 4e698c9
commit a57a6ab
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 25 deletions.
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
@@ -582,19 +582,25 @@ void MessagesView::loadItem(RootItem* item) {
   sort(col, ord, false, true, false, true);
   m_sourceModel->loadMessages(item);
 
-  /*
-  if (item->kind() == RootItem::Kind::Feed) {
-    if (item->toFeed()->isRtl()) {
-      setLayoutDirection(Qt::LayoutDirection::RightToLeft);
+  bool switch_entire_rtl_list =
+    qApp->settings()->value(GROUP(Messages), SETTING(Messages::SwitchArticleListRtl)).toBool();
+
+  if (switch_entire_rtl_list && item != nullptr) {
+    if (item->kind() == RootItem::Kind::Feed) {
+      setLayoutDirection(item->toFeed()->isRtl() ? Qt::LayoutDirection::RightToLeft : Qt::LayoutDirection::LeftToRight);
     }
     else {
-      setLayoutDirection(Qt::LayoutDirection::LeftToRight);
+      auto fds = item->getSubTreeFeeds();
+      bool all_feeds_rtl = !fds.isEmpty() && std::all_of(fds.begin(), fds.end(), [](Feed* fd) {
+        return fd->isRtl();
+      });
+
+      setLayoutDirection(all_feeds_rtl ? Qt::LayoutDirection::RightToLeft : Qt::LayoutDirection::LeftToRight);
     }
   }
   else {
     setLayoutDirection(Qt::LayoutDirection::LeftToRight);
   }
-  */
 
   // Messages are loaded, make sure that previously
   // active message is not shown in browser.

diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.cpp b/src/librssguard/gui/settings/settingsfeedsmessages.cpp
@@ -96,6 +96,7 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent
   connect(m_ui->m_cmbIgnoreContentsChanges, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
   connect(m_ui->m_cbHideCountsIfNoUnread, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
   connect(m_ui->m_checkAutoUpdate, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
+  connect(m_ui->m_checkSwitchArticleListRtl, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
   connect(m_ui->m_cbUpdateFeedListDuringFetching, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
   connect(m_ui->m_checkAutoUpdateOnlyUnfocused, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
   connect(m_ui->m_cmbUnreadIconType,
@@ -322,6 +323,8 @@ void SettingsFeedsMessages::loadSettings() {
                    .toBool());
   m_ui->m_checkKeppMessagesInTheMiddle
     ->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::KeepCursorInCenter)).toBool());
+  m_ui->m_checkSwitchArticleListRtl
+    ->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::SwitchArticleListRtl)).toBool());
   m_ui->m_checkRemoveReadMessagesOnExit
     ->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::ClearReadOnExit)).toBool());
   m_ui->m_checkAutoUpdate->setChecked(settings()->value(GROUP(Feeds), SETTING(Feeds::AutoUpdateEnabled)).toBool());
@@ -457,6 +460,7 @@ void SettingsFeedsMessages::saveSettings() {
   settings()->setValue(GROUP(Messages),
                        Messages::KeepCursorInCenter,
                        m_ui->m_checkKeppMessagesInTheMiddle->isChecked());
+  settings()->setValue(GROUP(Messages), Messages::SwitchArticleListRtl, m_ui->m_checkSwitchArticleListRtl->isChecked());
   settings()->setValue(GROUP(Messages), Messages::ClearReadOnExit, m_ui->m_checkRemoveReadMessagesOnExit->isChecked());
   settings()->setValue(GROUP(Feeds), Feeds::AutoUpdateEnabled, m_ui->m_checkAutoUpdate->isChecked());
   settings()->setValue(GROUP(Feeds), Feeds::AutoUpdateOnlyUnfocused, m_ui->m_checkAutoUpdateOnlyUnfocused->isChecked());

diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -204,7 +204,7 @@
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -349,7 +349,7 @@
             <item>
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -392,7 +392,7 @@
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -448,14 +448,14 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QCheckBox" name="m_checkMultilineArticleList">
          <property name="text">
           <string>Enable multiline items</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2">
+       <item row="5" column="0" colspan="2">
         <widget class="HelpSpoiler" name="m_helpMultilineArticleList" native="true">
          <property name="minimumSize">
           <size>
@@ -465,7 +465,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>Row height</string>
@@ -475,7 +475,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
         <widget class="QSpinBox" name="m_spinHeightRowsMessages">
          <property name="minimumSize">
           <size>
@@ -494,7 +494,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="7" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Top/bottom row padding</string>
@@ -504,7 +504,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="7" column="1">
         <widget class="QSpinBox" name="m_spinPaddingRowsMessages">
          <property name="minimumSize">
           <size>
@@ -523,7 +523,7 @@
          </property>
         </widget>
        </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</string>
@@ -536,7 +536,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
         <widget class="QComboBox" name="m_cmbMessagesDateTimeFormat">
          <property name="minimumSize">
           <size>
@@ -549,7 +549,7 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="9" column="0">
         <widget class="QCheckBox" name="m_checkMessagesDateTimeFormatForDatesOnly">
          <property name="text">
           <string>Use custom date/time format for dates-only</string>
@@ -562,7 +562,7 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
+       <item row="9" column="1">
         <widget class="QComboBox" name="m_cmbMessagesDateTimeFormatForDatesOnly">
          <property name="minimumSize">
           <size>
@@ -575,7 +575,7 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
+       <item row="10" column="0">
         <widget class="QCheckBox" name="m_checkMessagesTimeFormat">
          <property name="text">
           <string>Custom date/time format for today's articles</string>
@@ -588,7 +588,7 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
+       <item row="10" column="1">
         <widget class="QComboBox" name="m_cmbMessagesTimeFormat">
          <property name="minimumSize">
           <size>
@@ -601,14 +601,14 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
+       <item row="11" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Show relative time for articles not older than</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
+       <item row="11" column="1">
         <widget class="QSpinBox" name="m_spinRelativeArticleTime">
          <property name="minimum">
           <number>-1</number>
@@ -618,7 +618,7 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0">
+       <item row="12" column="0">
         <widget class="QGroupBox" name="m_gbArticleListFont">
          <property name="title">
           <string>Article list font</string>
@@ -680,6 +680,13 @@
          </property>
         </widget>
        </item>
+       <item row="3" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_checkSwitchArticleListRtl">
+         <property name="text">
+          <string>Switch article list to RTL layout if all selected feeds are RTL</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
@@ -730,6 +737,7 @@
   <tabstop>m_btnChangeMessagesFont</tabstop>
   <tabstop>m_cmbUnreadIconType</tabstop>
   <tabstop>m_checkKeppMessagesInTheMiddle</tabstop>
+  <tabstop>m_checkSwitchArticleListRtl</tabstop>
   <tabstop>m_checkMultilineArticleList</tabstop>
   <tabstop>m_spinHeightRowsMessages</tabstop>
   <tabstop>m_spinPaddingRowsMessages</tabstop>
@@ -741,6 +749,12 @@
   <tabstop>m_btnChangeMessageListFont</tabstop>
   <tabstop>m_gbFeedListFont</tabstop>
   <tabstop>m_gbArticleListFont</tabstop>
+  <tabstop>m_tabFeedsMessages</tabstop>
+  <tabstop>m_cbLegacyArticleFormatting</tabstop>
+  <tabstop>m_checkMessagesDateTimeFormatForDatesOnly</tabstop>
+  <tabstop>m_cmbMessagesDateTimeFormatForDatesOnly</tabstop>
+  <tabstop>m_cmbArticleMarkingPolicy</tabstop>
+  <tabstop>m_spinArticleMarkingPolicy</tabstop>
  </tabstops>
  <resources/>
  <connections/>

diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
@@ -126,8 +126,15 @@ QVariant TextBrowserViewer::loadOneResource(int type, const QUrl& name) {
     QByteArray save_arr;
     QBuffer save_buf(&save_arr, this);
 
-    if (img.save(&save_buf, "PNG", 100)) {
+    if (img.save(&save_buf, "JPG", 100)) {
       save_buf.close();
+
+      IOFactory::writeFile(QSL("%1%2.jpg")
+                             .arg(name.toString(QUrl::ComponentFormattingOption::FullyEncoded),
+                                  QString::number(acceptable_width))
+                             .remove(QRegularExpression(":|\\/")),
+                           save_arr);
+
       resource_data_all_sizes.insert(acceptable_width, save_arr);
     }
     else {

diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp
@@ -217,6 +217,9 @@ DVALUE(int) Messages::ArticleListPaddingDef = -1;
 DKEY Messages::MultilineArticleList = "multiline_article_list";
 DVALUE(bool) Messages::MultilineArticleListDef = false;
 
+DKEY Messages::SwitchArticleListRtl = "switch_article_list_rtl";
+DVALUE(bool) Messages::SwitchArticleListRtlDef = true;
+
 DKEY Messages::UseCustomTime = "use_custom_time";
 DVALUE(bool) Messages::UseCustomTimeDef = false;
 

diff --git a/src/librssguard/miscellaneous/settings.h b/src/librssguard/miscellaneous/settings.h
@@ -218,6 +218,9 @@ namespace Messages {
   KEY MultilineArticleList;
   VALUE(bool) MultilineArticleListDef;
 
+  KEY SwitchArticleListRtl;
+  VALUE(bool) SwitchArticleListRtlDef;
+
   KEY CustomTimeFormat;
   VALUE(QString) CustomTimeFormatDef;