diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc index 2a2e78e7c..d46c2b23d 100644 --- a/resources/rssguard.qrc +++ b/resources/rssguard.qrc @@ -84,6 +84,7 @@ skins/nudus-base/html_single_message.html skins/nudus-base/html_wrapper.html skins/nudus-base/lite_html_enclosure_every.html + skins/nudus-base/lite_html_enclosure_image.html skins/nudus-base/lite_html_single_message.html skins/nudus-dark/html_wrapper.html diff --git a/resources/skins/nudus-base/lite_html_enclosure_every.html b/resources/skins/nudus-base/lite_html_enclosure_every.html index 5436edb38..929875f56 100644 --- a/resources/skins/nudus-base/lite_html_enclosure_every.html +++ b/resources/skins/nudus-base/lite_html_enclosure_every.html @@ -1 +1 @@ - %2%3 \ No newline at end of file + %2 %3 \ No newline at end of file diff --git a/resources/skins/nudus-base/lite_html_enclosure_image.html b/resources/skins/nudus-base/lite_html_enclosure_image.html new file mode 100644 index 000000000..ece447112 --- /dev/null +++ b/resources/skins/nudus-base/lite_html_enclosure_image.html @@ -0,0 +1,4 @@ + + %2 + +
\ No newline at end of file diff --git a/resources/skins/nudus-base/lite_html_single_message.html b/resources/skins/nudus-base/lite_html_single_message.html index a0de106e0..ba97a611d 100644 --- a/resources/skins/nudus-base/lite_html_single_message.html +++ b/resources/skins/nudus-base/lite_html_single_message.html @@ -1,10 +1,10 @@
-
%7
- %2 -

%1%6  URL

- %5 +
%7
+ %2 +

%1%6  URL

+ %5
diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp index 7af0774e0..d3d44cee8 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp @@ -37,23 +37,6 @@ TextBrowserViewer::TextBrowserViewer(QWidget* parent) setResourcesEnabled(qApp->settings()->value(GROUP(Messages), SETTING(Messages::ShowResourcesInArticles)).toBool()); setDocument(m_document.data()); - // Apply master CSS. - /* - QColor a_color = qApp->skins()->colorForModel(SkinEnums::PaletteColors::FgInteresting).value(); - - if (!a_color.isValid()) { - a_color = qApp->palette().color(QPalette::ColorRole::Highlight); - } - - m_document.data()->setDefaultStyleSheet(QSL("a { color: %1; }").arg(a_color.name())); - */ - - /* - m_document->setDefaultStyleSheet("p {" - "background-color: yellow;" - "border: 1px solid black;" - "}"); -*/ connect(this, &TextBrowserViewer::reloadDocument, this, [this]() { const auto scr = verticalScrollBarPosition(); setHtmlPrivate(html(), m_currentUrl); @@ -95,103 +78,6 @@ QVariant TextBrowserViewer::loadOneResource(int type, const QUrl& name) { } } -PreparedHtml TextBrowserViewer::prepareHtmlForMessage(const QList& messages, RootItem* selected_item) const { - PreparedHtml html; - bool acc_displays_enclosures = - selected_item == nullptr || selected_item->getParentServiceRoot()->displaysEnclosures(); - - for (const Message& message : messages) { - bool is_plain = !TextFactory::couldBeHtml(message.m_contents); - - // Add title. - if (!message.m_url.isEmpty()) { - html.m_html += QSL("

%1

").arg(message.m_title, message.m_url); - } - else { - html.m_html += QSL("

%1

