Compare commits

..

No commits in common. "ae5a4cd5e029b15916e7bc93d4408dd02a007576" and "8444016ad7dc8e98d6c3f79b6d546a623d1fd8d4" have entirely different histories.

4 changed files with 12 additions and 10 deletions

View File

@ -8,7 +8,6 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE)
find_package(ECM REQUIRED NO_MODULE) find_package(ECM REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})

View File

@ -148,7 +148,7 @@ void Ipv6SettingsTab::loadSettings(QVariantMap settings)
int newRow = ui->manualIpv6ConfigurationTable->rowCount(); int newRow = ui->manualIpv6ConfigurationTable->rowCount();
ui->manualIpv6ConfigurationTable->insertRow(newRow); ui->manualIpv6ConfigurationTable->insertRow(newRow);
ui->manualIpv6ConfigurationTable->setItem(newRow, 0, new QTableWidgetItem(ipAddrList[i].ip().toString())); ui->manualIpv6ConfigurationTable->setItem(newRow, 0, new QTableWidgetItem(ipAddrList[i].ip().toString()));
ui->manualIpv6ConfigurationTable->setItem(newRow, 1, new QTableWidgetItem(QString::number(ipAddrList[i].prefixLength()))); ui->manualIpv6ConfigurationTable->setItem(newRow, 1, new QTableWidgetItem(QString(ipAddrList[i].prefixLength())));
ui->manualIpv6ConfigurationTable->setItem(newRow, 2, new QTableWidgetItem(ipAddrList[i].gateway().toString())); ui->manualIpv6ConfigurationTable->setItem(newRow, 2, new QTableWidgetItem(ipAddrList[i].gateway().toString()));
} }
} }

View File

@ -101,6 +101,9 @@ QStandardItem *NetworkSelector::connGroupItem(QString itemName)
void NetworkSelector::regenConnTree() void NetworkSelector::regenConnTree()
{ {
if (connTreeModel != NULL) {
delete connTreeModel;
}
connTreeList = QList<QStandardItem *>(); connTreeList = QList<QStandardItem *>();
connTreeModel = new QStandardItemModel(0, 2); connTreeModel = new QStandardItemModel(0, 2);
connTreeModel->setHeaderData(0, Qt::Orientation::Horizontal, "Connection"); connTreeModel->setHeaderData(0, Qt::Orientation::Horizontal, "Connection");

View File

@ -10,7 +10,7 @@ Security802_1xTab::Security802_1xTab(QWidget *parent) :
ui(new Ui::Security802_1xTab) ui(new Ui::Security802_1xTab)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->enable802_1xCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onEnable802_1xCheckBoxToggled); connect(ui->enable802_1xCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onEnable802_1xCheckBoxToggled);
onEnable802_1xCheckBoxToggled(Qt::Unchecked); onEnable802_1xCheckBoxToggled(Qt::Unchecked);
onFastAutoPacProvisionCheckBoxToggled(Qt::Unchecked); onFastAutoPacProvisionCheckBoxToggled(Qt::Unchecked);
QStringList passwordStoreItems; QStringList passwordStoreItems;
@ -28,13 +28,13 @@ Security802_1xTab::Security802_1xTab(QWidget *parent) :
ui->ttlsInnerAuthenticationComboBox->addItems(QStringList() << tr("PAP") << tr("CHAP") << tr("MSCHAP") << tr("MSCHAPv2")); ui->ttlsInnerAuthenticationComboBox->addItems(QStringList() << tr("PAP") << tr("CHAP") << tr("MSCHAP") << tr("MSCHAPv2"));
ui->peapVersionComboBox->addItems(QStringList() << tr("Automatic") << tr ("Zero") << tr("One")); ui->peapVersionComboBox->addItems(QStringList() << tr("Automatic") << tr ("Zero") << tr("One"));
ui->peapInnerAuthenticationComboBox->addItems(QStringList() << tr("MSCHAPv2") << tr("MD5") << tr("GTC")); ui->peapInnerAuthenticationComboBox->addItems(QStringList() << tr("MSCHAPv2") << tr("MD5") << tr("GTC"));
connect(ui->md5ShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onMd5ShowPasswordCheckBoxToggled); connect(ui->md5ShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onMd5ShowPasswordCheckBoxToggled);
connect(ui->tlsShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onTlsShowPasswordCheckBoxToggled); connect(ui->tlsShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onTlsShowPasswordCheckBoxToggled);
connect(ui->pwdShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onPwdShowPasswordCheckBoxToggled); connect(ui->pwdShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onPwdShowPasswordCheckBoxToggled);
connect(ui->fastShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onFastShowPasswordCheckBoxToggled); connect(ui->fastShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onFastShowPasswordCheckBoxToggled);
connect(ui->ttlsShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onTtlsShowPasswordCheckBoxToggled); connect(ui->ttlsShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onTtlsShowPasswordCheckBoxToggled);
connect(ui->peapShowPasswordCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onPeapShowPasswordCheckBoxToggled); connect(ui->peapShowPasswordCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onPeapShowPasswordCheckBoxToggled);
connect(ui->fastAutoPacProvisionCheckBox, &QCheckBox::checkStateChanged, this, &Security802_1xTab::onFastAutoPacProvisionCheckBoxToggled); connect(ui->fastAutoPacProvisionCheckBox, &QCheckBox::stateChanged, this, &Security802_1xTab::onFastAutoPacProvisionCheckBoxToggled);
connect(ui->tlsCaCertificateOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsCaCertificateOpenFileButtonClicked); connect(ui->tlsCaCertificateOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsCaCertificateOpenFileButtonClicked);
connect(ui->tlsUserCertificateOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsUserCertificateOpenFileButtonClicked); connect(ui->tlsUserCertificateOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsUserCertificateOpenFileButtonClicked);
connect(ui->tlsUserPrivateKeyOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsUserPrivateKeyOpenFileButtonClicked); connect(ui->tlsUserPrivateKeyOpenFileButton, &QPushButton::clicked, this, &Security802_1xTab::onTlsUserPrivateKeyOpenFileButtonClicked);