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
89c3af4b
Commit
89c3af4b
authored
Mar 30, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused code
parent
98a9d875
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
16 deletions
+10
-16
messageviewer/src/viewer/viewer_p.cpp
messageviewer/src/viewer/viewer_p.cpp
+5
-1
messageviewer/src/viewer/webengine/mailwebengineview.cpp
messageviewer/src/viewer/webengine/mailwebengineview.cpp
+5
-13
messageviewer/src/viewer/webengine/mailwebengineview.h
messageviewer/src/viewer/webengine/mailwebengineview.h
+0
-2
No files found.
messageviewer/src/viewer/viewer_p.cpp
View file @
89c3af4b
...
...
@@ -1163,6 +1163,7 @@ void ViewerPrivate::readConfig()
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
mViewer
->
settings
()
->
setFontSize
(
QWebEngineSettings
::
MinimumFontSize
,
MessageViewer
::
MessageViewerSettings
::
self
()
->
minimumFontSize
());
mViewer
->
settings
()
->
setFontSize
(
QWebEngineSettings
::
MinimumLogicalFontSize
,
MessageViewer
::
MessageViewerSettings
::
self
()
->
minimumFontSize
());
//TODO verify Qt5.7
//FIXME mViewer->settings()->setAttribute(QWebEngineSettings::PrintElementBackgrounds, MessageViewer::MessageViewerSettings::self()->printBackgroundColorImages());
#else
mViewer
->
settings
()
->
setFontSize
(
QWebSettings
::
MinimumFontSize
,
MessageViewer
::
MessageViewerSettings
::
self
()
->
minimumFontSize
());
...
...
@@ -1568,7 +1569,6 @@ void ViewerPrivate::createActions()
mZoomActionMenu
=
new
MessageViewer
::
ZoomActionMenu
(
this
);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
connect
(
mZoomActionMenu
,
&
ZoomActionMenu
::
zoomChanged
,
mViewer
,
&
MailWebEngineView
::
slotZoomChanged
);
connect
(
mZoomActionMenu
,
&
ZoomActionMenu
::
zoomTextOnlyChanged
,
mViewer
,
&
MailWebEngineView
::
slotZoomTextOnlyChanged
);
#else
connect
(
mZoomActionMenu
,
&
ZoomActionMenu
::
zoomChanged
,
mViewer
,
&
MailWebView
::
slotZoomChanged
);
connect
(
mZoomActionMenu
,
&
ZoomActionMenu
::
zoomTextOnlyChanged
,
mViewer
,
&
MailWebView
::
slotZoomTextOnlyChanged
);
...
...
@@ -3066,7 +3066,11 @@ void ViewerPrivate::slotBlockImage()
void
ViewerPrivate
::
slotOpenBlockableItems
()
{
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
qDebug
()
<<
"void ViewerPrivate::slotOpenBlockableItems() unimplemented"
;
#else
mViewer
->
openBlockableItemsDialog
();
#endif
}
void
ViewerPrivate
::
addHelpTextAction
(
QAction
*
act
,
const
QString
&
text
)
...
...
messageviewer/src/viewer/webengine/mailwebengineview.cpp
View file @
89c3af4b
...
...
@@ -123,15 +123,10 @@ void MailWebEngineView::selectAll()
void
MailWebEngineView
::
slotZoomChanged
(
qreal
zoom
)
{
qDebug
()
<<
" void MailWebEngineView::slotZoomChanged(qreal zoom)*******"
<<
zoom
;
setZoomFactor
(
zoom
);
}
void
MailWebEngineView
::
slotZoomTextOnlyChanged
(
bool
b
)
{
Q_UNUSED
(
b
);
qDebug
()
<<
"MailWebEngineView::slotZoomTextOnlyChanged unimplemented"
;
}
void
MailWebEngineView
::
scamCheck
()
{
d
->
mScamDetection
->
scanPage
(
page
());
...
...
@@ -325,13 +320,10 @@ QUrl MailWebEngineView::linkOrImageUrlAt(const QPoint &global) const
return
{};
}
void
MailWebEngineView
::
openBlockableItemsDialog
()
{
//TODO
}
void
MailWebEngineView
::
setAllowExternalContent
(
bool
b
)
{
d
->
mExternalReference
->
setAllowExternalContent
(
b
);
reload
();
if
(
d
->
mExternalReference
->
allowExternalContent
()
!=
b
)
{
d
->
mExternalReference
->
setAllowExternalContent
(
b
);
reload
();
}
}
messageviewer/src/viewer/webengine/mailwebengineview.h
View file @
89c3af4b
...
...
@@ -57,13 +57,11 @@ public:
void
scrollToRelativePosition
(
double
pos
);
double
relativePosition
()
const
;
QUrl
linkOrImageUrlAt
(
const
QPoint
&
global
)
const
;
void
openBlockableItemsDialog
();
void
setAllowExternalContent
(
bool
b
);
public
Q_SLOTS
:
void
slotZoomChanged
(
qreal
zoom
);
void
slotZoomTextOnlyChanged
(
bool
b
);
void
slotShowDetails
();
protected:
...
...
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