summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-23 11:56:28 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-23 11:56:28 (GMT)
commitaec745ca80899a4c037de3e831101481faa083ba (patch)
tree7d3d15958b0f99cf4a154946f5a3c3a4602a06a0
parent3dc9218bcc77731888d999b52aabe84dd8e47220 (diff)
Create dialogbox
-rw-r--r--CMakeLists.txt4
-rw-r--r--plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp6
-rw-r--r--plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.h1
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt1
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp53
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h46
6 files changed, 109 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c78443f..44b56c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.3.40")
set(GRAVATAR_LIB_VERSION "5.3.40")
-set(PIMCOMMON_LIB_VERSION "5.3.53")
+set(PIMCOMMON_LIB_VERSION "5.3.56")
set(GRANTLEETHEME_LIB_VERSION "5.3.40")
set(CALENDARSUPPORT_LIB_VERSION "5.3.40")
set(EVENTVIEW_LIB_VERSION "5.3.40")
@@ -68,7 +68,7 @@ set(LIBKLEO_LIB_VERSION "5.3.40")
set(AKONADI_LIB_VERSION "5.3.45")
set(INCIDENCEEDITOR_LIB_VERSION "5.3.40")
set(KTNEF_LIB_VERSION "5.3.40")
-set(MESSAGELIB_LIB_VERSION "5.3.62")
+set(MESSAGELIB_LIB_VERSION "5.3.63")
set(AKONADICALENDAR_LIB_VERSION "5.3.40")
set(CALENDAR_UTILS_VERSION "5.3.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.3.42")
diff --git a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
index 5189b22..63c5d96 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
+++ b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
@@ -57,5 +57,11 @@ WebEngineViewer::NetworkPluginUrlInterceptorConfigureWidgetSetting AdblockPlugin
settings.configureWidget = configureWidget;
return settings;
}
+void AdblockPluginUrlInterceptor::showConfigureDialog(QWidget *parent)
+{
+ //TODO
+}
#include "adblockpluginurlinterceptor.moc"
+
+
diff --git a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.h b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.h
index eb6bdc7..4459200 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.h
+++ b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.h
@@ -37,6 +37,7 @@ public:
WebEngineViewer::NetworkPluginUrlInterceptorInterface *createInterface(QWebEngineView *webEngine, QObject *parent) Q_DECL_OVERRIDE;
+ void showConfigureDialog(QWidget *parent) Q_DECL_OVERRIDE;
bool hasConfigureDialog() const Q_DECL_OVERRIDE;
WebEngineViewer::NetworkPluginUrlInterceptorConfigureWidgetSetting createConfigureWidget(QWidget *parent) Q_DECL_OVERRIDE;
};
diff --git a/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
index 64c15af..efe3ff6 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
@@ -6,6 +6,7 @@ set(adblocklibprivate_widget_SRCS
widgets/adblockblockableitemswidget.cpp
widgets/adblockcreatefilterdialog.cpp
widgets/adblockpluginurlinterceptorconfigurewidget.cpp
+ widgets/adblockpluginurlinterceptorconfiguredialog.cpp
widgets/adblockaddsubscriptiondialog.cpp
widgets/adblockautomaticruleslistwidget.cpp
widgets/adblocklistwidget.cpp
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp
new file mode 100644
index 0000000..7d7d0d5
--- /dev/null
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "adblockpluginurlinterceptorconfiguredialog.h"
+#include "adblockautomaticruleslistwidget.h"
+#include "adblockpluginurlinterceptorconfigurewidget.h"
+
+#include <QWidget>
+
+using namespace AdBlock;
+
+AdblockPluginUrlInterceptorConfigureDialog::AdblockPluginUrlInterceptorConfigureDialog(QWidget *parent)
+ : PimCommon::ConfigurePluginDialog(parent)
+{
+ initLayout();
+}
+
+AdblockPluginUrlInterceptorConfigureDialog::~AdblockPluginUrlInterceptorConfigureDialog()
+{
+
+}
+
+QWidget *AdblockPluginUrlInterceptorConfigureDialog::createLayout()
+{
+ mAdblockConfigureWidget = new AdblockPluginUrlInterceptorConfigureWidget(this);
+ return mAdblockConfigureWidget;
+}
+
+void AdblockPluginUrlInterceptorConfigureDialog::save()
+{
+ mAdblockConfigureWidget->saveSettings();
+}
+
+void AdblockPluginUrlInterceptorConfigureDialog::load()
+{
+ mAdblockConfigureWidget->loadSettings();
+}
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h
new file mode 100644
index 0000000..ec974b6
--- /dev/null
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef ADBLOCKPLUGINURLINTERCEPTORCONFIGUREDIALOG_H
+#define ADBLOCKPLUGINURLINTERCEPTORCONFIGUREDIALOG_H
+
+#include <PimCommon/ConfigurePluginDialog>
+#include <QWidget>
+#include "adblocklib_export.h"
+
+namespace AdBlock
+{
+class AdblockPluginUrlInterceptorConfigureWidget;
+class ADBLOCKLIB_EXPORT AdblockPluginUrlInterceptorConfigureDialog : public PimCommon::ConfigurePluginDialog
+{
+ Q_OBJECT
+public:
+ explicit AdblockPluginUrlInterceptorConfigureDialog(QWidget *parent = Q_NULLPTR);
+ ~AdblockPluginUrlInterceptorConfigureDialog();
+
+protected:
+ QWidget *createLayout() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
+private:
+ AdblockPluginUrlInterceptorConfigureWidget *mAdblockConfigureWidget;
+};
+}
+#endif // ADBLOCKPLUGINURLINTERCEPTORCONFIGUREDIALOG_H