arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-08 03:15:54 +00:00
Code Issues Projects Releases Wiki Activity

Prepare to release 1.4.1

Browse Source 
update docs, update ui
deprecate description function
This commit is contained in:
arcan1s
2015-03-16 05:14:53 +03:00
parent 3f49988cef
commit a2b1d46900
17 changed files with 161 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/netctlgui/include/netctlgui/netctlinteract.h
View File

@ -119,7 +119,7 @@ public:
* @param profile profile name
* @return profile description or ""
*/
QString getProfileDescription(const QString profile);
Q_DECL_DEPRECATED QString getProfileDescription(const QString profile);
/**
* @brief method which gets profile status
* @param profile profile name

20
sources/netctlgui/src/netctlinteract.cpp
View File

@ -321,11 +321,11 @@ bool Netctl::autoIsProfileActive(const QString profile)
bool status = false;
QList<netctlProfileInfo> profiles = getProfileListFromNetctlAuto();
for (int i=0; i<profiles.count(); i++)
if ((profiles[i].name == profile) && (profiles[i].active)) {
status = true;
break;
}
for (int i=0; i<profiles.count(); i++) {
if (profiles[i].name == profile) continue;
status = profiles[i].active;
break;
}
return status;
}
@ -341,11 +341,11 @@ bool Netctl::autoIsProfileEnabled(const QString profile)
bool status = false;
QList<netctlProfileInfo> profiles = getProfileListFromNetctlAuto();
for (int i=0; i<profiles.count(); i++)
if ((profiles[i].name == profile) && (profiles[i].enabled)) {
status = true;
break;
}
for (int i=0; i<profiles.count(); i++) {
if (profiles[i].name == profile) continue;
status = profiles[i].enabled;
break;
}
return status;
}

10
sources/netctlgui/src/netctlinterface.cpp
View File

@ -182,10 +182,7 @@ InterfaceAnswer NetctlInterface::removeProfile(const QString profile)
return InterfaceAnswer::Error;
}
if (netctlProfile->removeProfile(profile))
return InterfaceAnswer::True;
else
return InterfaceAnswer::Error;
return static_cast<InterfaceAnswer>(netctlProfile->removeProfile(profile));
}
@ -238,10 +235,7 @@ InterfaceAnswer NetctlInterface::stopAllProfiles()
return InterfaceAnswer::Error;
}
if (netctlCommand->stopAllProfiles())
return InterfaceAnswer::True;
else
return InterfaceAnswer::Error;
return static_cast<InterfaceAnswer>(netctlCommand->stopAllProfiles());
}

22
sources/netctlgui/src/netctlprofile.cpp
View File

@ -111,16 +111,16 @@ QString NetctlProfile::createProfile(const QString profile, const QMap<QString,
for (int i=0; i<settings.keys().count(); i++) {
out << settings.keys()[i] << QString("=");
if ((settings.keys()[i] == QString("BindsToInterfaces")) ||
(settings.keys()[i] == QString("After")) ||
(settings.keys()[i] == QString("Address")) ||
(settings.keys()[i] == QString("Routes")) ||
(settings.keys()[i] == QString("Address6")) ||
(settings.keys()[i] == QString("Routes6")) ||
(settings.keys()[i] == QString("IPCustom")) ||
(settings.keys()[i] == QString("DNS")) ||
(settings.keys()[i] == QString("DNSOptions")) ||
(settings.keys()[i] == QString("ScanFrequencies")) ||
(settings.keys()[i] == QString("WPAConfigSection")))
(settings.keys()[i] == QString("After")) ||
(settings.keys()[i] == QString("Address")) ||
(settings.keys()[i] == QString("Routes")) ||
(settings.keys()[i] == QString("Address6")) ||
(settings.keys()[i] == QString("Routes6")) ||
(settings.keys()[i] == QString("IPCustom")) ||
(settings.keys()[i] == QString("DNS")) ||
(settings.keys()[i] == QString("DNSOptions")) ||
(settings.keys()[i] == QString("ScanFrequencies")) ||
(settings.keys()[i] == QString("WPAConfigSection")))
out << QString("(%1)").arg(settings[settings.keys()[i]]) << endl;
else
out << settings[settings.keys()[i]] << endl;
@ -220,7 +220,7 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
output = QString(process.output).trimmed().split(QChar('\n'));
// gettings variables
// read variables
QStringList keys;
for (int i=0; i<output.count(); i++)
if (!systemVariables.contains(output[i].split(QChar('='))[0]))