Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
ccff69b8
Commit
ccff69b8
authored
Mar 29, 2021
by
Laurent Montel
😁
Browse files
Move tracking widget in webengineviewer
parent
0b0379a1
Pipeline
#55850
canceled with stage
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
ccff69b8
cmake_minimum_required
(
VERSION 3.5 FATAL_ERROR
)
set
(
PIM_VERSION
"5.17.4
4
"
)
set
(
PIM_VERSION
"5.17.4
5
"
)
if
(
POLICY CMP0053
)
cmake_policy
(
SET CMP0053 NEW
)
...
...
messageviewer/src/CMakeLists.txt
View file @
ccff69b8
...
...
@@ -150,8 +150,6 @@ set(libmessageviewer_widgets_SRCS
widgets/opensavedfilefolderwidget.cpp
widgets/mailsourceviewtextbrowserwidget.cpp
widgets/submittedformwarningwidget.cpp
widgets/trackingwarningwidget.cpp
widgets/trackingdetailsdialog.cpp
widgets/shownextmessagewidget.cpp
widgets/developertooldialog.cpp
widgets/developertoolwidget.cpp
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
ccff69b8
...
...
@@ -127,12 +127,12 @@
#include <AkonadiCore/agentmanager.h>
#include <AkonadiCore/collectionfetchscope.h>
#include "widgets/trackingwarningwidget.h"
#include <KJobWidgets/KJobWidgets>
#include <KPIMTextEdit/TextToSpeechWidget>
#include <QApplication>
#include <QStandardPaths>
#include <QWebEngineSettings>
#include <WebEngineViewer/TrackingWarningWidget>
#include <WebEngineViewer/ZoomActionMenu>
#include <boost/bind.hpp>
#include <header/headerstyleplugin.h>
...
...
@@ -929,7 +929,7 @@ void ViewerPrivate::initHtmlWidget()
connect
(
mViewer
,
&
MailWebEngineView
::
wheelZoomChanged
,
this
,
&
ViewerPrivate
::
slotWheelZoomChanged
);
connect
(
mViewer
,
&
MailWebEngineView
::
messageMayBeAScam
,
this
,
&
ViewerPrivate
::
slotMessageMayBeAScam
);
connect
(
mViewer
,
&
MailWebEngineView
::
formSubmittedForbidden
,
mSubmittedFormWarning
,
&
SubmittedFormWarningWidget
::
showWarning
);
connect
(
mViewer
,
&
MailWebEngineView
::
mailTrackingFound
,
mMailTrackingWarning
,
&
TrackingWarningWidget
::
addTracker
);
connect
(
mViewer
,
&
MailWebEngineView
::
mailTrackingFound
,
mMailTrackingWarning
,
&
WebEngineViewer
::
TrackingWarningWidget
::
addTracker
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
showDetails
,
mViewer
,
&
MailWebEngineView
::
slotShowDetails
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
moveMessageToTrash
,
this
,
&
ViewerPrivate
::
moveMessageToTrash
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
messageIsNotAScam
,
this
,
&
ViewerPrivate
::
slotMessageIsNotAScam
);
...
...
@@ -1391,7 +1391,7 @@ void ViewerPrivate::createWidgets()
mSubmittedFormWarning
->
setObjectName
(
QStringLiteral
(
"submittedformwarning"
));
readerBoxVBoxLayout
->
addWidget
(
mSubmittedFormWarning
);
mMailTrackingWarning
=
new
TrackingWarningWidget
(
readerBox
);
mMailTrackingWarning
=
new
WebEngineViewer
::
TrackingWarningWidget
(
readerBox
);
mMailTrackingWarning
->
setObjectName
(
QStringLiteral
(
"mailtrackingwarning"
));
readerBoxVBoxLayout
->
addWidget
(
mMailTrackingWarning
);
...
...
messageviewer/src/viewer/viewer_p.h
View file @
ccff69b8
...
...
@@ -73,6 +73,7 @@ class WebHitTestResult;
class
FindBarWebEngineView
;
class
ZoomActionMenu
;
class
LocalDataBaseManager
;
class
TrackingWarningWidget
;
}
namespace
MessageViewer
{
...
...
@@ -90,7 +91,6 @@ class HeaderStyleMenuManager;
class
ViewerPluginToolManager
;
class
SubmittedFormWarningWidget
;
class
MailSourceWebEngineViewer
;
class
TrackingWarningWidget
;
class
ShowNextMessageWidget
;
class
DeveloperToolDialog
;
class
RemoteContentMenu
;
...
...
@@ -693,7 +693,7 @@ public:
MessageViewer
::
ScamDetectionWarningWidget
*
mScamDetectionWarning
=
nullptr
;
MessageViewer
::
OpenSavedFileFolderWidget
*
mOpenSavedFileFolderWidget
=
nullptr
;
MessageViewer
::
SubmittedFormWarningWidget
*
mSubmittedFormWarning
=
nullptr
;
Messag
eViewer
::
TrackingWarningWidget
*
mMailTrackingWarning
=
nullptr
;
WebEngin
eViewer
::
TrackingWarningWidget
*
mMailTrackingWarning
=
nullptr
;
KPIMTextEdit
::
TextToSpeechWidget
*
mTextToSpeechWidget
=
nullptr
;
Viewer
::
DisplayFormatMessage
mDisplayFormatMessageOverwrite
;
KPIMTextEdit
::
SlideContainer
*
mSliderContainer
=
nullptr
;
...
...
messageviewer/src/widgets/autotests/CMakeLists.txt
View file @
ccff69b8
...
...
@@ -8,8 +8,6 @@ macro(add_messageviewer_widget_unittest _source)
)
endmacro
()
add_messageviewer_widget_unittest
(
trackingwarningwidgettest.cpp
)
add_messageviewer_widget_unittest
(
trackingdetailsdialogtest.cpp
)
add_messageviewer_widget_unittest
(
shownextmessagewidgettest.cpp
)
add_messageviewer_widget_unittest
(
developertooldialogtest.cpp
)
add_messageviewer_widget_unittest
(
developertoolwidgettest.cpp
)
webengineviewer/src/CMakeLists.txt
View file @
ccff69b8
...
...
@@ -10,6 +10,7 @@ if(BUILD_TESTING)
add_subdirectory
(
checkphishingurl/autotests/
)
add_subdirectory
(
checkphishingurl/tests/
)
add_subdirectory
(
urlinterceptor/blockexternalresourcesurlinterceptor/autotests
)
add_subdirectory
(
widgets/tracking/autotests/
)
endif
()
...
...
@@ -71,6 +72,11 @@ set(libwebengineviewer_widgets_SRCS
widgets/zoomactionmenu.cpp
)
set
(
libwebengineviewer_tracking_SRCS
widgets/tracking/trackingdetailsdialog.cpp
widgets/tracking/trackingwarningwidget.cpp
)
set
(
libwebengineviewer_SRCS
${
libwebengineviewer_checkphishingurl_SRCS
}
${
libwebengineviewer_interceptor_SRCS
}
...
...
@@ -79,6 +85,7 @@ set(libwebengineviewer_SRCS
${
libwebengineviewer_widgets_SRCS
}
${
libwebengineviewer_print_SRCS
}
${
libwebengineviewer_accesskey_SRCS
}
${
libwebengineviewer_tracking_SRCS
}
)
ecm_qt_declare_logging_category
(
libwebengineviewer_webengine_SRCS HEADER webengineviewer_debug.h IDENTIFIER WEBENGINEVIEWER_LOG CATEGORY_NAME org.kde.pim.webengineviewer
...
...
@@ -102,6 +109,7 @@ target_link_libraries(KF5WebEngineViewer
PUBLIC
Qt5::WebEngineWidgets
KF5::PimCommon
KF5::PimTextEdit
PRIVATE
KF5::CoreAddons
KF5::XmlGui
...
...
@@ -226,6 +234,15 @@ ecm_generate_headers(WebEngineViewer_Camelblockexternalresourcesurlinterceptor_H
)
ecm_generate_headers
(
WebEngineViewer_Cameltracking_HEADERS
HEADER_NAMES
TrackingWarningWidget
REQUIRED_HEADERS WebEngineViewer_tracking_HEADERS
PREFIX WebEngineViewer
RELATIVE widgets/tracking/
)
ecm_generate_pri_file
(
BASE_NAME WebEngineViewer
LIB_NAME KF5WebEngineViewer
DEPS
"webenginewidgets PimCommon"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF5
}
/WebEngineViewer
...
...
@@ -233,6 +250,7 @@ ecm_generate_pri_file(BASE_NAME WebEngineViewer
install
(
FILES
${
WebEngineViewer_Cameltracking_HEADERS
}
${
WebEngineViewer_Camelblockexternalresourcesurlinterceptor_HEADERS
}
${
WebEngineViewer_Camelloadexternalreferencesurlinterceptor_HEADERS
}
${
WebEngineViewer_Camelblocktrackingurlinterceptor_HEADERS
}
...
...
@@ -249,6 +267,7 @@ install(FILES
)
install
(
FILES
${
WebEngineViewer_tracking_HEADERS
}
${
WebEngineViewer_blockexternalresourcesurlinterceptor_HEADERS
}
${
WebEngineViewer_loadexternalreferencesurlinterceptor_HEADERS
}
${
WebEngineViewer_blocktrackingurlinterceptor_HEADERS
}
...
...
webengineviewer/src/widgets/tracking/autotests/CMakeLists.txt
0 → 100644
View file @
ccff69b8
macro
(
add_webengine_widget_unittest _source
)
get_filename_component
(
_name
${
_source
}
NAME_WE
)
ecm_add_test
(
${
_source
}
TEST_NAME
${
_name
}
NAME_PREFIX
"webengineviewer-"
LINK_LIBRARIES KF5::WebEngineViewer Qt5::Test
)
endmacro
()
add_webengine_widget_unittest
(
trackingwarningwidgettest.cpp
)
add_webengine_widget_unittest
(
trackingdetailsdialogtest.cpp
)
messag
eviewer/src/widgets/autotests/trackingdetailsdialogtest.cpp
→
webengin
eviewer/src/widgets/
tracking/
autotests/trackingdetailsdialogtest.cpp
View file @
ccff69b8
...
...
@@ -5,7 +5,7 @@
*/
#include "trackingdetailsdialogtest.h"
#include "widgets/trackingdetailsdialog.h"
#include "widgets/
tracking/
trackingdetailsdialog.h"
#include <QStandardPaths>
#include <QTest>
...
...
@@ -19,5 +19,6 @@ TrackingDetailsDialogTest::TrackingDetailsDialogTest(QObject *parent)
void
TrackingDetailsDialogTest
::
shouldHaveDefaultValue
()
{
// TOOD
WebEngineViewer
::
TrackingDetailsDialog
d
;
// TODO
}
messag
eviewer/src/widgets/autotests/trackingdetailsdialogtest.h
→
webengin
eviewer/src/widgets/
tracking/
autotests/trackingdetailsdialogtest.h
View file @
ccff69b8
File moved
messag
eviewer/src/widgets/autotests/trackingwarningwidgettest.cpp
→
webengin
eviewer/src/widgets/
tracking/
autotests/trackingwarningwidgettest.cpp
View file @
ccff69b8
...
...
@@ -5,7 +5,7 @@
*/
#include "trackingwarningwidgettest.h"
#include "widgets/trackingwarningwidget.h"
#include "widgets/
tracking/
trackingwarningwidget.h"
#include <QTest>
QTEST_MAIN
(
TrackingWarningWidgetTest
)
...
...
@@ -17,7 +17,7 @@ TrackingWarningWidgetTest::TrackingWarningWidgetTest(QObject *parent)
void
TrackingWarningWidgetTest
::
shouldHaveDefaultValues
()
{
Messag
eViewer
::
TrackingWarningWidget
w
;
WebEngin
eViewer
::
TrackingWarningWidget
w
;
QVERIFY
(
!
w
.
isVisible
());
QVERIFY
(
!
w
.
isCloseButtonVisible
());
QVERIFY
(
w
.
wordWrap
());
...
...
messag
eviewer/src/widgets/autotests/trackingwarningwidgettest.h
→
webengin
eviewer/src/widgets/
tracking/
autotests/trackingwarningwidgettest.h
View file @
ccff69b8
File moved
messag
eviewer/src/widgets/trackingdetailsdialog.cpp
→
webengin
eviewer/src/widgets/
tracking/
trackingdetailsdialog.cpp
View file @
ccff69b8
...
...
@@ -13,7 +13,7 @@
#include <QPushButton>
#include <QVBoxLayout>
using
namespace
Messag
eViewer
;
using
namespace
WebEngin
eViewer
;
namespace
{
static
const
char
myMailTrackingDetailsDialogConfigGroupName
[]
=
"MailTrackingDetailsDialog"
;
...
...
messag
eviewer/src/widgets/trackingdetailsdialog.h
→
webengin
eviewer/src/widgets/
tracking/
trackingdetailsdialog.h
View file @
ccff69b8
...
...
@@ -6,7 +6,7 @@
#pragma once
#include "
messageviewer_private
_export.h"
#include "
webengineviewer
_export.h"
#include <QDialog>
namespace
KPIMTextEdit
...
...
@@ -14,9 +14,9 @@ namespace KPIMTextEdit
class
RichTextEditorWidget
;
}
namespace
Messag
eViewer
namespace
WebEngin
eViewer
{
class
MESSAG
EVIEWER_
TESTS_
EXPORT
TrackingDetailsDialog
:
public
QDialog
class
WEBENGIN
EVIEWER_EXPORT
TrackingDetailsDialog
:
public
QDialog
{
Q_OBJECT
public:
...
...
messag
eviewer/src/widgets/trackingwarningwidget.cpp
→
webengin
eviewer/src/widgets/
tracking/
trackingwarningwidget.cpp
View file @
ccff69b8
...
...
@@ -8,7 +8,7 @@
#include "trackingdetailsdialog.h"
#include <KLocalizedString>
using
namespace
Messag
eViewer
;
using
namespace
WebEngin
eViewer
;
TrackingWarningWidget
::
TrackingWarningWidget
(
QWidget
*
parent
)
:
KMessageWidget
(
parent
)
{
...
...
@@ -29,7 +29,7 @@ void TrackingWarningWidget::slotShowDetails(const QString &content)
{
if
(
content
==
QLatin1String
(
"mailtrackingdetails"
))
{
if
(
!
mMailTrackingDetailDialog
)
{
mMailTrackingDetailDialog
=
new
Messag
eViewer
::
TrackingDetailsDialog
;
mMailTrackingDetailDialog
=
new
WebEngin
eViewer
::
TrackingDetailsDialog
;
}
mMailTrackingDetailDialog
->
setDetails
(
generateDetails
());
mMailTrackingDetailDialog
->
show
();
...
...
messag
eviewer/src/widgets/trackingwarningwidget.h
→
webengin
eviewer/src/widgets/
tracking/
trackingwarningwidget.h
View file @
ccff69b8
...
...
@@ -8,17 +8,17 @@
#include <KMessageWidget>
#include "
messageviewer_private
_export.h"
#include "
webengineviewer
_export.h"
#include <QMap>
#include <QPointer>
#include <WebEngineViewer/BlockTrackingUrlInterceptor>
namespace
Messag
eViewer
namespace
WebEngin
eViewer
{
class
TrackingDetailsDialog
;
class
MESSAG
EVIEWER_
TESTS_
EXPORT
TrackingWarningWidget
:
public
KMessageWidget
class
WEBENGIN
EVIEWER_EXPORT
TrackingWarningWidget
:
public
KMessageWidget
{
Q_OBJECT
public:
...
...
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