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

List:       kde-commits
Subject:    [falkon] src/lib/adblock: AdBlock: Open AdBlock dialog with plugin settings button
From:       David Rosca <null () kde ! org>
Date:       2018-03-31 15:18:45
Message-ID: E1f2IHF-0003kw-Gz () code ! kde ! org
[Download RAW message or body]

Git commit f10ef7d0aa1ef38610535b53b4a2ad13a25edb82 by David Rosca.
Committed on 31/03/2018 at 15:11.
Pushed by drosca into branch 'master'.

AdBlock: Open AdBlock dialog with plugin settings button

M  +2    -2    src/lib/adblock/adblockmanager.cpp
M  +1    -1    src/lib/adblock/adblockmanager.h
M  +5    -0    src/lib/adblock/adblockplugin.cpp
M  +1    -0    src/lib/adblock/adblockplugin.h
M  +1    -1    src/lib/adblock/metadata.desktop

https://commits.kde.org/falkon/f10ef7d0aa1ef38610535b53b4a2ad13a25edb82

diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp
index 00d12553..f88822bb 100644
--- a/src/lib/adblock/adblockmanager.cpp
+++ b/src/lib/adblock/adblockmanager.cpp
@@ -434,10 +434,10 @@ AdBlockSubscription* AdBlockManager::subscriptionByName(const QString &name) con
     return 0;
 }
 
-AdBlockDialog* AdBlockManager::showDialog()
+AdBlockDialog *AdBlockManager::showDialog(QWidget *parent)
 {
     if (!m_adBlockDialog) {
-        m_adBlockDialog = new AdBlockDialog(mApp->getWindow());
+        m_adBlockDialog = new AdBlockDialog(parent ? parent : mApp->getWindow());
     }
 
     m_adBlockDialog.data()->show();
diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h
index f05e4750..3ee4a936 100644
--- a/src/lib/adblock/adblockmanager.h
+++ b/src/lib/adblock/adblockmanager.h
@@ -98,7 +98,7 @@ public Q_SLOTS:
     void updateMatcher();
     void updateAllSubscriptions();
 
-    AdBlockDialog* showDialog();
+    AdBlockDialog *showDialog(QWidget *parent = nullptr);
 
 private:
     bool m_loaded;
diff --git a/src/lib/adblock/adblockplugin.cpp b/src/lib/adblock/adblockplugin.cpp
index 66435a1c..0c6ec4d9 100644
--- a/src/lib/adblock/adblockplugin.cpp
+++ b/src/lib/adblock/adblockplugin.cpp
@@ -70,6 +70,11 @@ bool AdBlockPlugin::testPlugin()
     return true;
 }
 
+void AdBlockPlugin::showSettings(QWidget *parent)
+{
+    AdBlockManager::instance()->showDialog(parent);
+}
+
 void AdBlockPlugin::webPageCreated(WebPage *page)
 {
     connect(page, &WebPage::loadFinished, this, [=]() {
diff --git a/src/lib/adblock/adblockplugin.h b/src/lib/adblock/adblockplugin.h
index f0bc52e5..533c309e 100644
--- a/src/lib/adblock/adblockplugin.h
+++ b/src/lib/adblock/adblockplugin.h
@@ -36,6 +36,7 @@ public:
     void init(InitState state, const QString &settingsPath) override;
     void unload() override;
     bool testPlugin() override;
+    void showSettings(QWidget *parent = nullptr) override;
 
 private:
     void webPageCreated(WebPage *page);
diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index 51ee9efc..2d35651a 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -29,4 +29,4 @@ Type=Service
 X-Falkon-Author=David Rosca
 X-Falkon-Email=nowrep@gmail.com
 X-Falkon-Version=1.1.0
-X-Falkon-Settings=false
+X-Falkon-Settings=true

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