Merge remote-tracking branch 'origin/release/21.04'

part/dlggeneral.cpp

@@ -79,7 +79,7 @@ DlgGeneral::DlgGeneral(QWidget *parent, Okular::EmbedMode embedMode)
     KColorButton *customColor = new KColorButton(this);
     customColor->setObjectName(QStringLiteral("kcfg_BackgroundColor"));
 
-    QHBoxLayout *customColorLayout = new QHBoxLayout(this);
+    QHBoxLayout *customColorLayout = new QHBoxLayout();
     customColorLayout->addWidget(useCustomColor);
     useCustomColor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     customColorLayout->addWidget(customColor);

part/dlgpresentation.cpp

@@ -41,7 +41,7 @@ DlgPresentation::DlgPresentation(QWidget *parent)
     advanceTime->setSuffix(ki18ncp("Advance every %1 seconds", " second", " seconds"));
     advanceTime->setObjectName(QStringLiteral("kcfg_SlidesAdvanceTime"));
 
-    QHBoxLayout *advanceAutomaticallyLayout = new QHBoxLayout(this);
+    QHBoxLayout *advanceAutomaticallyLayout = new QHBoxLayout();
     advanceAutomaticallyLayout->addWidget(advanceAutomatically);
     advanceAutomatically->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     advanceAutomaticallyLayout->addWidget(advanceTime);

part/pagepainter.cpp

@@ -83,6 +83,9 @@ void PagePainter::paintCroppedPageOnPainter(QPainter *destPainter,
     if (Okular::SettingsCore::changeColors()) {
         switch (Okular::SettingsCore::renderMode()) {
         case Okular::SettingsCore::EnumRenderMode::Inverted:
+        case Okular::SettingsCore::EnumRenderMode::InvertLightness:
+        case Okular::SettingsCore::EnumRenderMode::InvertLuma:
+        case Okular::SettingsCore::EnumRenderMode::InvertLumaSymmetric:
             backgroundColor = Qt::black;
             break;
         case Okular::SettingsCore::EnumRenderMode::Paper:

part/pageviewmouseannotation.cpp

@@ -112,7 +112,8 @@ void MouseAnnotation::routeMousePressEvent(PageViewItem *pageViewItem, const QPo
     AnnotationDescription ad(pageViewItem, eventPos);
     /* qDebug() << "routeMousePressEvent: eventPos = " << eventPos; */
     if (ad.isValid()) {
-        if (ad.annotation->subType() == Okular::Annotation::AMovie || ad.annotation->subType() == Okular::Annotation::AScreen || ad.annotation->subType() == Okular::Annotation::AFileAttachment) {
+        if (ad.annotation->subType() == Okular::Annotation::AMovie || ad.annotation->subType() == Okular::Annotation::AScreen || ad.annotation->subType() == Okular::Annotation::AFileAttachment ||
+            ad.annotation->subType() == Okular::Annotation::ARichMedia) {
             /* qDebug() << "routeMousePressEvent: trigger action for AMovie/AScreen/AFileAttachment"; */
             processAction(ad);
         } else {