* edit WiFi and ProfileList calls

* optimization of WifiMenu
* small refactoring
This commit is contained in:
arcan1s
2015-03-07 17:12:33 +03:00
parent 9993fee336
commit 2cf876cf32
26 changed files with 207 additions and 153 deletions

View File

@ -259,7 +259,9 @@ QStringList ControlAdaptor::WiFi()
QStringList point;
point.append(wifiPoints[i].name);
point.append(wifiPoints[i].security);
point.append(wifiPoints[i].signal);
point.append(wifiPoints[i].frequencies.join(QChar(',')));
point.append(wifiPoints[i].macs.join(QChar(',')));
point.append(QString::number(wifiPoints[i].signal));
point.append(QString::number(wifiPoints[i].active));
point.append(QString::number(wifiPoints[i].exists));
info.append(point.join(QChar('|')));

View File

@ -118,6 +118,7 @@ QStringList NetctlAdaptor::ProfileList()
QStringList profileInfo;
profileInfo.append(profilesInfo[i].name);
profileInfo.append(profilesInfo[i].description);
profileInfo.append(profilesInfo[i].essid);
profileInfo.append(QString::number(profilesInfo[i].active));
profileInfo.append(QString::number(profilesInfo[i].enabled));
info.append(profileInfo.join(QChar('|')));
@ -146,6 +147,12 @@ QString NetctlAdaptor::ProfileValue(const QString profile, const QString key)
}
QStringList NetctlAdaptor::ProfileValues(const QString profile, const QStringList keys)
{
return netctlProfile->getValuesFromProfile(profile, keys);
}
// wpaCommand
QString NetctlAdaptor::ProfileByEssid(const QString essid)
{

View File

@ -50,6 +50,7 @@ public slots:
// netctlProfile
QStringList Profile(const QString profile);
QString ProfileValue(const QString profile, const QString key);
QStringList ProfileValues(const QString profile, const QStringList keys);
// wpaCommand
QString ProfileByEssid(const QString essid);
QStringList WirelessInterfaces();