office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

PDF Signatures: Double check we have a capable poppler

Browse source 
In addition to being new enough it needs to have NSS support built in
This commit is contained in:
Albert Astals Cid 2020-11-30 14:47:55 +01:00 committed by Albert Astals Cid
parent f0aac79ad3
commit ac3a593eb4
2 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
generators/poppler/certificatetools.cpp
View file

@ -24,43 +24,51 @@
CertificateTools::CertificateTools(QWidget *parent)
: QWidget(parent)
{
m_certsw.setupUi(this);
m_certsw.loadSignaturesButton->hide();
if (Poppler::hasNSSSupport()) {
m_certsw.setupUi(this);
m_certsw.loadSignaturesButton->hide();
KUrlRequester *pDlg = new KUrlRequester();
pDlg->setObjectName(QStringLiteral("kcfg_DBCertificatePath"));
pDlg->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
pDlg->setEnabled(false);
m_certsw.formLayout->setWidget(1, QFormLayout::FieldRole, pDlg);
KUrlRequester *pDlg = new KUrlRequester();
pDlg->setObjectName(QStringLiteral("kcfg_DBCertificatePath"));
pDlg->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
pDlg->setEnabled(false);
m_certsw.formLayout->setWidget(1, QFormLayout::FieldRole, pDlg);
connect(m_certsw.customRadioButton, &QRadioButton::toggled, pDlg, &KUrlRequester::setEnabled);
connect(m_certsw.customRadioButton, &QRadioButton::toggled, pDlg, &KUrlRequester::setEnabled);
if (!CertificateSettings::useDefaultDB()) {
m_certsw.customRadioButton->setChecked(true);
m_certsw.defaultLabel->setVisible(false);
}
m_tree = new QTreeWidget(this);
m_tree->setHeaderLabels({i18nc("Name of the person to whom the cerficate was issued", "Issued to"), i18n("E-mail"), i18nc("Certificate expiration date", "Expiration date")});
m_tree->setRootIsDecorated(false);
m_certsw.certificatesPlaceholder->addWidget(m_tree);
connect(CertificateSettings::self(), &CertificateSettings::useDefaultDBChanged, this, &CertificateTools::warnRestartNeeded);
connect(CertificateSettings::self(), &CertificateSettings::dBCertificatePathChanged, this, [this] {
if (!CertificateSettings::useDefaultDB()) {
warnRestartNeeded();
m_certsw.customRadioButton->setChecked(true);
m_certsw.defaultLabel->setVisible(false);
}
});
connect(m_certsw.loadSignaturesButton, &QPushButton::clicked, this, [this] {
m_certificatesAsked = false;
update();
});
m_tree = new QTreeWidget(this);
m_tree->setHeaderLabels({i18nc("Name of the person to whom the cerficate was issued", "Issued to"), i18n("E-mail"), i18nc("Certificate expiration date", "Expiration date")});
m_tree->setRootIsDecorated(false);
m_certsw.certificatesPlaceholder->addWidget(m_tree);
connect(CertificateSettings::self(), &CertificateSettings::useDefaultDBChanged, this, &CertificateTools::warnRestartNeeded);
connect(CertificateSettings::self(), &CertificateSettings::dBCertificatePathChanged, this, [this] {
if (!CertificateSettings::useDefaultDB()) {
warnRestartNeeded();
}
});
connect(m_certsw.loadSignaturesButton, &QPushButton::clicked, this, [this] {
m_certificatesAsked = false;
update();
});
} else {
m_tree = nullptr;
QHBoxLayout *lay = new QHBoxLayout(this);
QLabel *l = new QLabel(i18n("You are using a Poppler library built without NSS support.\nAdding Digital Signatures isn't available for that reason"));
l->setWordWrap(true);
lay->addWidget(l);
}
}
bool CertificateTools::event(QEvent *e)
{
if (e->type() == QEvent::Paint && !m_certificatesAsked) {
if (m_tree && e->type() == QEvent::Paint && !m_certificatesAsked) {
m_certificatesAsked = true;
PopplerCertificateStore st;

4
generators/poppler/generator_pdf.cpp
View file

@ -1485,7 +1485,7 @@ void PDFGenerator::addPages(KConfigDialog *dlg)
#ifdef HAVE_POPPLER_SIGNING
CertificateTools *certTools = new CertificateTools(dlg);
dlg->addPage(certTools, CertificateSettings::self(), i18n("Certificates"), QStringLiteral("application-pkcs7-signature"), i18n("Digital Signature Certificates"));
dlg->addPage(certTools, CertificateSettings::self(), i18n("PDF Certificates"), QStringLiteral("application-pkcs7-signature"), i18n("PDF Digital Signature Certificates"));
#endif
}
@ -1876,7 +1876,7 @@ Okular::AnnotationProxy *PDFGenerator::annotationProxy() const
bool PDFGenerator::canSign() const
{
#ifdef HAVE_POPPLER_SIGNING
return true;
return Poppler::hasNSSSupport();
#else
return false;
#endif