Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
PIM Messagelib
Commits
7981442e
Commit
7981442e
authored
Mar 31, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Returns actions from interceptor plugin
parent
6a8753bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
messageviewer/src/viewer/webengine/mailwebengineview.cpp
messageviewer/src/viewer/webengine/mailwebengineview.cpp
+5
-3
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
...ebengine/networkmanager/networkaccessmanagerwebengine.cpp
+10
-0
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
.../webengine/networkmanager/networkaccessmanagerwebengine.h
+2
-0
No files found.
messageviewer/src/viewer/webengine/mailwebengineview.cpp
View file @
7981442e
...
...
@@ -57,7 +57,8 @@ public:
:
mScamDetection
(
Q_NULLPTR
),
mWebViewAccessKey
(
Q_NULLPTR
),
mExternalReference
(
Q_NULLPTR
),
mPageEngine
(
Q_NULLPTR
)
mPageEngine
(
Q_NULLPTR
),
mNetworkAccessManager
(
Q_NULLPTR
)
{
}
...
...
@@ -65,6 +66,7 @@ public:
MailWebEngineAccessKey
*
mWebViewAccessKey
;
MessageViewer
::
LoadExternalReferencesUrlInterceptor
*
mExternalReference
;
MailWebEnginePage
*
mPageEngine
;
MessageViewer
::
NetworkAccessManagerWebEngine
*
mNetworkAccessManager
;
};
MailWebEngineView
::
MailWebEngineView
(
KActionCollection
*
ac
,
QWidget
*
parent
)
...
...
@@ -79,9 +81,9 @@ MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
connect
(
d
->
mScamDetection
,
&
ScamDetectionWebEngine
::
messageMayBeAScam
,
this
,
&
MailWebEngineView
::
messageMayBeAScam
);
connect
(
d
->
mWebViewAccessKey
,
&
MailWebEngineAccessKey
::
openUrl
,
this
,
&
MailWebEngineView
::
openUrl
);
MessageViewer
::
NetworkAccessManagerWebEngine
*
n
etworkAccessManager
=
new
MessageViewer
::
NetworkAccessManagerWebEngine
(
this
,
ac
,
this
);
d
->
mN
etworkAccessManager
=
new
MessageViewer
::
NetworkAccessManagerWebEngine
(
this
,
ac
,
this
);
d
->
mExternalReference
=
new
MessageViewer
::
LoadExternalReferencesUrlInterceptor
(
this
);
n
etworkAccessManager
->
addInterceptor
(
d
->
mExternalReference
);
d
->
mN
etworkAccessManager
->
addInterceptor
(
d
->
mExternalReference
);
d
->
mPageEngine
=
new
MailWebEnginePage
(
this
);
setPage
(
d
->
mPageEngine
);
...
...
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
View file @
7981442e
...
...
@@ -19,6 +19,7 @@
#include "webengine/urlinterceptor/networkurlinterceptormanager.h"
#include "webengine/urlinterceptor/networkurlinterceptor.h"
#include <QWebEngineProfile>
#include <MessageViewer/NetworkPluginUrlInterceptorInterface>
using
namespace
MessageViewer
;
...
...
@@ -58,3 +59,12 @@ void NetworkAccessManagerWebEngine::addInterceptor(MessageViewer::NetworkPluginU
{
d
->
mNetworkUrlInterceptor
->
addInterceptor
(
interceptor
);
}
QList
<
QAction
*>
NetworkAccessManagerWebEngine
::
actions
()
const
{
QList
<
QAction
*>
actions
;
Q_FOREACH
(
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*
interface
,
d
->
mManager
->
interfaceList
())
{
actions
.
append
(
interface
->
actions
());
}
return
actions
;
}
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
View file @
7981442e
...
...
@@ -22,6 +22,7 @@
#include "messageviewer_export.h"
class
KActionCollection
;
class
QWebEngineView
;
class
QAction
;
namespace
MessageViewer
{
class
NetworkPluginUrlInterceptorInterface
;
...
...
@@ -33,6 +34,7 @@ public:
explicit
NetworkAccessManagerWebEngine
(
QWebEngineView
*
webEngine
,
KActionCollection
*
ac
,
QObject
*
parent
=
Q_NULLPTR
);
~
NetworkAccessManagerWebEngine
();
void
addInterceptor
(
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*
interceptor
);
QList
<
QAction
*>
actions
()
const
;
private:
NetworkAccessManagerWebEnginePrivate
*
const
d
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment