Fix CDoc2 custom server selection

IB-8563, IB-8662

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

client/Diagnostics.cpp

@@ -51,8 +51,8 @@ void Diagnostics::generalInfo(QTextStream &s)
 		<< "<br /><br /><b>" << tr("TSL signing certs") << ":</b>";
 	for(const QSslCertificate &cert: Application::confValue(Application::TSLCerts).value<QList<QSslCertificate>>())
 		s << "<br />" << cert.subjectInfo("CN").value(0);
-	s << "<br /><br /><b>" << tr("TSL cache") << ":</b>";
 	QString cache = Application::confValue(Application::TSLCache).toString();
+	s << "<br /><br /><b>" << tr("TSL cache") << "</b> (" << cache << "):";
 	const QStringList tsllist = QDir(cache).entryList({QStringLiteral("*.xml")});
 	for(const QString &file: tsllist)
 	{
@@ -80,7 +80,7 @@ void Diagnostics::generalInfo(QTextStream &s)
 	s << "<br /><b>" << tr("Smart Card readers") << ":</b><br />";
 	for( const QString &readername: QPCSC::instance().readers() )
 	{
-		s << readername;
+		s << "<br />" << readername;
 		QPCSCReader reader( readername, &QPCSC::instance() );
 		if( !reader.isPresent() )
 		{

client/MainWindow.cpp

@@ -715,11 +715,6 @@ void MainWindow::showSettings(int page)
 		return;
 	}
 	SettingsDialog dlg(page, this);
-
-	connect(&dlg, &SettingsDialog::langChanged, this, [this](const QString& lang ) {
-		qApp->loadTranslation( lang );
-		ui->retranslateUi(this);
-	});
 	connect(&dlg, &SettingsDialog::togglePrinting, ui->signContainerPage, &ContainerPage::togglePrinting);
 	dlg.exec();
 }

client/dialogs/SettingsDialog.cpp

@@ -249,7 +249,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		setCDoc2Values(key);
 	});
 	setCDoc2Values(cdoc2Service);
-	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID);
+	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, [](const QString &uuid) {
+		Settings::CDOC2_UUID = uuid;
+		Settings::CDOC2_DEFAULT_KEYSERVER = uuid;
+	});
 	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) {
 		Settings::CDOC2_GET = url;
 		if(url.isEmpty())
@@ -424,7 +427,6 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	ui->pageGroup->setId(ui->btnMenuInfo, LicenseSettings);
 	connect(ui->pageGroup, &QButtonGroup::idClicked, this, &SettingsDialog::showPage);
 
-	updateVersion();
 	updateDiagnostics();
 	showPage(page);
 }
@@ -467,11 +469,8 @@ void SettingsDialog::checkConnection()
 
 void SettingsDialog::retranslate(const QString& lang)
 {
-	emit langChanged(lang);
-
 	qApp->loadTranslation( lang );
 	ui->retranslateUi(this);
-	updateVersion();
 	updateDiagnostics();
 	ui->cmbCdoc2Name->setItemText(ui->cmbCdoc2Name->count() - 1,
 		tr("Use a manually specified key transfer server for encryption"));
@@ -523,12 +522,6 @@ void SettingsDialog::selectLanguage()
 		button->setChecked(button->property("lang").toString() == Settings::LANGUAGE);
 }
 
-void SettingsDialog::updateVersion()
-{
-	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
-		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
-}
-
 void SettingsDialog::saveProxy()
 {
 	Settings::PROXY_CONFIG = ui->proxyGroup->checkedId();
@@ -568,6 +561,8 @@ void SettingsDialog::loadProxy( const digidoc::Conf *conf )
 
 void SettingsDialog::updateDiagnostics()
 {
+	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
+		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
 	ui->txtDiagnostics->setEnabled(false);
 	ui->txtDiagnostics->clear();
 	ui->btnNavSaveReport->setDisabled(true);

client/dialogs/SettingsDialog.h

@@ -59,7 +59,6 @@ class SettingsDialog final: public QDialog
 	static void loadProxy( const digidoc::Conf *conf );
 
 signals:
-	void langChanged(const QString& lang);
 	void togglePrinting(bool enable);
 
 private:
@@ -74,7 +73,6 @@ class SettingsDialog final: public QDialog
 	void updateCDoc2Cert(const QSslCertificate &c);
 	void updateSiVaCert(const QSslCertificate &c);
 	void updateTSACert(const QSslCertificate &c);
-	void updateVersion();
 	void updateDiagnostics();
 	void useDefaultSettings();