diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ set(IMPORTWIZARD_LIB_VERSION "5.9.40") set(MAILIMPORTER_LIB_VERSION "5.9.40") set(KPIMPKPASS_LIB_VERSION "5.9.40") -set(KPIMITINERARY_LIB_VERSION "5.9.42") +set(KPIMITINERARY_LIB_VERSION "5.9.44") find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED) find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) diff --git a/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp b/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp --- a/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp +++ b/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -86,6 +87,8 @@ GRANTLEE_MAKE_GADGET(ViewAction) GRANTLEE_MAKE_GADGET(FoodEstablishment) GRANTLEE_MAKE_GADGET(FoodEstablishmentReservation) +GRANTLEE_MAKE_GADGET(RentalCarReservation) +GRANTLEE_MAKE_GADGET(RentalCar) SemanticRenderer::SemanticRenderer() { @@ -115,6 +118,8 @@ Grantlee::registerMetaType(); Grantlee::registerMetaType(); Grantlee::registerMetaType(); + Grantlee::registerMetaType(); + Grantlee::registerMetaType(); } bool SemanticRenderer::render(const MimeTreeParser::MessagePartPtr &msgPart, MessageViewer::HtmlWriter *htmlWriter, MessageViewer::RenderContext *context) const diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates.qrc b/plugins/messageviewer/bodypartformatter/semantic/templates.qrc --- a/plugins/messageviewer/bodypartformatter/semantic/templates.qrc +++ b/plugins/messageviewer/bodypartformatter/semantic/templates.qrc @@ -8,5 +8,6 @@ templates/event.html templates/actions.html templates/foodestablishmentreservation.html + templates/rentalcarreservation.html diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/rentalcarreservation.html b/plugins/messageviewer/bodypartformatter/semantic/templates/rentalcarreservation.html new file mode 100644 --- /dev/null +++ b/plugins/messageviewer/bodypartformatter/semantic/templates/rentalcarreservation.html @@ -0,0 +1,8 @@ +
{{ trip.name }} - {{ res.pickupTime|formatDateTime }} - {{ res.dropoffTime|formatDateTime }}
+
{% i18n "Reservation Number: %1" res.reservationNumber %}
+{% if res.underName.name %} +
{% i18n "Under Name: %1" res.underName.name %}
+{% endif %} +
{{ trip.address|formatAddress|safe }}
+{% include ":/org.kde.messageviewer/semantic/actions.html" %} +
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html b/plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html --- a/plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html +++ b/plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html @@ -17,6 +17,8 @@ {% include ":/org.kde.messageviewer/semantic/event.html" %} {% elif res.className == "FoodEstablishmentReservation" %} {% include ":/org.kde.messageviewer/semantic/foodestablishmentreservation.html" %} + {% elif res.className == "RentalCarReservation" %} + {% include ":/org.kde.messageviewer/semantic/rentalcarreservation.html" %} {% endif %} {% if not forloop.last %}