Commit dba07d5e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new api

parent 92f82817
......@@ -62,7 +62,7 @@ set(EVENTVIEW_LIB_VERSION "5.1.42")
set(KSIEVE_LIB_VERSION "5.1.42")
set(LIBKDEPIM_LIB_VERSION "5.1.42")
set(MAILIMPORTER_LIB_VERSION "5.1.42")
set(MESSAGELIB_LIB_VERSION "5.1.57")
set(MESSAGELIB_LIB_VERSION "5.1.61")
set(KDEPIM_APPS_LIB_VERSION "5.1.42")
set(LIBKLEO_LIB_VERSION "5.1.42")
set(KDEPIMLIBS_LIB_VERSION "5.1.42")
......@@ -102,7 +102,6 @@ add_subdirectory(plugins)
add_subdirectory(korganizer)
add_subdirectory(kmail)
add_subdirectory(kaddressbook)
add_subdirectory(grantleefilters)
install( FILES kdepim-addons.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -106,7 +106,7 @@ QString BriefHeaderStyle::format(KMime::Message *message) const
}
if (strategy->showHeader(QStringLiteral("date"))) {
headerParts << mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* shortDate = */ true));
headerParts << mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* shortDate = */ MessageViewer::HeaderStyleUtil::ShortDate));
}
// remove all empty (modulo whitespace) entries and joins them via ", \n"
......
......@@ -80,7 +80,7 @@ QString CustomHeaderStyle::format(KMime::Message *message) const
headerStr += QStringLiteral("<div dir=\"%1\"><b style=\"font-size:130%\">").arg(subjectDir) +
mHeaderStyleUtil.subjectString(message) + QLatin1String("</b></div>\n");
} else if (headerToDisplay.toLower() == QLatin1String("date")) {
headerStr.append(i18n("Date: ") + mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* short = */ false)) + QLatin1String("<br/>\n"));
headerStr.append(i18n("Date: ") + mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* short = */ MessageViewer::HeaderStyleUtil::CustomDate)) + QLatin1String("<br/>\n"));
} else if (headerToDisplay.toLower() == QLatin1String("from")) {
headerStr.append(i18n("From: ") +
StringUtil::emailAddrAsAnchor(message->from(), StringUtil::DisplayFullAddress, QString(), StringUtil::ShowLink));
......
......@@ -78,7 +78,7 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) const
headerStr +=
QLatin1String("<div style=\"margin-left: 10px; top: 0px;\"><span style=\"font-size: 0.8em; font-weight: bold;\">")
+ mHeaderStyleUtil.dateString(message, isPrinting(), /* shortDate */ false) + QLatin1String("</span></div>"
+ mHeaderStyleUtil.dateString(message, isPrinting(), /* shortDate */ MessageViewer::HeaderStyleUtil::CustomDate) + QLatin1String("</span></div>"
// #0057ae
"<table style=\"background: ") + activeColorDark.name() + QLatin1String("; border-collapse:collapse; top: 14px; min-width: 200px; \" cellpadding=0> \n"
" <tr> \n"
......
......@@ -182,7 +182,7 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
"<td dir=\"%2\">%3</td></tr>\n")
.arg(i18n("Date: "))
.arg(mHeaderStyleUtil.directionOf(mHeaderStyleUtil.dateStr(message->date()->dateTime())))
.arg(mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* short = */ false))));
.arg(mHeaderStyleUtil.strToHtml(mHeaderStyleUtil.dateString(message, isPrinting(), /* short = */ MessageViewer::HeaderStyleUtil::CustomDate))));
if (MessageViewer::MessageViewerSettings::self()->showUserAgent()) {
if (strategy->showHeader(QStringLiteral("user-agent"))) {
if (auto hdr = message->userAgent(false)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment