FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unification of web viewers

Browse Source
This commit is contained in:
Martin Rotter 2023-11-23 10:50:17 +01:00
parent 16a6067a28
commit 53c5994104
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
localization/rssguard_en.ts
View File

@ -5871,7 +5871,7 @@ List of supported readers:</source>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="98"/> <location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="98"/>
<source>Open link as audio/video</source> <source>Play link as audio/video</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -8041,12 +8041,12 @@ Unread news: %2</translation>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp" line="375"/> <location filename="../src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp" line="370"/>
<source>Enable external resources</source> <source>Enable external resources</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp" line="377"/> <location filename="../src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp" line="372"/>
<source>Download</source> <source>Download</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -8509,22 +8509,22 @@ Last login on: %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webbrowser.cpp" line="288"/> <location filename="../src/librssguard/gui/webbrowser.cpp" line="289"/>
<source>Back</source> <source>Back</source>
<translation>Back</translation> <translation>Back</translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webbrowser.cpp" line="289"/> <location filename="../src/librssguard/gui/webbrowser.cpp" line="295"/>
<source>Forward</source> <source>Forward</source>
<translation>Forward</translation> <translation>Forward</translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webbrowser.cpp" line="290"/> <location filename="../src/librssguard/gui/webbrowser.cpp" line="301"/>
<source>Reload</source> <source>Reload</source>
<translation>Reload</translation> <translation>Reload</translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/gui/webbrowser.cpp" line="291"/> <location filename="../src/librssguard/gui/webbrowser.cpp" line="307"/>
<source>Stop</source> <source>Stop</source>
<translation>Stop</translation> <translation>Stop</translation>
</message> </message>

34
src/librssguard/gui/webbrowser.cpp
View File

@ -285,24 +285,34 @@ void WebBrowser::initializeLayout() {
m_toolBar->setAllowedAreas(Qt::ToolBarArea::TopToolBarArea); m_toolBar->setAllowedAreas(Qt::ToolBarArea::TopToolBarArea);
// Modify action texts. // Modify action texts.
m_actionBack->setText(tr("Back")); if (m_actionBack != nullptr) {
m_actionForward->setText(tr("Forward")); m_actionBack->setText(tr("Back"));
m_actionReload->setText(tr("Reload")); m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous")));
m_actionStop->setText(tr("Stop")); m_toolBar->addAction(m_actionBack);
}
m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous"))); if (m_actionForward != nullptr) {
m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next"))); m_actionForward->setText(tr("Forward"));
m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("reload"), QSL("view-refresh"))); m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next")));
m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("process-stop"))); 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_actionOpenInSystemBrowser->setEnabled(false);
m_actionReadabilePage->setEnabled(false); m_actionReadabilePage->setEnabled(false);
// Add needed actions into toolbar. // 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_actionOpenInSystemBrowser);
m_toolBar->addAction(m_actionReadabilePage); m_toolBar->addAction(m_actionReadabilePage);

13
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -193,15 +193,10 @@ PreparedHtml TextBrowserViewer::prepareHtmlForMessage(const QList<Message>& mess
void TextBrowserViewer::bindToBrowser(WebBrowser* browser) { void TextBrowserViewer::bindToBrowser(WebBrowser* browser) {
installEventFilter(browser); installEventFilter(browser);
browser->m_actionBack = new QAction(this); browser->m_actionBack = nullptr;
browser->m_actionForward = new QAction(this); browser->m_actionForward = nullptr;
browser->m_actionReload = new QAction(this); browser->m_actionReload = nullptr;
browser->m_actionStop = new QAction(this); browser->m_actionStop = nullptr;
browser->m_actionBack->setEnabled(false);
browser->m_actionForward->setEnabled(false);
browser->m_actionReload->setEnabled(false);
browser->m_actionStop->setEnabled(false);
} }
void TextBrowserViewer::findText(const QString& text, bool backwards) { void TextBrowserViewer::findText(const QString& text, bool backwards) {

2
src/librssguard/gui/webviewers/webengine/webengineviewer.cpp
View File

@ -82,6 +82,8 @@ void WebEngineViewer::contextMenuEvent(QContextMenuEvent* event) {
QMenu* menu = page()->createStandardContextMenu(); QMenu* menu = page()->createStandardContextMenu();
#endif #endif
menu->removeAction(page()->action(QWebEnginePage::WebAction::OpenLinkInNewWindow));
menu->addAction(qApp->web()->adBlock()->adBlockIcon()); menu->addAction(qApp->web()->adBlock()->adBlockIcon());
menu->addAction(qApp->web()->engineSettingsAction()); menu->addAction(qApp->web()->engineSettingsAction());

2
src/librssguard/gui/webviewers/webviewer.cpp
View File

@ -95,7 +95,7 @@ void WebViewer::initializeCommonMenuItems() {
QObject::tr("Open in external browser"))); QObject::tr("Open in external browser")));
m_actionPlayLink.reset(new QAction(qApp->icons()->fromTheme(QSL("player_play"), QSL("media-playback-start")), 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(), QObject::connect(m_actionOpenExternalBrowser.data(),
&QAction::triggered, &QAction::triggered,