Show signature type in signature pane

Author: svuorela

core/form.h

@@ -567,7 +567,8 @@ class OKULARCORE_EXPORT FormFieldSignature : public FormField
         AdbePkcs7detached,
         EtsiCAdESdetached,
         UnknownType,
-        UnsignedSignature ///< The signature field has not been signed yet. @since 22.04
+        UnsignedSignature,        ///< The signature field has not been signed yet. @since 22.04
+        G10cPgpSignatureDetached, ///< Poppler/okular extension of pgp signature \since 25.04
     };
 
     ~FormFieldSignature() override;

generators/poppler/formfields.cpp

@@ -488,9 +488,14 @@ PopplerFormFieldSignature::SignatureType PopplerFormFieldSignature::signatureTyp
         return Okular::FormFieldSignature::EtsiCAdESdetached;
     case Poppler::FormFieldSignature::UnsignedSignature:
         return Okular::FormFieldSignature::UnsignedSignature;
-    default:
+    case Poppler::FormFieldSignature::UnknownSignatureType:
         return Okular::FormFieldSignature::UnknownType;
+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(25, 02, 90)
+    case Poppler::FormFieldSignature::G10cPgpSignatureDetached:
+        return Okular::FormFieldSignature::G10cPgpSignatureDetached;
+#endif
     }
+    return Okular::FormFieldSignature::UnknownType;
 }
 
 Okular::SignatureInfo PopplerFormFieldSignature::signatureInfo() const

gui/signaturemodel.cpp

@@ -23,7 +23,7 @@
 #include "core/signatureutils.h"
 
 struct SignatureItem {
-    enum DataType { Root, RevisionInfo, ValidityStatus, CertificateStatus, SigningTime, Reason, Location, FieldInfo };
+    enum DataType { Root, RevisionInfo, ValidityStatus, CertificateStatus, SigningTime, Reason, Location, FieldInfo, SignatureType };
 
     SignatureItem();
     SignatureItem(SignatureItem *parent, const Okular::FormFieldSignature *form, DataType type, int page);
@@ -179,6 +179,26 @@ void SignatureModelPrivate::notifySetup(const QVector<Okular::Page *> &pages, in
 
             auto childItem4 = new SignatureItem(parentItem, sf, SignatureItem::FieldInfo, pageNumber);
             childItem4->displayString = i18n("Field: %1 on page %2", sf->name(), pageNumber + 1);
+            auto signatureType = [sf] {
+                switch (sf->signatureType()) {
+                case Okular::FormFieldSignature::G10cPgpSignatureDetached:
+                    return i18nc("Signature type", "PGP Signature");
+                case Okular::FormFieldSignature::AdbePkcs7detached:
+                    return i18nc("Signature type", "Adobe PKCS7");
+                case Okular::FormFieldSignature::AdbePkcs7sha1:
+                    return i18nc("Signature type", "Adobe PKCS7 Sha1");
+                case Okular::FormFieldSignature::EtsiCAdESdetached:
+                    return i18nc("Signature type", "ETSI CAdES");
+                case Okular::FormFieldSignature::UnknownType:
+                    return i18nc("Signature type", "Unknown");
+                case Okular::FormFieldSignature::UnsignedSignature:
+                    return i18nc("Signature type", "Unsigned signature");
+                }
+                return QString {};
+            }();
+
+            auto childItem5 = new SignatureItem(parentItem, nullptr, SignatureItem::SignatureType, pageNumber);
+            childItem5->displayString = i18n("Signature Type: %1", signatureType);
 
             ++revNumber;
         }