From 7265c30aa8cd7c97cf42ad377c306519280b30a1 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 24 Jan 2018 19:55:54 +0100 Subject: [PATCH] Add Downloads, AdBlock and GreaseMonkey buttons to statusbar --- src/lib/adblock/adblockplugin.cpp | 5 ++++- src/lib/app/browserwindow.cpp | 4 +++- src/plugins/GreaseMonkey/gm_manager.cpp | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/adblock/adblockplugin.cpp b/src/lib/adblock/adblockplugin.cpp index 391bf0d50..02ea97334 100644 --- a/src/lib/adblock/adblockplugin.cpp +++ b/src/lib/adblock/adblockplugin.cpp @@ -26,6 +26,7 @@ #include "browserwindow.h" #include "navigationbar.h" #include "mainapplication.h" +#include "statusbar.h" AdBlockPlugin::AdBlockPlugin() : QObject() @@ -84,7 +85,9 @@ void AdBlockPlugin::webPageDeleted(WebPage *page) void AdBlockPlugin::mainWindowCreated(BrowserWindow *window) { - window->navigationBar()->addToolButton(new AdBlockIcon(window)); + AdBlockIcon *icon = new AdBlockIcon(window); + window->statusBar()->addButton(icon); + window->navigationBar()->addToolButton(icon); } bool AdBlockPlugin::acceptNavigationRequest(WebPage *page, const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 0f00bcc4a..21461bcb4 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -385,7 +385,9 @@ void BrowserWindow::setupUi() m_statusBar->addPermanentWidget(m_progressBar); m_statusBar->addPermanentWidget(m_ipLabel); - m_navigationToolbar->addToolButton(new DownloadsButton(this)); + DownloadsButton *downloadsButton = new DownloadsButton(this); + m_statusBar->addButton(downloadsButton); + m_navigationToolbar->addToolButton(downloadsButton); QDesktopWidget* desktop = mApp->desktop(); int windowWidth = desktop->availableGeometry().width() / 1.3; diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp index 1aa4d47b1..4618037cb 100644 --- a/src/plugins/GreaseMonkey/gm_manager.cpp +++ b/src/plugins/GreaseMonkey/gm_manager.cpp @@ -31,6 +31,7 @@ #include "navigationbar.h" #include "desktopnotificationsfactory.h" #include "javascript/externaljsobject.h" +#include "statusbar.h" #include #include @@ -295,6 +296,7 @@ bool GM_Manager::canRunOnScheme(const QString &scheme) void GM_Manager::mainWindowCreated(BrowserWindow* window) { GM_Icon *icon = new GM_Icon(this); + window->statusBar()->addButton(icon); window->navigationBar()->addToolButton(icon); m_windows[window] = icon; }