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

rewrite ui part (except for privateslots)

Browse Source
This commit is contained in:
arcan1s
2015-02-28 04:05:34 +03:00
parent e70ebe318d
commit 1333967535
19 changed files with 181 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,9 +494,7 @@ QStringList Netctl::getWirelessInterfaceList()
interfaces.append(mainInterface);
QStringList allInterfaces = ifaceDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot);
for (int i=0; i<allInterfaces.count(); i++) {
QString dir = QString("%1%2%3%2wireless").arg(ifaceDirectory->path())
.arg(QDir::separator())
.arg(allInterfaces[i]);
QString dir = QString("%1/%2/wireless").arg(ifaceDirectory->path()).arg(allInterfaces[i]);
if (debug) qDebug() << PDEBUG << ":" << "Check directory" << dir;
if (QDir(dir).exists())
interfaces.append(allInterfaces[i]);

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

@ -80,9 +80,7 @@ bool NetctlProfile::copyProfile(const QString oldPath)
return false;
}
QString newPath = QString("%1%2%3").arg(profileDirectory->absolutePath())
.arg(QDir::separator())
.arg(QFileInfo(oldPath).fileName());
QString newPath = QString("%1/%2").arg(profileDirectory->absolutePath()).arg(QFileInfo(oldPath).fileName());
QString cmd = QString("%1 /usr/bin/mv \"%2\" \"%3\"").arg(sudoCommand)
.arg(oldPath)
.arg(newPath);
@ -104,9 +102,7 @@ QString NetctlProfile::createProfile(const QString profile, const QMap<QString,
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
QString profileTempName = QString("%1%2%3").arg(QDir::tempPath())
.arg(QDir::separator())
.arg(QFileInfo(profile).fileName());
QString profileTempName = QString("%1/%2").arg(QDir::tempPath()).arg(QFileInfo(profile).fileName());
QFile profileFile(profileTempName);
if (debug) qDebug() << PDEBUG << ":" << "Save to" << profileTempName;
if (!profileFile.open(QIODevice::WriteOnly | QIODevice::Text))
@ -215,9 +211,7 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
systemVariables.append(output[i].split(QChar('='))[0]);
// profile variables
QMap<QString, QString> settings;
QString profileUrl = QString("%1%2%3").arg(profileDirectory->absolutePath())
.arg(QDir::separator())
.arg(QFileInfo(profile).fileName());
QString profileUrl = QString("%1/%2").arg(profileDirectory->absolutePath()).arg(QFileInfo(profile).fileName());
cmd = QString("env -i bash -c \"source '%1'; set\"").arg(profileUrl);
if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
process = runTask(cmd, false);
@ -269,9 +263,7 @@ bool NetctlProfile::removeProfile(const QString profile)
return false;
}
QString profilePath = QString("%1%2%3").arg(profileDirectory->absolutePath())
.arg(QDir::separator())
.arg(QFileInfo(profile).fileName());
QString profilePath = QString("%1/%2").arg(profileDirectory->absolutePath()).arg(QFileInfo(profile).fileName());
QString cmd = QString("%1 /usr/bin/rm \"%2\"").arg(sudoCommand).arg(profilePath);
if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
TaskResult process = runTask(cmd, useSuid);