save

Author: martinrotter

resources/text/CHANGELOG

@@ -1,17 +1,25 @@
 5.1.2
 -----
-Released on: 2026-05-XX
+Released on: 2026-05-11
 
 Added:
 * Show URL of loaded website in status bar. (#2097)
 * Article extractor now can be called with existing article `HTML` and thus can run Readability algorithm directly on the existing article data instead of downloading full source web page. (#2252)
 * Auto-fetching articles can now be limited to times when a network connection is active. (#2211)
 * Feed retrieval can now be skipped while Windows Game Mode is active. (#1230)
+* Text-based article viewer can now load remote article images when external resources are enabled, cache them, and show the same article without images when external resources are disabled. (08a2127d9, 561f5b432, 7a179c47c)
+* Text-based article viewer can now display directly opened image files. (4c7819676)
+* Text-based article viewer can now show directly opened JSON files in readable form and render directly opened Markdown files.
+* Updated Japanese translation. (#2262)
 
 Fixed:
 * Initial state of "web attributes" is properly set in WebEngine builds. (#2227)
 * Fix some cases where link does not load in internal browser when clicked.
 * Article filter action "Filter articles like this" now uses the article that was actually right-clicked after testing a filter. (#2139)
+* Image attachments in articles now respect the configured height limit in both text-based and WebEngine-based viewers. (#2254, 8f4abac60, bc247ad0b)
+* Image context menu actions in the text-based viewer can again detect the image under the cursor, copy its URL, copy the image and save it. (c3902db73)
+* Relative links opened from the internal browser are now resolved against the currently loaded page before opening. (4c7819676)
+* Directly opened non-HTML text content is now displayed as text instead of being treated as HTML. (4c7819676)
 
 5.1.1
 -----

resources/text/licenses.json

@@ -2,12 +2,7 @@
   {
     "title": "GNU GPL v3.0",
     "file": "COPYING_GNU_GPL",
-    "components": "RSS Guard, mimesis, Kristall/geminiclient, QLiteHtmlWidget"
-  },
-  {
-    "title": "BSD-3-Clause license",
-    "file": "COPYING_BSD",
-    "components": "litehtml"
+    "components": "RSS Guard, mimesis, Kristall/geminiclient"
   },
   {
     "title": "Apache license",

src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp

@@ -20,6 +20,8 @@
 #include <QFile>
 #include <QFileIconProvider>
 #include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonParseError>
 #include <QScrollBar>
 #include <QTextImageFormat>
 #include <QTimer>
@@ -474,7 +476,11 @@ void TextBrowserViewer::loadMessage(const Message& message, RootItem* root) {
 
 void TextBrowserViewer::displayDownloadedPage(const QUrl& url, const QByteArray& data, const NetworkResult& res) {
   if (res.m_networkError == QNetworkReply::NetworkError::NoError) {
-    if (res.m_contentType.startsWith(QSL("image"))) {
+    const QString content_type = res.m_contentType.toLower();
+    const QString path = url.path().toLower();
+
+    // Images handling - either open externally or open as "data:base64".
+    if (content_type.startsWith(QSL("image"))) {
       if (!loadExternalResources()) {
         emit openUrlInNewTab(true, url);
       }
@@ -486,7 +492,8 @@ void TextBrowserViewer::displayDownloadedPage(const QUrl& url, const QByteArray&
         loadStaticHtml(html, url);
       }
     }
-    else if (res.m_contentType.contains(QSL("xml"))) {
+    // XML handling - pretty print.
+    else if (content_type.contains(QSL("xml"))) {
       QDomDocument dom;
 
       if (dom.setContent(data)) {
@@ -496,7 +503,29 @@ void TextBrowserViewer::displayDownloadedPage(const QUrl& url, const QByteArray&
         loadStaticHtml(QString::fromUtf8(data).toHtmlEscaped(), url);
       }
     }
-    else if (res.m_contentType.contains(QSL("html"))) {
+    // JSON handling - pretty print.
+    else if (content_type.contains(QSL("json")) || path.endsWith(QSL(".json"))) {
+      QJsonParseError error;
+      const QJsonDocument doc = QJsonDocument::fromJson(data, &error);
+
+      if (error.error == QJsonParseError::NoError) {
+        loadStaticHtml(Qt::convertFromPlainText(QString::fromUtf8(doc.toJson(QJsonDocument::Indented))), url);
+      }
+      else {
+        loadStaticHtml(Qt::convertFromPlainText(QString::fromUtf8(data)), url);
+      }
+    }
+    // Markdown handling - pretty print.
+    else if (content_type.contains(QSL("markdown")) || content_type.contains(QSL("x-markdown")) ||
+             path.endsWith(QSL(".md")) || path.endsWith(QSL(".markdown")) || path.endsWith(QSL(".mdown")) ||
+             path.endsWith(QSL(".mkd"))) {
+      QTextDocument markdown_doc;
+
+      markdown_doc.setMarkdown(QString::fromUtf8(data));
+      loadStaticHtml(markdown_doc.toHtml(), url);
+    }
+    // HTML handling - display.
+    else if (content_type.contains(QSL("html"))) {
       bool no_images = loadStaticHtml(QString::fromUtf8(data), url);
 
       if (url.hasFragment()) {
@@ -507,6 +536,7 @@ void TextBrowserViewer::displayDownloadedPage(const QUrl& url, const QByteArray&
         return;
       }
     }
+    // Fallback - show as plain text.
     else {
       loadStaticHtml(Qt::convertFromPlainText(QString::fromUtf8(data)), url);
     }
@@ -764,7 +794,7 @@ QVariant TextBrowserDocument::loadResource(int type, const QUrl& name) {
     return QTextDocument::loadResource(type, name);
   }
 
-  if (QTextDocument::ResourceType(type) != QTextDocument::ResourceType::ImageResource) {
+  if (QTextDocument::ResourceType(type) != QTextDocument::ImageResource) {
     return QTextDocument::loadResource(type, name);
   }