Skip to content
GitLab
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
fcf95d7a
Commit
fcf95d7a
authored
Apr 02, 2016
by
Laurent Montel
Browse files
Provide new signal with WebHitTestResult (needed by new plugin)
parent
95f4dd89
Changes
4
Hide whitespace changes
Inline
Side-by-side
messageviewer/src/viewer/viewer.cpp
View file @
fcf95d7a
...
...
@@ -69,6 +69,10 @@ void Viewer::initialize()
{
connect
(
d_ptr
,
&
ViewerPrivate
::
replaceMsgByUnencryptedVersion
,
this
,
&
Viewer
::
replaceMsgByUnencryptedVersion
);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
connect
(
d_ptr
,
&
ViewerPrivate
::
displayPopupMenu
,
this
,
&
Viewer
::
displayPopupMenu
);
#endif
connect
(
d_ptr
,
&
ViewerPrivate
::
popupMenu
,
this
,
&
Viewer
::
popupMenu
);
connect
(
d_ptr
,
SIGNAL
(
urlClicked
(
Akonadi
::
Item
,
QUrl
)),
...
...
messageviewer/src/viewer/viewer.h
View file @
fcf95d7a
...
...
@@ -357,7 +357,9 @@ Q_SIGNALS:
/** The user presses the right mouse button. 'url' may be 0. */
void
popupMenu
(
const
Akonadi
::
Item
&
msg
,
const
QUrl
&
url
,
const
QUrl
&
imageUrl
,
const
QPoint
&
mousePos
);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
void
displayPopupMenu
(
const
Akonadi
::
Item
&
msg
,
const
MessageViewer
::
WebHitTestResult
&
result
,
const
QPoint
&
mousePos
);
#endif
/**
* The message viewer handles some types of urls itself, most notably http(s)
* and ftp(s). When it can't handle the url it will Q_EMIT this signal.
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
fcf95d7a
...
...
@@ -2077,7 +2077,7 @@ void ViewerPrivate::slotUrlPopup(const MessageViewer::WebHitTestResult &result)
}
else
{
mCopyURLAction
->
setText
(
i18n
(
"Copy Link Address"
));
}
Q_EMIT
displayPopupMenu
(
mMessageItem
,
result
,
aPos
);
Q_EMIT
popupMenu
(
mMessageItem
,
mClickedUrl
,
mImageUrl
,
aPos
);
}
...
...
messageviewer/src/viewer/viewer_p.h
View file @
fcf95d7a
...
...
@@ -579,6 +579,10 @@ Q_SIGNALS:
void
showStatusBarMessage
(
const
QString
&
message
);
void
replaceMsgByUnencryptedVersion
();
void
popupMenu
(
const
Akonadi
::
Item
&
msg
,
const
QUrl
&
url
,
const
QUrl
&
imageUrl
,
const
QPoint
&
mousePos
);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
void
displayPopupMenu
(
const
Akonadi
::
Item
&
msg
,
const
MessageViewer
::
WebHitTestResult
&
result
,
const
QPoint
&
mousePos
);
#endif
void
urlClicked
(
const
Akonadi
::
Item
&
msg
,
const
QUrl
&
url
);
void
requestConfigSync
();
void
showReader
(
KMime
::
Content
*
aMsgPart
,
bool
aHTML
,
const
QString
&
encoding
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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