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

kf5 update

Browse Source 
* implement resizing
* implement debug
* implement notifications
* update interface
* correct work with helper
This commit is contained in:
arcan1s
2015-01-07 07:03:41 +03:00
parent 6ed45fa7a5
commit 54c5e7958a
9 changed files with 141 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sources/plasmoid-kf5/plugin/netctladds.cpp
View File

@ -21,6 +21,7 @@
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDebug>
#include <QInputDialog>
#include <QProcessEnvironment>
#include <QSettings>
#include <QStandardPaths>
@ -47,25 +48,6 @@ NetctlAdds::~NetctlAdds()
}
bool NetctlAdds::checkHelperStatus(const bool useHelper)
{
if (debug) qDebug() << PDEBUG;
return (useHelper && !sendDBusRequest(QString("Active"), QList<QVariant>()).isEmpty());
}
void NetctlAdds::startApplication(const QString cmd)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
QProcess command;
command.startDetached(cmd);
}
QList<QVariant> NetctlAdds::sendDBusRequest(const QString cmd, const QList<QVariant> args)
{
if (debug) qDebug() << PDEBUG;
@ -86,6 +68,14 @@ QList<QVariant> NetctlAdds::sendDBusRequest(const QString cmd, const QList<QVari
}
bool NetctlAdds::checkHelperStatus()
{
if (debug) qDebug() << PDEBUG;
return sendDBusRequest(QString("Active"), QList<QVariant>()).isEmpty();
}
QString NetctlAdds::getAboutText(const QString type)
{
if (debug) qDebug() << PDEBUG;
@ -132,6 +122,7 @@ QString NetctlAdds::getInfo(const QString current, const QString status)
for (int i=0; i<current.split(QChar('|')).count(); i++)
profiles.append(current.split(QChar('|'))[i] +
QString(" (") + status.split(QChar('|'))[i] + QString(")"));
if (profiles.isEmpty()) profiles.append(QString("N\\A"));
return profiles.join(QString(" | "));
}
@ -166,6 +157,7 @@ void NetctlAdds::runCmd(const QString cmd)
if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
QProcess command;
sendNotification(QString("Info"), i18n("Run %1", cmd));
command.startDetached(cmd);
}
@ -177,7 +169,8 @@ void NetctlAdds::sendNotification(const QString eventId, const QString message)
if (debug) qDebug() << PDEBUG << ":" << "Event" << eventId;
if (debug) qDebug() << PDEBUG << ":" << "Message" << message;
KNotification::event(eventId, QString("Netctl ::: ") + eventId, message);
KNotification *notification = KNotification::event(eventId, QString("Netctl ::: ") + eventId, message);
notification->setComponentName(QString("plasma-applet-org.kde.plasma.netctl"));
}
@ -225,13 +218,17 @@ void NetctlAdds::restartProfileSlot(const QMap<QString, QVariant> dict, const bo
}
void NetctlAdds::startProfileSlot(QString profile, const bool status,
void NetctlAdds::startProfileSlot(const QStringList profiles, const bool status,
const bool useHelper, const QString cmd, const QString sudoCmd)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
if (debug) qDebug() << PDEBUG << ":" << "Profiles" << profiles;
bool ok;
QString profile = QInputDialog::getItem(0, i18n("Select profile"), i18n("Profile:"),
profiles, 0, false, &ok);
if (!ok || profile.isEmpty()) return;
profile.remove(QChar('&'));
sendNotification(QString("Info"), i18n("Start profile %1", profile));
if (useHelper) {
QList<QVariant> args;
@ -285,13 +282,17 @@ void NetctlAdds::stopAllProfilesSlot(const bool useHelper, const QString cmd, co
}
void NetctlAdds::switchToProfileSlot(QString profile, const bool useHelper,
void NetctlAdds::switchToProfileSlot(const QStringList profiles, const bool useHelper,
const QString cmd)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
if (debug) qDebug() << PDEBUG << ":" << "Profiles" << profiles;
bool ok;
QString profile = QInputDialog::getItem(0, i18n("Select profile"), i18n("Profile:"),
profiles, 0, false, &ok);
if (!ok || profile.isEmpty()) return;
profile.remove(QChar('&'));
sendNotification(QString("Info"), i18n("Switch to profile %1", profile));
if (useHelper) {
QList<QVariant> args;

9
sources/plasmoid-kf5/plugin/netctladds.h
View File

@ -32,6 +32,7 @@ public:
NetctlAdds(QObject *parent = 0);
~NetctlAdds();
Q_INVOKABLE bool checkHelperStatus();
Q_INVOKABLE QString getAboutText(const QString type = "header");
Q_INVOKABLE QString getInfo(const QString current, const QString status);
Q_INVOKABLE bool isDebugEnabled();
@ -47,7 +48,7 @@ public:
const bool useHelper = true,
const QString cmd = QString("/usr/bin/netctl"),
const QString sudoCmd = QString(""));
Q_INVOKABLE void startProfileSlot(QString profile, const bool status,
Q_INVOKABLE void startProfileSlot(const QStringList profiles, const bool status,
const bool useHelper = true,
const QString cmd = QString("/usr/bin/netctl"),
const QString sudoCmd = QString(""));
@ -58,7 +59,7 @@ public:
Q_INVOKABLE void stopAllProfilesSlot(const bool useHelper = true,
const QString cmd = QString("/usr/bin/netctl"),
const QString sudoCmd = QString(""));
Q_INVOKABLE void switchToProfileSlot(QString profile,
Q_INVOKABLE void switchToProfileSlot(const QStringList profiles,
const bool useHelper = true,
const QString cmd = QString("/usr/bin/netctl-auto"));
// dataengine
@ -67,10 +68,6 @@ public:
private:
bool debug = false;
// helper
bool checkHelperStatus(const bool useHelper = true);
void startApplication(const QString cmd = QString("/usr/bin/true"));
// dbus
QList<QVariant> sendDBusRequest(const QString cmd, const QList<QVariant> args = QList<QVariant>());
};