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
dee2ef57
Commit
dee2ef57
authored
Jun 12, 2020
by
Laurent Montel
😁
Browse files
Use new PimCommon::BroadcastStatus
parent
dd291256
Pipeline
#23292
passed with stage
in 48 minutes and 45 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
dee2ef57
cmake_minimum_required
(
VERSION 3.5
)
set
(
PIM_VERSION
"5.14.4
5
"
)
set
(
PIM_VERSION
"5.14.4
6
"
)
if
(
POLICY CMP0053
)
cmake_policy
(
SET CMP0053 NEW
)
...
...
@@ -32,7 +32,7 @@ set(KMIME_LIB_VERSION "5.14.40")
set
(
KPIMTEXTEDIT_LIB_VERSION
"5.14.45"
)
set
(
LIBKDEPIM_LIB_VERSION
"5.14.45"
)
set
(
LIBKLEO_LIB_VERSION
"5.14.40"
)
set
(
PIMCOMMON_LIB_VERSION
"5.14.4
0
"
)
set
(
PIMCOMMON_LIB_VERSION
"5.14.4
3
"
)
set
(
GPGME_LIB_VERSION
"1.11.1"
)
set
(
AKONADI_CONTACT_VERSION
"5.14.40"
)
...
...
messageviewer/src/scamdetection/scamexpandurljob.cpp
View file @
dee2ef57
...
...
@@ -21,7 +21,7 @@
#include
"scamexpandurljob.h"
#include
"messageviewer_debug.h"
#include
<
Libkdepim
/BroadcastStatus>
#include
<
PimCommon
/BroadcastStatus>
#include
<PimCommon/NetworkManager>
#include
<KLocalizedString>
...
...
@@ -67,7 +67,7 @@ ScamExpandUrlJob::~ScamExpandUrlJob()
void
ScamExpandUrlJob
::
expandedUrl
(
const
QUrl
&
url
)
{
if
(
!
PimCommon
::
NetworkManager
::
self
()
->
networkConfigureManager
()
->
isOnline
())
{
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"No network connection detected, we cannot expand url."
));
deleteLater
();
return
;
...
...
@@ -108,16 +108,16 @@ void ScamExpandUrlJob::slotExpandFinished(QNetworkReply *reply)
longUrl
.
setUrl
(
longUrlVar
.
toString
());
}
else
{
qCWarning
(
MESSAGEVIEWER_LOG
)
<<
"JSon is not corect"
<<
ba
;
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Impossible to expand
\'
%1
\'
."
,
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Impossible to expand
\'
%1
\'
."
,
shortUrl
.
url
()));
deleteLater
();
return
;
}
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Short url
\'
%1
\'
redirects to
\'
%2
\'
."
,
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Short url
\'
%1
\'
redirects to
\'
%2
\'
."
,
shortUrl
.
url
(),
longUrl
.
toDisplayString
()));
}
else
{
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Impossible to expand
\'
%1
\'
."
,
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Impossible to expand
\'
%1
\'
."
,
shortUrl
.
url
()));
}
deleteLater
();
...
...
messageviewer/src/viewer/urlhandlermanager.cpp
View file @
dee2ef57
...
...
@@ -46,7 +46,7 @@
#include
<MimeTreeParser/PartNodeBodyPart>
#include
<MessageCore/StringUtil>
#include
<
Libkdepim
/BroadcastStatus>
#include
<
PimCommon
/BroadcastStatus>
#include
<LibkdepimAkonadi/OpenEmailAddressJob>
#include
<Akonadi/Contact/ContactSearchJob>
...
...
@@ -642,7 +642,7 @@ bool ContactUidURLHandler::handleContextMenuRequest(const QUrl &url, const QPoin
QClipboard
*
clip
=
QApplication
::
clipboard
();
clip
->
setText
(
fullEmail
,
QClipboard
::
Clipboard
);
clip
->
setText
(
fullEmail
,
QClipboard
::
Selection
);
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Address copied to clipboard."
));
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Address copied to clipboard."
));
}
#endif
}
...
...
@@ -918,8 +918,8 @@ bool KRunURLHandler::handleClick(const QUrl &url, ViewerPrivate *w) const
||
(
scheme
==
QLatin1String
(
"help"
))
||
(
scheme
==
QLatin1String
(
"vnc"
))
||
(
scheme
==
QLatin1String
(
"smb"
))
||
(
scheme
==
QLatin1String
(
"fish"
))
||
(
scheme
==
QLatin1String
(
"news"
))
||
(
scheme
==
QLatin1String
(
"tel"
)))
{
KPIM
::
BroadcastStatus
::
instance
()
->
setTransientStatusMsg
(
i18n
(
"Opening URL..."
));
QTimer
::
singleShot
(
2000
,
KPIM
::
BroadcastStatus
::
instance
(),
&
KPIM
::
BroadcastStatus
::
reset
);
PimCommon
::
BroadcastStatus
::
instance
()
->
setTransientStatusMsg
(
i18n
(
"Opening URL..."
));
QTimer
::
singleShot
(
2000
,
PimCommon
::
BroadcastStatus
::
instance
(),
&
PimCommon
::
BroadcastStatus
::
reset
);
QMimeDatabase
mimeDb
;
auto
mime
=
mimeDb
.
mimeTypeForUrl
(
url
);
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
dee2ef57
...
...
@@ -91,7 +91,7 @@
#include
<QPointer>
#include
<WebEngineViewer/WebEngineExportHtmlPageJob>
//libkdepim
#include
<
Libkdepim
/BroadcastStatus>
#include
<
PimCommon
/BroadcastStatus>
#include
<MessageCore/AttachmentPropertiesDialog>
#include
<AkonadiCore/collection.h>
...
...
@@ -2094,7 +2094,7 @@ void ViewerPrivate::slotUrlOn(const QString &link)
mViewer
->
setLinkHovered
(
url
);
if
(
link
.
trimmed
().
isEmpty
())
{
KPIM
::
BroadcastStatus
::
instance
()
->
reset
();
PimCommon
::
BroadcastStatus
::
instance
()
->
reset
();
Q_EMIT
showStatusBarMessage
(
QString
());
return
;
}
...
...
@@ -2792,13 +2792,13 @@ void ViewerPrivate::slotUrlCopy()
const
QString
address
=
KEmailAddress
::
decodeMailtoUrl
(
mClickedUrl
);
clip
->
setText
(
address
,
QClipboard
::
Clipboard
);
clip
->
setText
(
address
,
QClipboard
::
Selection
);
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Address copied to clipboard."
));
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"Address copied to clipboard."
));
}
else
{
// put the url into the mouse selection and the clipboard
const
QString
clickedUrl
=
mClickedUrl
.
url
();
clip
->
setText
(
clickedUrl
,
QClipboard
::
Clipboard
);
clip
->
setText
(
clickedUrl
,
QClipboard
::
Selection
);
KPIM
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"URL copied to clipboard."
));
PimCommon
::
BroadcastStatus
::
instance
()
->
setStatusMsg
(
i18n
(
"URL copied to clipboard."
));
}
#endif
}
...
...
Write
Preview
Supports
Markdown
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