diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index 1a5a5bdb1..b06529653 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -5871,7 +5871,7 @@ List of supported readers: - Open link as audio/video + Play link as audio/video @@ -8041,12 +8041,12 @@ Unread news: %2 - + Enable external resources - + Download @@ -8509,22 +8509,22 @@ Last login on: %4 - + Back Back - + Forward Forward - + Reload Reload - + Stop Stop diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp index 6e1c91532..7a3d091c5 100644 --- a/src/librssguard/gui/webbrowser.cpp +++ b/src/librssguard/gui/webbrowser.cpp @@ -285,24 +285,34 @@ void WebBrowser::initializeLayout() { m_toolBar->setAllowedAreas(Qt::ToolBarArea::TopToolBarArea); // Modify action texts. - m_actionBack->setText(tr("Back")); - m_actionForward->setText(tr("Forward")); - m_actionReload->setText(tr("Reload")); - m_actionStop->setText(tr("Stop")); + if (m_actionBack != nullptr) { + m_actionBack->setText(tr("Back")); + m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous"))); + m_toolBar->addAction(m_actionBack); + } - m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous"))); - m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next"))); - m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("reload"), QSL("view-refresh"))); - m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("process-stop"))); + if (m_actionForward != nullptr) { + m_actionForward->setText(tr("Forward")); + m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next"))); + m_toolBar->addAction(m_actionForward); + } + + if (m_actionReload != nullptr) { + m_actionReload->setText(tr("Reload")); + m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("reload"), QSL("view-refresh"))); + m_toolBar->addAction(m_actionReload); + } + + if (m_actionStop != nullptr) { + m_actionStop->setText(tr("Stop")); + m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("process-stop"))); + m_toolBar->addAction(m_actionStop); + } m_actionOpenInSystemBrowser->setEnabled(false); m_actionReadabilePage->setEnabled(false); // Add needed actions into toolbar. - m_toolBar->addAction(m_actionBack); - m_toolBar->addAction(m_actionForward); - m_toolBar->addAction(m_actionReload); - m_toolBar->addAction(m_actionStop); m_toolBar->addAction(m_actionOpenInSystemBrowser); m_toolBar->addAction(m_actionReadabilePage); diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp index a8539ee14..b7db93bd1 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp @@ -193,15 +193,10 @@ PreparedHtml TextBrowserViewer::prepareHtmlForMessage(const QList& mess void TextBrowserViewer::bindToBrowser(WebBrowser* browser) { installEventFilter(browser); - browser->m_actionBack = new QAction(this); - browser->m_actionForward = new QAction(this); - browser->m_actionReload = new QAction(this); - browser->m_actionStop = new QAction(this); - - browser->m_actionBack->setEnabled(false); - browser->m_actionForward->setEnabled(false); - browser->m_actionReload->setEnabled(false); - browser->m_actionStop->setEnabled(false); + browser->m_actionBack = nullptr; + browser->m_actionForward = nullptr; + browser->m_actionReload = nullptr; + browser->m_actionStop = nullptr; } void TextBrowserViewer::findText(const QString& text, bool backwards) { diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index e93409ff1..35ea2f59c 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -82,6 +82,8 @@ void WebEngineViewer::contextMenuEvent(QContextMenuEvent* event) { QMenu* menu = page()->createStandardContextMenu(); #endif + menu->removeAction(page()->action(QWebEnginePage::WebAction::OpenLinkInNewWindow)); + menu->addAction(qApp->web()->adBlock()->adBlockIcon()); menu->addAction(qApp->web()->engineSettingsAction()); diff --git a/src/librssguard/gui/webviewers/webviewer.cpp b/src/librssguard/gui/webviewers/webviewer.cpp index 37ce81a69..49993f594 100644 --- a/src/librssguard/gui/webviewers/webviewer.cpp +++ b/src/librssguard/gui/webviewers/webviewer.cpp @@ -95,7 +95,7 @@ void WebViewer::initializeCommonMenuItems() { QObject::tr("Open in external browser"))); m_actionPlayLink.reset(new QAction(qApp->icons()->fromTheme(QSL("player_play"), QSL("media-playback-start")), - QObject::tr("Open link as audio/video"))); + QObject::tr("Play link as audio/video"))); QObject::connect(m_actionOpenExternalBrowser.data(), &QAction::triggered,