Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma-nm: adjustments and build fixes

Browse source
This commit is contained in:
Ivailo Monev 2015-03-27 22:23:49 +00:00
parent bf2ebd863b
commit 99332e7e7f
3 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plasma-nm/vpn/openvpn/openvpn.cpp
View file

@ -697,8 +697,12 @@ bool OpenVpnUiPlugin::exportConnectionSettings(const NetworkManager::ConnectionS
line = QString(CLIENT_TAG) + '\n';
expFile.write(line.toLatin1());
line = QString(REMOTE_TAG) + ' ' + dataMap[NM_OPENVPN_KEY_REMOTE] +
(dataMap[NM_OPENVPN_KEY_PORT].isEmpty() ? "\n" : (' ' + dataMap[NM_OPENVPN_KEY_PORT]) + '\n');
line = QString("%1 %2").arg(REMOTE_TAG, dataMap[NM_OPENVPN_KEY_REMOTE]);
if (dataMap[NM_OPENVPN_KEY_PORT].isEmpty()) {
line.append('\n');
} else {
line.append(' ' + dataMap[NM_OPENVPN_KEY_PORT] + '\n');
}
expFile.write(line.toLatin1());
if (dataMap[NM_OPENVPN_KEY_CONNECTION_TYPE] == NM_OPENVPN_CONTYPE_TLS ||
dataMap[NM_OPENVPN_KEY_CONNECTION_TYPE] == NM_OPENVPN_CONTYPE_PASSWORD ||
@ -743,14 +747,22 @@ bool OpenVpnUiPlugin::exportConnectionSettings(const NetworkManager::ConnectionS
expFile.write(line.toLatin1());
}
if (!dataMap[NM_OPENVPN_KEY_TA].isEmpty()) {
line = QString(TLS_AUTH_TAG) + " \"" + dataMap[NM_OPENVPN_KEY_TA] + '\"' + (dataMap[NM_OPENVPN_KEY_TA_DIR].isEmpty() ?
"\n" : (' ' + dataMap[NM_OPENVPN_KEY_TA_DIR]) + '\n');
line = QString(TLS_AUTH_TAG) + " \"" + dataMap[NM_OPENVPN_KEY_TA] + '\"';
if (dataMap[NM_OPENVPN_KEY_TA_DIR].isEmpty()) {
line.append("\n");
} else {
line.append(' ' + dataMap[NM_OPENVPN_KEY_TA_DIR] + '\n');
}
expFile.write(line.toLatin1());
}
}
if (dataMap[NM_OPENVPN_KEY_CONNECTION_TYPE] == NM_OPENVPN_CONTYPE_STATIC_KEY) {
line = QString(SECRET_TAG) + " \"" + dataMap[NM_OPENVPN_KEY_STATIC_KEY] + '\"' + (dataMap[NM_OPENVPN_KEY_STATIC_KEY_DIRECTION].isEmpty() ?
"\n" : (' ' + dataMap[NM_OPENVPN_KEY_STATIC_KEY_DIRECTION]) + '\n');
line = QString(SECRET_TAG) + " \"" + dataMap[NM_OPENVPN_KEY_STATIC_KEY] + '\"';
if (dataMap[NM_OPENVPN_KEY_STATIC_KEY_DIRECTION].isEmpty()) {
line.append("\n");
} else {
line.append(' ' + dataMap[NM_OPENVPN_KEY_STATIC_KEY_DIRECTION] + '\n');
}
expFile.write(line.toLatin1());
}
if (dataMap.contains(NM_OPENVPN_KEY_RENEG_SECONDS) && !dataMap[NM_OPENVPN_KEY_RENEG_SECONDS].isEmpty()) {
@ -788,8 +800,12 @@ bool OpenVpnUiPlugin::exportConnectionSettings(const NetworkManager::ConnectionS
&& dataMap.contains(NM_OPENVPN_KEY_PROXY_PORT)) {
if (proxy_port.toInt() == 0)
proxy_port = "8080";
line = QString(HTTP_PROXY_TAG) + ' ' + dataMap[NM_OPENVPN_KEY_PROXY_SERVER] + ' ' + proxy_port +
(dataMap[NM_OPENVPN_KEY_HTTP_PROXY_USERNAME].isEmpty() ? "\n" : (' ' + fileName + "-httpauthfile") + '\n');
line = QString(HTTP_PROXY_TAG) + ' ' + dataMap[NM_OPENVPN_KEY_PROXY_SERVER] + ' ' + proxy_port;
if (dataMap[NM_OPENVPN_KEY_HTTP_PROXY_USERNAME].isEmpty()) {
line.append("\n");
} else {
line.append(' ' + fileName + "-httpauthfile\n");
}
expFile.write(line.toLatin1());
if (dataMap[NM_OPENVPN_KEY_PROXY_RETRY] == "yes") {
line = QString(HTTP_PROXY_RETRY_TAG) + '\n';
@ -799,8 +815,12 @@ bool OpenVpnUiPlugin::exportConnectionSettings(const NetworkManager::ConnectionS
if (!dataMap[NM_OPENVPN_KEY_HTTP_PROXY_USERNAME].isEmpty()) {
QFile authFile(fileName + "-httpauthfile");
if (authFile.open(QFile::WriteOnly | QFile::Text)) {
line = dataMap[NM_OPENVPN_KEY_HTTP_PROXY_USERNAME] + (dataMap[NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD].isEmpty()?
"\n" : (dataMap[NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD] + '\n'));
line = dataMap[NM_OPENVPN_KEY_HTTP_PROXY_USERNAME];
if (dataMap[NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD].isEmpty()) {
line.append("\n");
} else {
line.append(dataMap[NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD] + '\n');
}
authFile.write(line.toLatin1());
authFile.close();
}

1
plasma-nm/vpn/pptp/pptpauth.ui
View file

@ -63,7 +63,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>KLineEdit</class>

8
plasma-nm/vpn/strongswan/strongswanwidget.cpp
View file

@ -96,17 +96,17 @@ void StrongswanSettingWidget::loadConfig(const NetworkManager::Setting::Ptr &set
d->ui.leGateway->setText(gateway);
}
// Certificate
d->ui.leGatewayCertificate->setUrl(KUrl::fromPathOrUrl(dataMap[NM_STRONGSWAN_CERTIFICATE]) );
d->ui.leGatewayCertificate->setUrl(KUrl(dataMap[NM_STRONGSWAN_CERTIFICATE]) );
// Authentication
const QString method = dataMap[NM_STRONGSWAN_METHOD];
if (method == QLatin1String(NM_STRONGSWAN_AUTH_KEY)) {
d->ui.cmbMethod->setCurrentIndex(StrongswanSettingWidgetPrivate::PrivateKey);
d->ui.leAuthPrivatekeyCertificate->setUrl(KUrl::fromPathOrUrl(dataMap[NM_STRONGSWAN_USERCERT]));
d->ui.leAuthPrivatekeyKey->setUrl(KUrl::fromPathOrUrl(dataMap[NM_STRONGSWAN_USERKEY]));
d->ui.leAuthPrivatekeyCertificate->setUrl(KUrl(dataMap[NM_STRONGSWAN_USERCERT]));
d->ui.leAuthPrivatekeyKey->setUrl(KUrl(dataMap[NM_STRONGSWAN_USERKEY]));
} else if (method == QLatin1String(NM_STRONGSWAN_AUTH_AGENT)) {
d->ui.cmbMethod->setCurrentIndex(StrongswanSettingWidgetPrivate::SshAgent);
d->ui.leAuthSshCertificate->setUrl(KUrl::fromPathOrUrl(dataMap[NM_STRONGSWAN_USERCERT]));
d->ui.leAuthSshCertificate->setUrl(KUrl(dataMap[NM_STRONGSWAN_USERCERT]));
} else if (method == QLatin1String(NM_STRONGSWAN_AUTH_SMARTCARD)) {
d->ui.cmbMethod->setCurrentIndex(StrongswanSettingWidgetPrivate::Smartcard);
} else if (method == QLatin1String(NM_STRONGSWAN_AUTH_EAP)) {