Skip to content

Commit cf26c3b

Browse files
committed
Fix CDoc2 custom server selection
IB-8563 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent a7bb85d commit cf26c3b

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

client/MainWindow.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,6 @@ void MainWindow::showSettings(int page)
758758
return;
759759
}
760760
SettingsDialog dlg(page, this);
761-
762-
connect(&dlg, &SettingsDialog::langChanged, this, [this](const QString& lang ) {
763-
qApp->loadTranslation( lang );
764-
ui->retranslateUi(this);
765-
});
766761
connect(&dlg, &SettingsDialog::togglePrinting, ui->signContainerPage, &ContainerPage::togglePrinting);
767762
dlg.exec();
768763
}

client/dialogs/SettingsDialog.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
249249
setCDoc2Values(key);
250250
});
251251
setCDoc2Values(cdoc2Service);
252-
connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID);
252+
connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, [](const QString &uuid) {
253+
Settings::CDOC2_UUID = uuid;
254+
Settings::CDOC2_DEFAULT_KEYSERVER = uuid;
255+
});
253256
connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) {
254257
Settings::CDOC2_GET = url;
255258
if(url.isEmpty())
@@ -467,8 +470,6 @@ void SettingsDialog::checkConnection()
467470

468471
void SettingsDialog::retranslate(const QString& lang)
469472
{
470-
emit langChanged(lang);
471-
472473
qApp->loadTranslation( lang );
473474
ui->retranslateUi(this);
474475
updateVersion();

client/dialogs/SettingsDialog.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class SettingsDialog final: public QDialog
5959
static void loadProxy( const digidoc::Conf *conf );
6060

6161
signals:
62-
void langChanged(const QString& lang);
6362
void togglePrinting(bool enable);
6463

6564
private:

0 commit comments

Comments
 (0)