diff --git a/client/dialogs/SettingsDialog.cpp b/client/dialogs/SettingsDialog.cpp index 4a5e78a3..8c882f99 100644 --- a/client/dialogs/SettingsDialog.cpp +++ b/client/dialogs/SettingsDialog.cpp @@ -151,7 +151,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent) ui->txtMIDUUID->setReadOnly(Settings::MID_UUID.isLocked()); ui->txtMIDUUID->setVisible(ui->rdMIDUUIDCustom->isChecked()); ui->txtMIDUUID->setText(Settings::MID_UUID); - connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [=](bool checked) { + connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [this](bool checked) { ui->txtMIDUUID->setVisible(checked); Settings::MID_UUID_CUSTOM = checked; Settings::SID_UUID_CUSTOM = checked; @@ -221,6 +221,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent) ui->txtCdoc2UUID->setReadOnly(disabled); ui->txtCdoc2Fetch->setReadOnly(disabled); ui->txtCdoc2Post->setReadOnly(disabled); + ui->wgtCDoc2Cert->setHidden(disabled); }; for(QJsonObject::const_iterator i = list.constBegin(); i != list.constEnd(); ++i) ui->cmbCdoc2Name->addItem(i.value().toObject().value(QLatin1String("NAME")).toString(), i.key()); @@ -234,14 +235,40 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent) }); setCDoc2Values(cdoc2Service); connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID); - connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, Settings::CDOC2_GET); - connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, Settings::CDOC2_POST); + connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) { + Settings::CDOC2_GET = url; + if(url.isEmpty()) + { + Settings::CDOC2_GET_CERT.clear(); + Settings::CDOC2_POST_CERT.clear(); + updateCDoc2Cert(QSslCertificate()); + } + }); + connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, [this](const QString &url) { + Settings::CDOC2_POST = url; + if(url.isEmpty()) + { + Settings::CDOC2_GET_CERT.clear(); + Settings::CDOC2_POST_CERT.clear(); + updateCDoc2Cert(QSslCertificate()); + } + }); #else ui->cmbCdoc2Name->addItem(QStringLiteral("Default")); ui->txtCdoc2UUID->setText(QStringLiteral("00000000-0000-0000-0000-000000000000")); ui->txtCdoc2Fetch->setText(QStringLiteral(CDOC2_GET_URL)); ui->txtCdoc2Post->setText(QStringLiteral(CDOC2_POST_URL)); #endif + connect(ui->btInstallCDoc2Cert, &QPushButton::clicked, this, [this] { + QSslCertificate cert = selectCert(tr("Select encryption server certificate"), + tr("Encryption Service SSL certificate")); + if(cert.isNull()) + return; + Settings::CDOC2_GET_CERT = cert.toDer().toBase64(); + Settings::CDOC2_POST_CERT = cert.toDer().toBase64(); + updateCDoc2Cert(cert); + }); + updateCDoc2Cert(QSslCertificate(QByteArray::fromBase64(Settings::CDOC2_GET_CERT), QSsl::Der)); // pageProxy connect(this, &SettingsDialog::finished, this, &SettingsDialog::saveProxy); @@ -313,7 +340,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent) dlg->open(); }); #ifdef CONFIG_URL - connect(qApp->conf(), &Configuration::finished, this, [=](bool /*update*/, const QString &error){ + connect(qApp->conf(), &Configuration::finished, this, [this](bool /*update*/, const QString &error){ if(!error.isEmpty()) { WarningDialog::show(this, tr("Checking updates has failed.") + "
" + tr("Please try again."), error); return; @@ -334,10 +361,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent) Application::updateTSLCache({}); }); connect(ui->btnNavUseByDefault, &QPushButton::clicked, this, &SettingsDialog::useDefaultSettings); - connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [=]{ + connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [this]{ saveFile(QStringLiteral("diagnostics.txt"), ui->txtDiagnostics->toPlainText().toUtf8()); }); - connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [=]{ + connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [this]{ Settings::LIBDIGIDOCPP_DEBUG = false; QString log = QStringLiteral("%1/libdigidocpp.log").arg(QDir::tempPath()); saveFile(QStringLiteral("libdigidocpp.txt"), log); @@ -439,6 +466,11 @@ void SettingsDialog::updateCert(const QSslCertificate &c, QPushButton *btn, Cert }); } +void SettingsDialog::updateCDoc2Cert(const QSslCertificate &c) +{ + updateCert(c, ui->btShowCDoc2Cert, ui->txtCDoc2Cert); +} + void SettingsDialog::updateSiVaCert(const QSslCertificate &c) { updateCert(c, ui->btShowSiVaCert, ui->txtSiVaCert); @@ -519,7 +551,7 @@ void SettingsDialog::updateDiagnostics() QApplication::setOverrideCursor( Qt::WaitCursor ); auto *worker = new Diagnostics(); connect(worker, &Diagnostics::update, ui->txtDiagnostics, &QTextBrowser::insertHtml, Qt::QueuedConnection); - connect(worker, &Diagnostics::destroyed, this, [=]{ + connect(worker, &Diagnostics::destroyed, this, [this]{ ui->txtDiagnostics->setEnabled(true); ui->txtDiagnostics->moveCursor(QTextCursor::Start); ui->txtDiagnostics->ensureCursorVisible(); diff --git a/client/dialogs/SettingsDialog.h b/client/dialogs/SettingsDialog.h index 72beee7b..03be4eb6 100644 --- a/client/dialogs/SettingsDialog.h +++ b/client/dialogs/SettingsDialog.h @@ -71,6 +71,7 @@ class SettingsDialog final: public QDialog QSslCertificate selectCert(const QString &label, const QString &format); void selectLanguage(); void updateCert(const QSslCertificate &c, QPushButton *btn, CertLabel *lbl); + void updateCDoc2Cert(const QSslCertificate &c); void updateSiVaCert(const QSslCertificate &c); void updateTSACert(const QSslCertificate &c); void updateVersion(); diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui index d11659c1..eb8f9a9f 100644 --- a/client/dialogs/SettingsDialog.ui +++ b/client/dialogs/SettingsDialog.ui @@ -3,7 +3,7 @@ SettingsDialog - Qt::WindowModality::WindowModal + Qt::WindowModal @@ -31,7 +31,7 @@ color: #000000; font-family: Roboto, Helvetica; font-size: 14px; } -#lblMenuSettings, #lblGeneralLang, #lblDefaultDirectory, #lblTimeStamp, #lblTSACert, #lblMID, #lblSiVa, #lblSiVaCert, #pageEncryptionLabel, #pageProxyLabel { +#lblMenuSettings, #lblGeneralLang, #lblDefaultDirectory, #lblTimeStamp, #lblTSACert, #lblMID, #lblSiVa, #lblSiVaCert, #pageEncryptionLabel, #lblCDoc2Cert, #pageProxyLabel { color: #003168; font-weight: 700; font-size: 18px; @@ -117,8 +117,14 @@ background-color: #E9ECF3; 61 + + + 16777215 + 61 + + - Qt::FocusPolicy::TabFocus + Qt::TabFocus Settings @@ -204,7 +210,7 @@ background-color: #E9ECF3; - Qt::Orientation::Vertical + Qt::Vertical @@ -217,6 +223,179 @@ background-color: #E9ECF3; + + + + + 0 + 48 + + + + + 16777215 + 48 + + + + #navigationArea { +border-top: 1px solid #E7EAEF; +background-color: #F3F5F7; +} +#txtNavVersion { +color: #07142A; +} +QPushButton { +padding: 9px 12px; +border-radius: 4px; +color: #2F70B6; +font-weight: 700; +} +QPushButton:hover { +background-color: #EAF1F8; +} +QPushButton:pressed { +background-color: #BFD3E8; +} +QPushButton:default { +color: #ffffff; +background-color: #2F70B6; +} +QPushButton:default:hover { +background-color: #2B66A6; +} +QPushButton:default:pressed { +background-color: #215081; +} +QPushButton:default:disabled { +background-color: #2F70B6; +} + + + + 40 + + + 24 + + + 0 + + + 40 + + + 0 + + + + + Qt::TabFocus + + + DigiDoc4 4.0.1.0, released 01.02.2024 + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + PointingHandCursor + + + First run + + + + + + + PointingHandCursor + + + Refresh configuration + + + + + + + PointingHandCursor + + + Check connection + + + + + + + PointingHandCursor + + + Save diagnostics report + + + + + + + PointingHandCursor + + + Save log + + + + + + + PointingHandCursor + + + Remove old certificates + + + + + + + PointingHandCursor + + + Use default settings + + + + + + + PointingHandCursor + + + Close + + + true + + + + + + @@ -231,6 +410,7 @@ padding: 10px 14px; border: 1px solid #C4CBD8; border-radius: 4px; color: #07142A; +background-color: white; placeholder-text-color: #607496; font-size: 16px; } @@ -343,7 +523,7 @@ max-height: 22px; } - 0 + 3 @@ -365,7 +545,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Language @@ -435,7 +615,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Container default location @@ -488,7 +668,7 @@ max-height: 22px; - Qt::Orientation::Vertical + Qt::Vertical @@ -502,7 +682,7 @@ max-height: 22px; - QFrame::Shape::NoFrame + QFrame::NoFrame true @@ -537,7 +717,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Access to Time-Stamping service @@ -570,7 +750,7 @@ max-height: 22px; - Qt::Orientation::Horizontal + Qt::Horizontal @@ -640,7 +820,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Time-Stamping service SSL certificate @@ -650,7 +830,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus @@ -682,7 +862,7 @@ max-height: 22px; - Qt::Orientation::Horizontal + Qt::Horizontal @@ -702,7 +882,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Access to mobile-ID and Smart-ID service @@ -732,7 +912,7 @@ max-height: 22px; - Qt::Orientation::Horizontal + Qt::Horizontal @@ -777,7 +957,7 @@ max-height: 22px; - QLineEdit::EchoMode::Password + QLineEdit::Password 00000000-0000-0000-0000-000000000000 @@ -790,7 +970,7 @@ max-height: 22px; - Qt::Orientation::Vertical + Qt::Vertical @@ -825,7 +1005,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Access to Digital Signature Validation Service SiVa @@ -858,7 +1038,7 @@ max-height: 22px; - Qt::Orientation::Horizontal + Qt::Horizontal @@ -928,7 +1108,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus Digital Signature Validation Service SiVa SSL certificate @@ -938,7 +1118,7 @@ max-height: 22px; - Qt::FocusPolicy::TabFocus + Qt::TabFocus @@ -970,7 +1150,7 @@ max-height: 22px; - Qt::Orientation::Horizontal + Qt::Horizontal @@ -988,7 +1168,7 @@ max-height: 22px; - Qt::Orientation::Vertical + Qt::Vertical @@ -1000,211 +1180,305 @@ max-height: 22px; - - - - 24 - - - 32 - - - 19 - - - 32 - - - 32 + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 791 + 610 + - - - - Qt::FocusPolicy::TabFocus - - - Encryption settings - - - - - - - 15 - - - - - Use default CDOC1 solution - - - true - - - cdoc2Group - - - - - - - Use default CDOC2 solution - - - cdoc2Group - - - - - - - - - - 24 - - - 24 + + + 24 + + + 32 + + + 19 + + + 32 + + + 32 + + + + + Qt::TabFocus - - 0 + + Encryption settings - - 0 - - - 0 + + + + + + 15 - + - Use key server + Use default CDOC1 solution + + true + + + cdoc2Group + - - - - QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow - - - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - - 24 - - - 24 - - - 0 - - - 0 - - - 0 - - - - - - 140 - 0 - - - - Name - - - cmbCdoc2Name - - - - - - - - - - UUID - - - txtCdoc2UUID - - - - - - - true - - - true - - - - - - - Fetch URL - - - txtCdoc2Fetch - - - - - - - true - - - true - - - - - - - Post URL - - - txtCdoc2Post - - - - - - - true - - - true - - - - + + + Use default CDOC2 solution + + + cdoc2Group + - - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - + + + + + + 24 + + + 24 + + + 0 + + + 0 + + + 0 + + + + + Use key server + + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 24 + + + 24 + + + 0 + + + 0 + + + 0 + + + + + + 140 + 0 + + + + Name + + + cmbCdoc2Name + + + + + + + + + + UUID + + + txtCdoc2UUID + + + + + + + true + + + true + + + + + + + Fetch URL + + + txtCdoc2Fetch + + + + + + + true + + + true + + + + + + + Post URL + + + txtCdoc2Post + + + + + + + true + + + true + + + + + + + + 24 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::TabFocus + + + Encryption Service SSL certificate + + + + + + + Qt::TabFocus + + + + + + + 16 + + + + + PointingHandCursor + + + Add certificate + + + + + + + PointingHandCursor + + + Show certificate + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + @@ -1369,7 +1643,7 @@ max-height: 22px; - QLineEdit::EchoMode::Password + QLineEdit::Password @@ -1381,7 +1655,7 @@ max-height: 22px; - Qt::Orientation::Vertical + Qt::Vertical @@ -1441,7 +1715,7 @@ QScrollBar::sub-line:vertical { } - QFrame::Shape::NoFrame + QFrame::NoFrame true @@ -1474,7 +1748,7 @@ QScrollBar::sub-line:vertical { 0 - + @@ -1489,7 +1763,7 @@ QScrollBar::sub-line:vertical { - Qt::FocusPolicy::TabFocus + Qt::TabFocus The project is supported by the European Regional Development Fund @@ -1499,7 +1773,7 @@ QScrollBar::sub-line:vertical { - Qt::FocusPolicy::TabFocus + Qt::TabFocus <p>Estonian ID-software is released by Information Systems's Authority<br /> @@ -1507,7 +1781,7 @@ In case of questions please contact our support via <a href="https://www Additional licenses and components - Qt::AlignmentFlag::AlignCenter + Qt::AlignCenter true @@ -1544,31 +1818,34 @@ QScrollBar::sub-line:vertical { } - QFrame::Shape::NoFrame + QFrame::NoFrame true <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; } -</style></head><body> -<p align="center"><b>Qt cross-platform application and UI framework</b><br />GNU Lesser General Public License (LGPL) version 3<br /><a href="http://doc.qt.io/qt-6/licensing.html" style=" text-decoration: underline; color:#006eb5;">http://doc.qt.io/qt-6/licensing.html</a></p> -<p align="center"><b>The OpenSSL project</b><br />This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)<br /><a href="https://www.openssl.org/source/apache-license-2.0.txt" style=" text-decoration: underline; color:#006eb5;">https://www.openssl.org/source/apache-license-2.0.txt</a> </p> -<p align="center"><b>OpenLDAP community developed LDAP software</b><br />The OpenLDAP Public License<br /><a href="http://www.openldap.org/software/release/license.html" style=" text-decoration: underline; color:#006eb5;">http://www.openldap.org/software/release/license.html</a> </p> -<p align="center"><b>libdigidocpp</b><br />GNU Lesser General Public License (LGPL) version 2.1<br /><a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" style=" text-decoration: underline; color:#006eb5;">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</a> </p> -<p align="center"><b>DigiDoc4 Client</b><br />GNU Lesser General Public License (LGPL) version 2.1<br /><a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" style=" text-decoration: underline; color:#006eb5;">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</a> </p> -<p align="center"><b>zlib A Massively Spiffy Yet Delicately Unobtrusive Compression Library</b><br /><a href="http://zlib.net/zlib_license.html" style=" text-decoration: underline; color:#006eb5;">http://zlib.net/zlib_license.html</a> </p> -<p align="center"><b>Xerces-C++ is a validating XML parser written in a portable subset of C++</b><br />Apache Software License, Version 2.0<br /><a href="http://www.apache.org/licenses/LICENSE-2.0.html" style=" text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</a> </p> -<p align="center"><b>Apache Xalan-C/C++ XSLT Library</b><br />Apache Software License, Version 2.0<br /><a href="http://www.apache.org/licenses/LICENSE-2.0.html" style=" text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</a> </p> -<p align="center"><b>Apache XML Security for C++</b><br />Apache Software License, Version 2.0<br /><a href="http://www.apache.org/licenses/LICENSE-2.0.html" style=" text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</a> </p> -<p align="center"><b>XSD: XML Data Binding for C++</b><br />GNU General Public License (GPL), version 2<br />Free/Libre and Open Source Software (FLOSS) exception<br /><a href="http://www.codesynthesis.com/products/xsd/license.xhtml" style=" text-decoration: underline; color:#006eb5;">http://www.codesynthesis.com/products/xsd/license.xhtml</a><br /><a href="http://www.codesynthesis.com/projects/xsd/FLOSSE" style=" text-decoration: underline; color:#006eb5;">http://www.codesynthesis.com/projects/xsd/FLOSSE</a></p> -<p align="center"><b>JSON for Modern C++</b><br />MIT License<br /><a href="https://github.com/nlohmann/json/blob/develop/LICENSE.MIT" style=" text-decoration: underline; color:#006eb5;">https://github.com/nlohmann/json/blob/develop/LICENSE.MIT</a> </p> -<p align="center"><b>Roboto: Google’s signature family of fonts</b><br />Apache Software License, Version 2.0<br /><a href="https://github.com/google/roboto/blob/master/LICENSE" style=" text-decoration: underline; color:#006eb5;">https://github.com/google/roboto/blob/master/LICENSE</a> </p></body></html> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> +p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } +</style></head><body style=" font-family:'Roboto','Helvetica'; font-size:14px; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">Qt cross-platform application and UI framework</span><span style=" font-size:14px;"><br />GNU Lesser General Public License (LGPL) version 3<br /></span><a href="http://doc.qt.io/qt-6/licensing.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://doc.qt.io/qt-6/licensing.html</span></a></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">The OpenSSL project</span><span style=" font-size:14px;"><br />This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)<br /></span><a href="https://www.openssl.org/source/apache-license-2.0.txt"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">https://www.openssl.org/source/apache-license-2.0.txt</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">OpenLDAP community developed LDAP software</span><span style=" font-size:14px;"><br />The OpenLDAP Public License<br /></span><a href="http://www.openldap.org/software/release/license.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.openldap.org/software/release/license.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">libdigidocpp</span><span style=" font-size:14px;"><br />GNU Lesser General Public License (LGPL) version 2.1<br /></span><a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">DigiDoc4 Client</span><span style=" font-size:14px;"><br />GNU Lesser General Public License (LGPL) version 2.1<br /></span><a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">zlib A Massively Spiffy Yet Delicately Unobtrusive Compression Library</span><span style=" font-size:14px;"><br /></span><a href="http://zlib.net/zlib_license.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://zlib.net/zlib_license.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">Xerces-C++ is a validating XML parser written in a portable subset of C++</span><span style=" font-size:14px;"><br />Apache Software License, Version 2.0<br /></span><a href="http://www.apache.org/licenses/LICENSE-2.0.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">Apache Xalan-C/C++ XSLT Library</span><span style=" font-size:14px;"><br />Apache Software License, Version 2.0<br /></span><a href="http://www.apache.org/licenses/LICENSE-2.0.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">Apache XML Security for C++</span><span style=" font-size:14px;"><br />Apache Software License, Version 2.0<br /></span><a href="http://www.apache.org/licenses/LICENSE-2.0.html"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.apache.org/licenses/LICENSE-2.0.html</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">XSD: XML Data Binding for C++</span><span style=" font-size:14px;"><br />GNU General Public License (GPL), version 2<br />Free/Libre and Open Source Software (FLOSS) exception<br /></span><a href="http://www.codesynthesis.com/products/xsd/license.xhtml"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.codesynthesis.com/products/xsd/license.xhtml</span></a><span style=" font-size:14px;"><br /></span><a href="http://www.codesynthesis.com/projects/xsd/FLOSSE"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">http://www.codesynthesis.com/projects/xsd/FLOSSE</span></a></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">JSON for Modern C++</span><span style=" font-size:14px;"><br />MIT License<br /></span><a href="https://github.com/nlohmann/json/blob/develop/LICENSE.MIT"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">https://github.com/nlohmann/json/blob/develop/LICENSE.MIT</span></a><span style=" font-size:14px;"> </span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14px; font-weight:700;">Roboto: Google’s signature family of fonts</span><span style=" font-size:14px;"><br />Apache Software License, Version 2.0<br /></span><a href="https://github.com/google/roboto/blob/master/LICENSE"><span style=" font-size:14px; text-decoration: underline; color:#006eb5;">https://github.com/google/roboto/blob/master/LICENSE</span></a><span style=" font-size:14px;"> </span></p></body></html> - Qt::TextInteractionFlag::TextBrowserInteraction + Qt::TextBrowserInteraction true @@ -1579,179 +1856,6 @@ p, li { white-space: pre-wrap; margin-top:12px; margin-bottom:12px; margin-left: - - - - - 0 - 48 - - - - - 16777215 - 48 - - - - #navigationArea { -border-top: 1px solid #E7EAEF; -background-color: #F3F5F7; -} -#txtNavVersion { -color: #07142A; -} -QPushButton { -padding: 9px 12px; -border-radius: 4px; -color: #2F70B6; -font-weight: 700; -} -QPushButton:hover { -background-color: #EAF1F8; -} -QPushButton:pressed { -background-color: #BFD3E8; -} -QPushButton:default { -color: #ffffff; -background-color: #2F70B6; -} -QPushButton:default:hover { -background-color: #2B66A6; -} -QPushButton:default:pressed { -background-color: #215081; -} -QPushButton:default:disabled { -background-color: #2F70B6; -} - - - - 40 - - - 24 - - - 0 - - - 40 - - - 0 - - - - - Qt::FocusPolicy::TabFocus - - - DigiDoc4 4.0.1.0, released 01.02.2024 - - - - - - - Qt::Orientation::Horizontal - - - - 10 - 20 - - - - - - - - PointingHandCursor - - - First run - - - - - - - PointingHandCursor - - - Refresh configuration - - - - - - - PointingHandCursor - - - Check connection - - - - - - - PointingHandCursor - - - Save diagnostics report - - - - - - - PointingHandCursor - - - Save log - - - - - - - PointingHandCursor - - - Remove old certificates - - - - - - - PointingHandCursor - - - Use default settings - - - - - - - PointingHandCursor - - - Close - - - true - - - - - - @@ -1777,16 +1881,18 @@ background-color: #2F70B6;
dialogs/SettingsDialog.h
 - + + + - + + - - - + + diff --git a/client/translations/en.ts b/client/translations/en.ts index a6213bcb..14a2a3ce 100644 --- a/client/translations/en.ts +++ b/client/translations/en.ts @@ -2563,6 +2563,14 @@ Additional licenses and components Custom + + Encryption Service SSL certificate + + + + Select encryption server certificate + + SignatureDialog diff --git a/client/translations/et.ts b/client/translations/et.ts index 3621e5e2..40b80257 100644 --- a/client/translations/et.ts +++ b/client/translations/et.ts @@ -2563,6 +2563,14 @@ Täiendavad litsentsid ja komponendid Custom + + Encryption Service SSL certificate + + + + Select encryption server certificate + + SignatureDialog diff --git a/client/translations/ru.ts b/client/translations/ru.ts index cbf18303..a98722e4 100644 --- a/client/translations/ru.ts +++ b/client/translations/ru.ts @@ -2564,6 +2564,14 @@ Additional licenses and components Custom + + Encryption Service SSL certificate + + + + Select encryption server certificate + + SignatureDialog