[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [falkon] src: Add Downloads, AdBlock and GreaseMonkey buttons to statusbar
From:       David Rosca <null () kde ! org>
Date:       2018-01-24 19:42:46
Message-ID: E1eeQwY-0001a0-0L () code ! kde ! org
[Download RAW message or body]

Git commit 7265c30aa8cd7c97cf42ad377c306519280b30a1 by David Rosca.
Committed on 24/01/2018 at 19:37.
Pushed by drosca into branch 'master'.

Add Downloads, AdBlock and GreaseMonkey buttons to statusbar

M  +4    -1    src/lib/adblock/adblockplugin.cpp
M  +3    -1    src/lib/app/browserwindow.cpp
M  +2    -0    src/plugins/GreaseMonkey/gm_manager.cpp

https://commits.kde.org/falkon/7265c30aa8cd7c97cf42ad377c306519280b30a1

diff --git a/src/lib/adblock/adblockplugin.cpp b/src/lib/adblock/adblockplugin.cpp
index 391bf0d5..02ea9733 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 0f00bcc4..21461bcb 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 1aa4d47b..4618037c 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 <QTimer>
 #include <QDir>
@@ -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;
 }


[prev in list] [next in list] [prev in thread] [next in thread]