").arg(message.m_title); - } - - // Start contents. - html.m_html += QSL("
"); - - // Add links to enclosures. - if (acc_displays_enclosures) { - for (const Enclosure& enc : message.m_enclosures) { - html.m_html += QSL("[%2]").arg(enc.m_url, enc.m_mimeType); - } - } - - // Display enclosures which are pictures if user has it enabled. - auto first_enc_break_added = false; - - if (acc_displays_enclosures && - qApp->settings()->value(GROUP(Messages), SETTING(Messages::DisplayEnclosuresInMessage)).toBool()) { - for (const Enclosure& enc : message.m_enclosures) { - if (enc.m_mimeType.startsWith(QSL("image/"))) { - if (!first_enc_break_added) { - html.m_html += QSL("
"); - first_enc_break_added = true; - } - - html.m_html += QSL("
").arg(enc.m_url); - } - } - } - - // Append actual contents of article and convert to HTML if needed. - html.m_html += is_plain ? Qt::convertFromPlainText(message.m_contents, Qt::WhiteSpaceMode::WhiteSpaceNormal) - : message.m_contents; - - static QRegularExpression img_tag_rgx(QSL("\\]*src\\s*=\\s*[\"\']([^\"\']*)[\"\'][^\\>]*\\>"), - QRegularExpression::PatternOption::CaseInsensitiveOption | - QRegularExpression::PatternOption::InvertedGreedinessOption); - - // Extract all images links from article to be appended to end of article. - QRegularExpressionMatchIterator i = img_tag_rgx.globalMatch(html.m_html); - QString pictures_html; - - while (i.hasNext()) { - QRegularExpressionMatch match = i.next(); - auto captured_url = match.captured(1); - - pictures_html += QSL("
[%1] %2").arg(tr("image"), captured_url); - } - - // Make alla images clickable as links and also resize them if user has it setup. - auto forced_img_size = qApp->settings()->value(GROUP(Messages), SETTING(Messages::MessageHeadImageHeight)).toInt(); - - // Fixup all "img" tags. - html.m_html = html.m_html.replace(img_tag_rgx, - QSL("") - .arg(forced_img_size <= 0 ? QString() : QString::number(forced_img_size))); - - // Append generated list of images. - html.m_html += pictures_html; - } - - // Close contents. - html.m_html += QSL("
"); - - QString base_url; - auto* feed = selected_item->getParentServiceRoot() - ->getItemFromSubTree([messages](const RootItem* it) { - return it->kind() == RootItem::Kind::Feed && it->customId() == messages.at(0).m_feedId; - }) - ->toFeed(); - - if (feed != nullptr) { - QUrl url(NetworkFactory::sanitizeUrl(feed->source())); - - if (url.isValid()) { - base_url = url.scheme() + QSL("://") + url.host(); - } - } - - html.m_baseUrl = base_url; - - return html; -} - void TextBrowserViewer::bindToBrowser(WebBrowser* browser) { installEventFilter(browser); @@ -302,8 +188,25 @@ void TextBrowserViewer::loadMessages(const QList& messages, RootItem* r auto html_messages = qApp->skins()->generateHtmlOfArticles(messages, root); - if (html_messages.m_html.isEmpty()) { - html_messages = prepareHtmlForMessage(messages, root); + static QRegularExpression exp_replace_wide_stuff(QSL("width=\"([^\"]+)\"")); + + // html_messages.m_html = html_messages.m_html.replace(exp_replace_wide_stuff, QSL("width=\"%1\"").arg(width() * + // 0.9)); + + QRegularExpressionMatch exp_match; + qsizetype match_offset = 0; + int acceptable_width = int(width() * 0.9); + + while ((exp_match = exp_replace_wide_stuff.match(html_messages.m_html, match_offset)).hasMatch()) { + int found_width = exp_match.captured(1).toInt(); + + if (found_width > acceptable_width) { + html_messages.m_html = html_messages.m_html.replace(exp_match.capturedStart(1), + exp_match.capturedLength(1), + QString::number(acceptable_width)); + } + + match_offset = exp_match.capturedEnd(); } setHtml(html_messages.m_html, html_messages.m_baseUrl); diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h index f613e888a..97e8ac3fe 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h @@ -94,12 +94,10 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer { private: void setHtmlPrivate(const QString& html, const QUrl& base_url); - BlockingResult blockedWithAdblock(const QUrl& url); - QScopedPointer m_downloader; - PreparedHtml prepareHtmlForMessage(const QList& messages, RootItem* selected_item) const; private: + QScopedPointer m_downloader; bool m_resourcesEnabled; QList m_neededResources; // All URLs here must be resolved. QScopedPointer m_resourceDownloader; diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp index dab730fa9..84384867a 100644 --- a/src/librssguard/miscellaneous/settings.cpp +++ b/src/librssguard/miscellaneous/settings.cpp @@ -161,9 +161,6 @@ DVALUE(bool) Messages::ShowResourcesInArticlesDef = true; DKEY Messages::Zoom = "zoom"; DVALUE(qreal) Messages::ZoomDef = double(1.0); -DKEY Messages::SimpleArticleLayout = "simple_article_layout"; -DVALUE(bool) Messages::SimpleArticleLayoutDef = false; - DKEY Messages::FixupFutureArticleDateTimes = "fixup_future_datetimes"; DVALUE(bool) Messages::FixupFutureArticleDateTimesDef = false; diff --git a/src/librssguard/miscellaneous/settings.h b/src/librssguard/miscellaneous/settings.h index cb33223e8..2f16321c5 100644 --- a/src/librssguard/miscellaneous/settings.h +++ b/src/librssguard/miscellaneous/settings.h @@ -161,9 +161,6 @@ namespace Messages { KEY Zoom; VALUE(qreal) ZoomDef; - KEY SimpleArticleLayout; - VALUE(bool) SimpleArticleLayoutDef; - KEY FixupFutureArticleDateTimes; VALUE(bool) FixupFutureArticleDateTimesDef;