Differential D15297 Diff 41057 vpn/openvpn/openvpnadvancedwidget.cpp

Changeset View

Standalone View

View Options

vpn/openvpn/openvpnadvancedwidget.cpp

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s)65{
67 67​
68 setWindowTitle(i18nc("@title: window advanced openvpn properties", "Advanced OpenVPN properties")); 68​ setWindowTitle(i18nc("@title: window advanced openvpn properties", "Advanced OpenVPN properties"));
69 69​
70 d->setting = setting; 70​ d->setting = setting;
71 71​
72 m_ui->proxyPassword->setPasswordOptionsEnabled(true); 72​ m_ui->proxyPassword->setPasswordOptionsEnabled(true);
73 m_ui->proxyPassword->setPasswordNotRequiredEnabled(true); 73​ m_ui->proxyPassword->setPasswordNotRequiredEnabled(true);
74 74​
75 connect(m_ui->cbCertCheck, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::certCheckTypeChanged); 75​ connect(m_ui->cbCertCheck, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::certCheckTypeChanged);
76 connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); 76​ connect(m_ui->cmbProxyType, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
77 connect(m_ui->cboTLSMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this] (int index) { 77​ connect(m_ui->cboTLSMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this] (int index) {
78 if (index == 0) { 78​ if (index == 0) {
79 m_ui->kurlTlsAuthKey->setDisabled(true); 79​ m_ui->kurlTlsAuthKey->setDisabled(true);
80 m_ui->cboDirection->setDisabled(true); 80​ m_ui->cboDirection->setDisabled(true);
81 } else if (index == 1) { // TLS-Auth 81​ } else if (index == 1) { // TLS-Auth
82 m_ui->kurlTlsAuthKey->setEnabled(true); 82​ m_ui->kurlTlsAuthKey->setEnabled(true);
83 m_ui->cboDirection->setEnabled(true); 83​ m_ui->cboDirection->setEnabled(true);
84 } else { // TLS-Crypt 84​ } else { // TLS-Crypt
85 m_ui->kurlTlsAuthKey->setEnabled(true); 85​ m_ui->kurlTlsAuthKey->setEnabled(true);
86 m_ui->cboDirection->setDisabled(true); 86​ m_ui->cboDirection->setDisabled(true);
87 } 87​ }
88 }); 88​ });
89 89​
90 // start openVPN process and get its cipher list 90​ // start openVPN process and get its cipher list
91 const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin"); 91​ const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin");
92 const QStringList ciphersArgs(QLatin1String("--show-ciphers")); 92​ const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
93 const QStringList versionArgs(QLatin1String("--version")); 93​ const QStringList versionArgs(QLatin1String("--version"));
94 94​
95 d->openvpnCipherProcess = new KProcess(this); 95​ d->openvpnCipherProcess = new KProcess(this);
96 d->openvpnCipherProcess->setOutputChannelMode(KProcess::OnlyStdoutChannel); 96​ d->openvpnCipherProcess->setOutputChannelMode(KProcess::OnlyStdoutChannel);
97 d->openvpnCipherProcess->setReadChannel(QProcess::StandardOutput); 97​ d->openvpnCipherProcess->setReadChannel(QProcess::StandardOutput);
98 connect(d->openvpnCipherProcess, static_cast<void (KProcess::*)(QProcess::ProcessError)>(&KProcess::error), this, &OpenVpnAdvancedWidget::openVpnCipherError); 98​ connect(d->openvpnCipherProcess, QOverload<QProcess::ProcessError>::of(&KProcess::error), this, &OpenVpnAdvancedWidget::openVpnCipherError);
99 connect(d->openvpnCipherProcess, &KProcess::readyReadStandardOutput, this, &OpenVpnAdvancedWidget::gotOpenVpnCipherOutput); 99​ connect(d->openvpnCipherProcess, &KProcess::readyReadStandardOutput, this, &OpenVpnAdvancedWidget::gotOpenVpnCipherOutput);
100 connect(d->openvpnCipherProcess, static_cast<void (KProcess::*)(int, QProcess::ExitStatus)>(&KProcess::finished), this, &OpenVpnAdvancedWidget::openVpnCipherFinished); 100​ connect(d->openvpnCipherProcess, QOverload<int, QProcess::ExitStatus>::of(&KProcess::finished), this, &OpenVpnAdvancedWidget::openVpnCipherFinished);
101 d->openvpnCipherProcess->setProgram(openVpnBinary, ciphersArgs); 101​ d->openvpnCipherProcess->setProgram(openVpnBinary, ciphersArgs);
102 102​
103 d->openvpnVersionProcess = new KProcess(this); 103​ d->openvpnVersionProcess = new KProcess(this);
104 d->openvpnVersionProcess->setOutputChannelMode(KProcess::OnlyStdoutChannel); 104​ d->openvpnVersionProcess->setOutputChannelMode(KProcess::OnlyStdoutChannel);
105 d->openvpnVersionProcess->setReadChannel(QProcess::StandardOutput); 105​ d->openvpnVersionProcess->setReadChannel(QProcess::StandardOutput);
106 connect(d->openvpnVersionProcess, static_cast<void (KProcess::*)(QProcess::ProcessError)>(&KProcess::error), this, &OpenVpnAdvancedWidget::openVpnVersionError); 106​ connect(d->openvpnVersionProcess, QOverload<QProcess::ProcessError>::of(&KProcess::error), this, &OpenVpnAdvancedWidget::openVpnVersionError);
107 connect(d->openvpnVersionProcess, &KProcess::readyReadStandardOutput, this, &OpenVpnAdvancedWidget::gotOpenVpnVersionOutput); 107​ connect(d->openvpnVersionProcess, &KProcess::readyReadStandardOutput, this, &OpenVpnAdvancedWidget::gotOpenVpnVersionOutput);
108 connect(d->openvpnVersionProcess, static_cast<void (KProcess::*)(int, QProcess::ExitStatus)>(&KProcess::finished), this, &OpenVpnAdvancedWidget::openVpnVersionFinished); 108​ connect(d->openvpnVersionProcess, QOverload<int, QProcess::ExitStatus>::of(&KProcess::finished), this, &OpenVpnAdvancedWidget::openVpnVersionFinished);
109 d->openvpnVersionProcess->setProgram(openVpnBinary, versionArgs); 109​ d->openvpnVersionProcess->setProgram(openVpnBinary, versionArgs);
110 110​
111 connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &OpenVpnAdvancedWidget::accept); 111​ connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &OpenVpnAdvancedWidget::accept);
112 connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &OpenVpnAdvancedWidget::reject); 112​ connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &OpenVpnAdvancedWidget::reject);
113 113​
114 KAcceleratorManager::manage(this); 114​ KAcceleratorManager::manage(this);
115 115​
116 if (d->setting) { 116​ if (d->setting) {
▲ Show 20 Lines • Show All 587 Lines • Show Last 20 Lines