arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

edit plasmoid netctl calls (see #7)

Browse Source
This commit is contained in:
arcan1s 2014-08-04 16:28:12 +04:00
parent a79cbd4429
commit 209c3b9616
1 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
sources/plasmoid/netctl.cpp
View File

@ -45,7 +45,6 @@ IconLabel::IconLabel(Netctl *wid, const bool debugCmd)
IconLabel::~IconLabel() IconLabel::~IconLabel()
{ {
if (debug) qDebug() << "[PLASMOID]" << "[IconLabel]";
} }
@ -80,7 +79,7 @@ Netctl::Netctl(QObject *parent, const QVariantList &args)
Netctl::~Netctl() Netctl::~Netctl()
{ {
if (debug) qDebug() << "[PLASMOID]" << "[~Netctl]"; // if (debug) qDebug() << "[PLASMOID]" << "[~Netctl]";
// delete startProfileMenu; // delete startProfileMenu;
// delete switchToProfileMenu; // delete switchToProfileMenu;
@ -240,7 +239,8 @@ void Netctl::enableProfileSlot()
if (debug) qDebug() << "[PLASMOID]" << "[enableProfileSlot]"; if (debug) qDebug() << "[PLASMOID]" << "[enableProfileSlot]";
QProcess command; QProcess command;
QString commandLine, enableStatus; QString commandLine = QString("");
QString enableStatus = QString("");
if (info[QString("status")].contains(QString("enabled"))) { if (info[QString("status")].contains(QString("enabled"))) {
enableStatus = QString(" disable "); enableStatus = QString(" disable ");
sendNotification(QString("Info"), i18n("Set profile %1 disabled", info[QString("name")])); sendNotification(QString("Info"), i18n("Set profile %1 disabled", info[QString("name")]));
@ -250,10 +250,8 @@ void Netctl::enableProfileSlot()
sendNotification(QString("Info"), i18n("Set profile %1 enabled", info[QString("name")])); sendNotification(QString("Info"), i18n("Set profile %1 enabled", info[QString("name")]));
} }
if (useSudo) if (useSudo)
commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] + commandLine = paths[QString("sudo")] + QString(" ");
enableStatus + info[QString("name")]; commandLine += paths[QString("netctl")] + enableStatus + info[QString("name")];
else
commandLine = paths[QString("netctl")] + enableStatus + info[QString("name")];
command.startDetached(commandLine); command.startDetached(commandLine);
} }
@ -264,31 +262,17 @@ void Netctl::startProfileSlot(QAction *profile)
if (debug) qDebug() << "[PLASMOID]" << "[startProfileSlot]"; if (debug) qDebug() << "[PLASMOID]" << "[startProfileSlot]";
if (debug) qDebug() << "[PLASMOID]" << "[startProfileSlot]" << ":" << "Profile" << profile->text().remove(QChar('&')); if (debug) qDebug() << "[PLASMOID]" << "[startProfileSlot]" << ":" << "Profile" << profile->text().remove(QChar('&'));
bool ready = true;
QProcess command; QProcess command;
QString commandLine; QString commandLine = QString("");
commandLine = QString("");
sendNotification(QString("Info"), i18n("Start profile %1", profile->text().remove(QChar('&')))); sendNotification(QString("Info"), i18n("Start profile %1", profile->text().remove(QChar('&'))));
if (status) { if (useSudo)
if (useSudo) commandLine = paths[QString("sudo")] + QString(" ");
commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] + if (status)
QString(" stop ") + info[QString("name")]; commandLine += paths[QString("netctl")] + QString(" switch-to ") + profile->text().remove(QChar('&'));
else else
commandLine = paths[QString("netctl")] + QString(" stop ") + info[QString("name")]; commandLine += paths[QString("netctl")] + QString(" start ") + profile->text().remove(QChar('&'));
command.start(commandLine);
command.waitForFinished(-1); command.startDetached(commandLine);
if (command.exitCode() != 0)
ready = false;
}
if (ready) {
if (useSudo)
commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] +
QString(" start ") + profile->text().remove(QChar('&'));
else
commandLine = paths[QString("netctl")] + QString(" start ") +
profile->text().remove(QChar('&'));
command.startDetached(commandLine);
}
} }
@ -297,13 +281,11 @@ void Netctl::stopProfileSlot()
if (debug) qDebug() << "[PLASMOID]" << "[stopProfileSlot]"; if (debug) qDebug() << "[PLASMOID]" << "[stopProfileSlot]";
QProcess command; QProcess command;
QString commandLine; QString commandLine = QString("");
sendNotification(QString("Info"), i18n("Stop profile %1", info[QString("name")])); sendNotification(QString("Info"), i18n("Stop profile %1", info[QString("name")]));
if (useSudo) if (useSudo)
commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] + commandLine = paths[QString("sudo")] + QString(" ");
QString(" stop ") + info[QString("name")]; commandLine += paths[QString("netctl")] + QString(" stop ") + info[QString("name")];
else
commandLine = paths[QString("netctl")] + QString(" stop ") + info[QString("name")];
command.startDetached(commandLine); command.startDetached(commandLine);
} }
@ -318,8 +300,9 @@ void Netctl::switchToProfileSlot(QAction *profile)
QString commandLine; QString commandLine;
commandLine = QString(""); commandLine = QString("");
sendNotification(QString("Info"), i18n("Switch to profile %1", profile->text().remove(QChar('&')))); sendNotification(QString("Info"), i18n("Switch to profile %1", profile->text().remove(QChar('&'))));
commandLine = paths[QString("netctl-auto")] + QString(" switch-to ") + commandLine = paths[QString("netctlAuto")] + QString(" switch-to ") +
profile->text().remove(QChar('&')); profile->text().remove(QChar('&'));
qDebug() << commandLine;
command.startDetached(commandLine); command.startDetached(commandLine);
} }
@ -330,13 +313,11 @@ void Netctl::restartProfileSlot()
if (debug) qDebug() << "[PLASMOID]" << "[restartProfileSlot]"; if (debug) qDebug() << "[PLASMOID]" << "[restartProfileSlot]";
QProcess command; QProcess command;
QString commandLine; QString commandLine = QString("");
sendNotification(QString("Info"), i18n("Restart profile %1", info[QString("name")])); sendNotification(QString("Info"), i18n("Restart profile %1", info[QString("name")]));
if (useSudo) if (useSudo)
commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] + commandLine = paths[QString("sudo")] + QString(" ");
QString(" restart ") + info[QString("name")]; commandLine += paths[QString("netctl")] + QString(" restart ") + info[QString("name")];
else
commandLine = paths[QString("netctl")] + QString(" restart ") + info[QString("name")];
command.startDetached(commandLine); command.startDetached(commandLine);
} }
@ -367,29 +348,21 @@ QList<QAction*> Netctl::contextualActions()
} }
else { else {
contextMenu[QString("start")]->setVisible(true); contextMenu[QString("start")]->setVisible(true);
contextMenu[QString("stop")]->setVisible(true); contextMenu[QString("stop")]->setVisible(status);
contextMenu[QString("switch")]->setVisible(false); contextMenu[QString("switch")]->setVisible(false);
contextMenu[QString("restart")]->setVisible(true); contextMenu[QString("restart")]->setVisible(status);
contextMenu[QString("enable")]->setVisible(true); contextMenu[QString("enable")]->setVisible(status);
if (status) { if (status) {
contextMenu[QString("start")]->setText(i18n("Start another profile")); contextMenu[QString("start")]->setText(i18n("Start another profile"));
contextMenu[QString("stop")]->setVisible(true);
contextMenu[QString("stop")]->setText(i18n("Stop %1", info[QString("name")])); contextMenu[QString("stop")]->setText(i18n("Stop %1", info[QString("name")]));
contextMenu[QString("restart")]->setVisible(true);
contextMenu[QString("restart")]->setText(i18n("Restart %1", info[QString("name")])); contextMenu[QString("restart")]->setText(i18n("Restart %1", info[QString("name")]));
contextMenu[QString("enable")]->setVisible(true);
if (info[QString("status")].contains(QString("enabled"))) if (info[QString("status")].contains(QString("enabled")))
contextMenu[QString("enable")]->setText(i18n("Disable %1", info[QString("name")])); contextMenu[QString("enable")]->setText(i18n("Disable %1", info[QString("name")]));
else else
contextMenu[QString("enable")]->setText(i18n("Enable %1", info[QString("name")])); contextMenu[QString("enable")]->setText(i18n("Enable %1", info[QString("name")]));
} }
else { else
contextMenu[QString("start")]->setText(i18n("Start profile")); contextMenu[QString("start")]->setText(i18n("Start profile"));
contextMenu[QString("stop")]->setVisible(false);
contextMenu[QString("restart")]->setVisible(false);
contextMenu[QString("enable")]->setVisible(false);
}
startProfileMenu->clear(); startProfileMenu->clear();
for (int i=0; i<profileList.count(); i++) { for (int i=0; i<profileList.count(); i++) {
QAction *profile = new QAction(profileList[i], this); QAction *profile = new QAction(profileList[i], this);
@ -397,10 +370,7 @@ QList<QAction*> Netctl::contextualActions()
} }
} }
if (useWifi) contextMenu[QString("wifi")]->setVisible(useWifi);
contextMenu[QString("wifi")]->setVisible(true);
else
contextMenu[QString("wifi")]->setVisible(false);
return menuActions; return menuActions;
} }