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
1a302345
Commit
1a302345
authored
Apr 06, 2021
by
Laurent Montel
Browse files
Move in webengineviewer directly
parent
218047a4
Pipeline
#56626
canceled with stage
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
1a302345
cmake_minimum_required
(
VERSION 3.5 FATAL_ERROR
)
set
(
PIM_VERSION
"5.17.4
6
"
)
set
(
PIM_VERSION
"5.17.4
7
"
)
if
(
POLICY CMP0053
)
cmake_policy
(
SET CMP0053 NEW
)
...
...
messageviewer/src/CMakeLists.txt
View file @
1a302345
...
...
@@ -149,7 +149,6 @@ set(libmessageviewer_widgets_SRCS
widgets/invitationsettings.cpp
widgets/opensavedfilefolderwidget.cpp
widgets/mailsourceviewtextbrowserwidget.cpp
widgets/submittedformwarningwidget.cpp
widgets/shownextmessagewidget.cpp
)
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
1a302345
...
...
@@ -104,9 +104,9 @@
#include "header/headerstylemenumanager.h"
#include "htmlwriter/webengineparthtmlwriter.h"
#include "viewer/webengine/mailwebengineview.h"
#include "widgets/submittedformwarningwidget.h"
#include <WebEngineViewer/FindBarWebEngineView>
#include <WebEngineViewer/LocalDataBaseManager>
#include <WebEngineViewer/SubmittedFormWarningWidget>
#include <WebEngineViewer/WebEngineExportPdfPageJob>
#include <WebEngineViewer/WebHitTestResult>
#include <widgets/mailsourcewebengineviewer.h>
...
...
@@ -928,7 +928,7 @@ void ViewerPrivate::initHtmlWidget()
connect
(
mViewer
,
&
MailWebEngineView
::
popupMenu
,
this
,
&
ViewerPrivate
::
slotUrlPopup
);
connect
(
mViewer
,
&
MailWebEngineView
::
wheelZoomChanged
,
this
,
&
ViewerPrivate
::
slotWheelZoomChanged
);
connect
(
mViewer
,
&
MailWebEngineView
::
messageMayBeAScam
,
this
,
&
ViewerPrivate
::
slotMessageMayBeAScam
);
connect
(
mViewer
,
&
MailWebEngineView
::
formSubmittedForbidden
,
mSubmittedFormWarning
,
&
SubmittedFormWarningWidget
::
showWarning
);
connect
(
mViewer
,
&
MailWebEngineView
::
formSubmittedForbidden
,
mSubmittedFormWarning
,
&
WebEngineViewer
::
SubmittedFormWarningWidget
::
showWarning
);
connect
(
mViewer
,
&
MailWebEngineView
::
mailTrackingFound
,
mMailTrackingWarning
,
&
WebEngineViewer
::
TrackingWarningWidget
::
addTracker
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
showDetails
,
mViewer
,
&
MailWebEngineView
::
slotShowDetails
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
moveMessageToTrash
,
this
,
&
ViewerPrivate
::
moveMessageToTrash
);
...
...
@@ -1387,7 +1387,7 @@ void ViewerPrivate::createWidgets()
connect
(
mShowNextMessageWidget
,
&
ShowNextMessageWidget
::
showPreviousMessage
,
this
,
&
ViewerPrivate
::
showPreviousMessage
);
connect
(
mShowNextMessageWidget
,
&
ShowNextMessageWidget
::
showNextMessage
,
this
,
&
ViewerPrivate
::
showNextMessage
);
mSubmittedFormWarning
=
new
SubmittedFormWarningWidget
(
readerBox
);
mSubmittedFormWarning
=
new
WebEngineViewer
::
SubmittedFormWarningWidget
(
readerBox
);
mSubmittedFormWarning
->
setObjectName
(
QStringLiteral
(
"submittedformwarning"
));
readerBoxVBoxLayout
->
addWidget
(
mSubmittedFormWarning
);
...
...
messageviewer/src/viewer/viewer_p.h
View file @
1a302345
...
...
@@ -75,6 +75,7 @@ class ZoomActionMenu;
class
LocalDataBaseManager
;
class
TrackingWarningWidget
;
class
DeveloperToolDialog
;
class
SubmittedFormWarningWidget
;
}
namespace
MessageViewer
{
...
...
@@ -90,7 +91,6 @@ class ScamDetectionWarningWidget;
class
MimePartTreeView
;
class
HeaderStyleMenuManager
;
class
ViewerPluginToolManager
;
class
SubmittedFormWarningWidget
;
class
MailSourceWebEngineViewer
;
class
ShowNextMessageWidget
;
class
RemoteContentMenu
;
...
...
@@ -692,7 +692,7 @@ public:
MessageViewer
::
ScamDetectionWarningWidget
*
mScamDetectionWarning
=
nullptr
;
MessageViewer
::
OpenSavedFileFolderWidget
*
mOpenSavedFileFolderWidget
=
nullptr
;
Messag
eViewer
::
SubmittedFormWarningWidget
*
mSubmittedFormWarning
=
nullptr
;
WebEngin
eViewer
::
SubmittedFormWarningWidget
*
mSubmittedFormWarning
=
nullptr
;
WebEngineViewer
::
TrackingWarningWidget
*
mMailTrackingWarning
=
nullptr
;
KPIMTextEdit
::
TextToSpeechWidget
*
mTextToSpeechWidget
=
nullptr
;
Viewer
::
DisplayFormatMessage
mDisplayFormatMessageOverwrite
;
...
...
webengineviewer/src/CMakeLists.txt
View file @
1a302345
...
...
@@ -83,8 +83,12 @@ set(libwebengineviewer_developertool_SRCS
developertool/developertooldialog.cpp
)
set
(
libwebengineviewer_submittedform_SRCS
widgets/submittedformwidgets/submittedformwarningwidget.cpp
)
set
(
libwebengineviewer_SRCS
${
libwebengineviewer_submittedform_SRCS
}
${
libwebengineviewer_developertool_SRCS
}
${
libwebengineviewer_checkphishingurl_SRCS
}
${
libwebengineviewer_interceptor_SRCS
}
...
...
@@ -260,6 +264,16 @@ ecm_generate_headers(WebEngineViewer_Cameldevelopertool_HEADERS
RELATIVE developertool/
)
ecm_generate_headers
(
WebEngineViewer_Camelsubmittedformwidget_HEADERS
HEADER_NAMES
SubmittedFormWarningWidget
REQUIRED_HEADERS WebEngineViewer_submittedformwidget_HEADERS
PREFIX WebEngineViewer
RELATIVE widgets/submittedformwidgets/
)
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
...
...
@@ -267,6 +281,7 @@ ecm_generate_pri_file(BASE_NAME WebEngineViewer
install
(
FILES
${
WebEngineViewer_Camelsubmittedformwidget_HEADERS
}
${
WebEngineViewer_Cameldevelopertool_HEADERS
}
${
WebEngineViewer_Cameltracking_HEADERS
}
${
WebEngineViewer_Camelblockexternalresourcesurlinterceptor_HEADERS
}
...
...
@@ -285,6 +300,7 @@ install(FILES
)
install
(
FILES
${
WebEngineViewer_submittedformwidget_HEADERS
}
${
WebEngineViewer_developertool_HEADERS
}
${
WebEngineViewer_tracking_HEADERS
}
${
WebEngineViewer_blockexternalresourcesurlinterceptor_HEADERS
}
...
...
messag
eviewer/src/widgets/submittedformwarningwidget.cpp
→
webengin
eviewer/src/widgets/
submittedformwidgets/
submittedformwarningwidget.cpp
View file @
1a302345
...
...
@@ -9,7 +9,7 @@
#include <KLocalizedString>
using
namespace
Messag
eViewer
;
using
namespace
WebEngin
eViewer
;
SubmittedFormWarningWidget
::
SubmittedFormWarningWidget
(
QWidget
*
parent
)
:
KMessageWidget
(
parent
)
...
...
messag
eviewer/src/widgets/submittedformwarningwidget.h
→
webengin
eviewer/src/widgets/
submittedformwidgets/
submittedformwarningwidget.h
View file @
1a302345
...
...
@@ -6,13 +6,13 @@
*/
#pragma once
#include "webengineviewer_export.h"
#include <KMessageWidget>
namespace
Messag
eViewer
namespace
WebEngin
eViewer
{
class
SubmittedFormWarningWidgetPrivate
;
class
SubmittedFormWarningWidget
:
public
KMessageWidget
class
WEBENGINEVIEWER_EXPORT
SubmittedFormWarningWidget
:
public
KMessageWidget
{
Q_OBJECT
public:
...
...
@@ -23,4 +23,3 @@ public Q_SLOTS:
void
showWarning
();
};
}
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