diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp index 944ec2e54..f91c43a72 100644 --- a/src/librssguard/gui/feedmessageviewer.cpp +++ b/src/librssguard/gui/feedmessageviewer.cpp @@ -43,10 +43,11 @@ #include #include -FeedMessageViewer::FeedMessageViewer(QWidget* parent) : TabContent(parent), m_toolBarsEnabled(true), m_listHeadersEnabled(true), - m_toolBarFeeds(new FeedsToolBar(tr("Toolbar for feeds"), this)), m_toolBarMessages(new MessagesToolBar(tr("Toolbar for articles"), this)), - m_messagesView(new MessagesView(this)), m_feedsView(new FeedsView(this)), - m_messagesBrowser(new MessagePreviewer(this)) { +FeedMessageViewer::FeedMessageViewer(QWidget* parent) + : TabContent(parent), m_toolBarsEnabled(true), m_listHeadersEnabled(true), + m_toolBarFeeds(new FeedsToolBar(tr("Toolbar for feeds"), this)), + m_toolBarMessages(new MessagesToolBar(tr("Toolbar for articles"), this)), m_messagesView(new MessagesView(this)), + m_feedsView(new FeedsView(this)), m_messagesBrowser(new MessagePreviewer(this)) { initialize(); initializeViews(); createConnections(); @@ -90,12 +91,10 @@ void FeedMessageViewer::loadSize() { const Settings* settings = qApp->settings(); // Restore offsets of splitters. - m_feedSplitter->setSizes(toList(settings->value(GROUP(GUI), - SETTING(GUI::SplitterFeeds)))); + m_feedSplitter->setSizes(toList(settings->value(GROUP(GUI), SETTING(GUI::SplitterFeeds)))); if (settings->value(GROUP(GUI), SETTING(GUI::SplitterMessagesIsVertical)).toBool()) { - m_messageSplitter->setSizes(toList(settings->value(GROUP(GUI), - SETTING(GUI::SplitterMessagesVertical)))); + m_messageSplitter->setSizes(toList(settings->value(GROUP(GUI), SETTING(GUI::SplitterMessagesVertical)))); } else { switchMessageSplitterOrientation(); @@ -132,14 +131,10 @@ void FeedMessageViewer::onMessageSplitterResized() { qDebugNN << LOGSEC_GUI << "Message splitter moved."; if (m_messageSplitter->orientation() == Qt::Orientation::Vertical) { - qApp->settings()->setValue(GROUP(GUI), - GUI::SplitterMessagesVertical, - toVariant(m_messageSplitter->sizes())); + qApp->settings()->setValue(GROUP(GUI), GUI::SplitterMessagesVertical, toVariant(m_messageSplitter->sizes())); } else { - qApp->settings()->setValue(GROUP(GUI), - GUI::SplitterMessagesHorizontal, - toVariant(m_messageSplitter->sizes())); + qApp->settings()->setValue(GROUP(GUI), GUI::SplitterMessagesHorizontal, toVariant(m_messageSplitter->sizes())); } } @@ -235,18 +230,29 @@ void FeedMessageViewer::displayMessage(const Message& message, RootItem* root) { void FeedMessageViewer::createConnections() { // Filtering & searching. - connect(m_toolBarMessages, &MessagesToolBar::messageSearchPatternChanged, m_messagesView, &MessagesView::searchMessages); + connect(m_toolBarMessages, + &MessagesToolBar::messageSearchPatternChanged, + m_messagesView, + &MessagesView::searchMessages); connect(m_toolBarFeeds, &FeedsToolBar::feedsFilterPatternChanged, m_feedsView, &FeedsView::filterItems); - connect(m_toolBarMessages, &MessagesToolBar::messageHighlighterChanged, m_messagesView, &MessagesView::highlightMessages); + connect(m_toolBarMessages, + &MessagesToolBar::messageHighlighterChanged, + m_messagesView, + &MessagesView::highlightMessages); connect(m_toolBarMessages, &MessagesToolBar::messageFilterChanged, this, &FeedMessageViewer::changeMessageFilter); connect(m_feedSplitter, &QSplitter::splitterMoved, this, &FeedMessageViewer::onFeedSplitterResized); connect(m_messageSplitter, &QSplitter::splitterMoved, this, &FeedMessageViewer::onMessageSplitterResized); connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear); - connect(m_messagesBrowser, &MessagePreviewer::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById); - connect(m_messagesBrowser, &MessagePreviewer::markMessageImportant, - m_messagesView->sourceModel(), &MessagesModel::setMessageImportantById); + connect(m_messagesBrowser, + &MessagePreviewer::markMessageRead, + m_messagesView->sourceModel(), + &MessagesModel::setMessageReadById); + connect(m_messagesBrowser, + &MessagePreviewer::markMessageImportant, + m_messagesView->sourceModel(), + &MessagesModel::setMessageImportantById); connect(m_messagesView, &MessagesView::currentMessageChanged, this, &FeedMessageViewer::displayMessage); connect(m_messagesView, &MessagesView::openLinkMiniBrowser, m_messagesBrowser, &MessagePreviewer::loadUrl); @@ -257,7 +263,10 @@ void FeedMessageViewer::createConnections() { // State of many messages is changed, then we need // to reload selections. - connect(m_feedsView->sourceModel(), &FeedsModel::reloadMessageListRequested, m_messagesView, &MessagesView::reloadSelections); + connect(m_feedsView->sourceModel(), + &FeedsModel::reloadMessageListRequested, + m_messagesView, + &MessagesView::reloadSelections); } MessagePreviewer* FeedMessageViewer::messagesBrowser() const { @@ -339,8 +348,7 @@ void FeedMessageViewer::initializeViews() { void FeedMessageViewer::refreshVisualProperties() { const Qt::ToolButtonStyle button_style = - static_cast(qApp->settings()->value(GROUP(GUI), - SETTING(GUI::ToolbarStyle)).toInt()); + static_cast(qApp->settings()->value(GROUP(GUI), SETTING(GUI::ToolbarStyle)).toInt()); m_toolBarFeeds->setToolButtonStyle(button_style); m_toolBarMessages->setToolButtonStyle(button_style); @@ -348,11 +356,11 @@ void FeedMessageViewer::refreshVisualProperties() { const int icon_size = qApp->settings()->value(GROUP(GUI), SETTING(GUI::ToolbarIconSize)).toInt(); if (icon_size > 0) { - m_toolBarFeeds->setIconSize({ icon_size, icon_size }); + m_toolBarFeeds->setIconSize({icon_size, icon_size}); } else { - m_toolBarFeeds->setIconSize({ qApp->style()->pixelMetric(QStyle::PM_ToolBarIconSize), - qApp->style()->pixelMetric(QStyle::PM_ToolBarIconSize) }); + m_toolBarFeeds->setIconSize({qApp->style()->pixelMetric(QStyle::PM_ToolBarIconSize), + qApp->style()->pixelMetric(QStyle::PM_ToolBarIconSize)}); } m_toolBarMessages->setIconSize(m_toolBarFeeds->iconSize()); diff --git a/src/librssguard/gui/toolbars/toolbareditor.ui b/src/librssguard/gui/toolbars/toolbareditor.ui index 1158b293e..050da5722 100644 --- a/src/librssguard/gui/toolbars/toolbareditor.ui +++ b/src/librssguard/gui/toolbars/toolbareditor.ui @@ -72,18 +72,9 @@ 0 - + Move action up - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -94,18 +85,9 @@ 0 - + Move action down - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -123,18 +105,9 @@ 0 - + Insert separator - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -145,18 +118,9 @@ 0 - + Insert spacer - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -174,18 +138,9 @@ 0 - + Add selected action - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -196,18 +151,9 @@ 0 - + Delete selected action - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -218,18 +164,9 @@ 0 - + Delete all actions - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - @@ -240,18 +177,9 @@ 0 - + Reset toolbar - - - 22 - 22 - - - - Qt::ToolButtonTextUnderIcon - diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp index b65af558f..abf516185 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp @@ -176,8 +176,7 @@ void TextBrowserViewer::setUrl(const QUrl& url) { is_error = true; nonconst_url = QUrl::fromUserInput(QSL(INTERNAL_URL_ADBLOCKED)); - // TODO: Zjednodušeně. - html_str = qApp->skins()->adBlockedPage(url.toString(), block_result.m_blockedByFilter); + html_str = QSL("Blocked!!!
%1").arg(url.toString()); } else { QEventLoop loop; @@ -192,8 +191,7 @@ void TextBrowserViewer::setUrl(const QUrl& url) { if (net_error != QNetworkReply::NetworkError::NoError) { is_error = true; - // TODO: lepší hlaška. - html_str = "Error!"; + html_str = QSL("Error!
%1").arg(NetworkFactory::networkErrorText(net_error)); } else { if (content_type.startsWith(QSL("image/"))) { @@ -423,6 +421,16 @@ void TextBrowserViewer::setHtml(const QString& html, const QUrl& base_url) { m_document.data()->m_resourcesForHtml.clear(); setHtmlPrivate(html, base_url); + + // TODO: implement RTL for viewers somehow? + /* + auto to = document()->defaultTextOption(); + + to.setTextDirection(Qt::LayoutDirection::RightToLeft); + to.setAlignment(Qt::AlignmentFlag::AlignRight); + + document()->setDefaultTextOption(to); + */ } void TextBrowserViewer::setHtmlPrivate(const QString& html, const QUrl& base_url) {