From 5b7aa117fa4e64590c706041287393e277fdc19b Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sun, 2 May 2021 23:11:22 +0200 Subject: [PATCH] NewX509: select correct help context by tab Especially removing tabs will shuffle the numbers. Set the help context as tab-widget objects name. --- widgets/NewX509.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/widgets/NewX509.cpp b/widgets/NewX509.cpp index 636d5c92..01af3ec5 100644 --- a/widgets/NewX509.cpp +++ b/widgets/NewX509.cpp @@ -125,6 +125,10 @@ NewX509::NewX509(QWidget *w) : QDialog(w ?: mainwin) foreach(int nid, distname_nid) keys << QString(OBJ_nid2ln(nid)); + tabnames = QStringList({ + "wizard_src", "wizard_subject", "wizard_extensions", + "wizard_keyusage", "wizard_netscape", "wizard_advanced", + "comment"}); extDNlist->setKeys(keys); extDNlist->setInfoLabel(extDNinfo); connect(extDNlist->itemDelegateForColumn(1), @@ -146,8 +150,8 @@ NewX509::NewX509(QWidget *w) : QDialog(w ?: mainwin) setWindowTitle(XCA_TITLE); for (i=0; icount(); i++) { - tabnames << tabWidget->tabText(i); - qDebug() << "TAB:" << i << " " << tabWidget->tabText(i); + tabWidget->widget(i)->setObjectName(tabnames[i]); + qDebug() << "TAB:" << i << tabWidget->tabText(i); } nsImg->setPixmap(QPixmap(":nsImg")); @@ -1113,13 +1117,10 @@ void NewX509::on_editAuthInfAcc_clicked() void NewX509::on_tabWidget_currentChanged(int tab) { - QStringList helpctx({ - "wizard_src", "wizard_subject", "wizard_extensions", - "wizard_keyusage", "wizard_netscape", "wizard_advanced", - "comment"}); - if (tabWidget->tabText(tab) == tabnames[5]) + QString tab_name = tabWidget->widget(tab)->objectName(); + if (tab_name == tabnames[5]) do_validateExtensions(); - buttonBox->setProperty("help_ctx", QVariant(helpctx[tab])); + buttonBox->setProperty("help_ctx", QVariant(tab_name)); } QString NewX509::mandatoryDnRemain()