FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save work.

This commit is contained in:
Martin Rotter 2017-07-19 22:02:58 +02:00
parent e3635f5394
commit d2cc973153
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/webviewer.cpp
View File

@ -43,6 +43,10 @@ bool WebViewer::canDecreaseZoom() {
return zoomFactor() >= MIN_ZOOM_FACTOR + ZOOM_FACTOR_STEP;
}
WebPage *WebViewer::page() const {
return qobject_cast<WebPage*>(QWebEngineView::page());
}
void WebViewer::displayMessage() {
setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE));
}

2
src/gui/webviewer.h
View File

@ -37,6 +37,8 @@ class WebViewer : public QWebEngineView {
return m_messageContents;
}
WebPage *page() const;
public slots:
// Page zoom modifiers.
bool increaseWebPageZoom();

10
src/network-web/adblock/adblockicon.cpp
View File

@ -22,6 +22,9 @@
#include "network-web/adblock/adblocksubscription.h"
#include "miscellaneous/application.h"
#include "network-web/webpage.h"
#include "gui/webbrowser.h"
#include "gui/webviewer.h"
#include "gui/dialogs/formmain.h"
#include <QMenu>
#include <QTimer>
@ -58,7 +61,6 @@ void AdBlockIcon::popupBlocked(const QString &ruleString, const QUrl &url) {
pair.second = url;
m_blockedPopups.append(pair);
qApp->showGuiMessage(tr("Blocked popup window"), tr("AdBlock blocked unwanted popup window."), QSystemTrayIcon::Information);
if (!m_flashTimer) {
@ -87,7 +89,7 @@ QAction *AdBlockIcon::menuAction() {
return m_menuAction;
}
void AdBlockIcon::createMenu(QMenu* menu) {
void AdBlockIcon::createMenu(QMenu *menu) {
if (!menu) {
menu = qobject_cast<QMenu*>(sender());
@ -101,10 +103,10 @@ void AdBlockIcon::createMenu(QMenu* menu) {
AdBlockManager* manager = AdBlockManager::instance();
AdBlockCustomList* customList = manager->customList();
WebPage *page = m_window->weView()->page();
WebPage *page = qApp->mainForm()->tabWidget()->currentWidget()->webBrowser()->viewer()->page();
const QUrl pageUrl = page->url();
menu->addAction(tr("Show AdBlock &Settings"), manager, SLOT(showDialog()));
menu->addAction(tr("Show AdBlock &settings"), manager, SLOT(showDialog()));
menu->addSeparator();
if (!pageUrl.host().isEmpty() && m_enabled && manager->canRunOnScheme(pageUrl.scheme())) {