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

prepare plasmoid to release

Browse Source
This commit is contained in:
arcan1s 2014-08-11 20:49:48 +04:00
parent d2ea9d96d9
commit db3bfe9ad7
2 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
sources/plasmoid/netctl.cpp
View File

@ -26,7 +26,6 @@
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDebug> #include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QMenu> #include <QMenu>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QTimer> #include <QTimer>
@ -75,7 +74,6 @@ Netctl::Netctl(QObject *parent, const QVariantList &args)
setBackgroundHints(DefaultBackground); setBackgroundHints(DefaultBackground);
setAspectRatioMode(Plasma::IgnoreAspectRatio); setAspectRatioMode(Plasma::IgnoreAspectRatio);
setHasConfigurationInterface(true); setHasConfigurationInterface(true);
connect(this, SIGNAL(activate()), this, SLOT(showGui()));
// text format init // text format init
formatLine.append(QString("")); formatLine.append(QString(""));
formatLine.append(QString("")); formatLine.append(QString(""));
@ -125,7 +123,6 @@ void Netctl::init()
layout->addWidget(iconLabel); layout->addWidget(iconLabel);
textLabel = new QLabel(graphicsWidget); textLabel = new QLabel(graphicsWidget);
layout->addWidget(textLabel); layout->addWidget(textLabel);
// read variables // read variables
configChanged(); configChanged();
} }
@ -219,8 +216,7 @@ void Netctl::writeDataEngineConfiguration(const QMap<QString, QString> settings)
QString fileName = KGlobal::dirs()->locateLocal("config", "netctl.conf"); QString fileName = KGlobal::dirs()->locateLocal("config", "netctl.conf");
if (debug) qDebug() << "[PLASMOID]" << "[writeDataEngineConfiguration]" << ":" << "Configuration file" << fileName; if (debug) qDebug() << "[PLASMOID]" << "[writeDataEngineConfiguration]" << ":" << "Configuration file" << fileName;
QFile configFile(fileName); QFile configFile(fileName);
if (!configFile.open(QIODevice::WriteOnly)) if (!configFile.open(QIODevice::WriteOnly)) return;
return;
for (int i=0; i<config.keys().count(); i++) { for (int i=0; i<config.keys().count(); i++) {
QByteArray string = (config.keys()[i] + QString("=") + config[config.keys()[i]] + QString("\n")).toUtf8(); QByteArray string = (config.keys()[i] + QString("=") + config[config.keys()[i]] + QString("\n")).toUtf8();
configFile.write(string); configFile.write(string);
@ -297,8 +293,7 @@ void Netctl::enableProfileSlot()
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")]));
} } else {
else {
enableStatus = QString(" enable "); enableStatus = QString(" enable ");
sendNotification(QString("Info"), i18n("Set profile %1 enabled", info[QString("name")])); sendNotification(QString("Info"), i18n("Set profile %1 enabled", info[QString("name")]));
} }
@ -306,8 +301,7 @@ void Netctl::enableProfileSlot()
QList<QVariant> args; QList<QVariant> args;
args.append(info[QString("name")]); args.append(info[QString("name")]);
sendDBusRequest(QString("Enable"), args); sendDBusRequest(QString("Enable"), args);
} } else {
else {
QProcess command; QProcess command;
QString commandLine = QString(""); QString commandLine = QString("");
if (useSudo) if (useSudo)
@ -327,8 +321,7 @@ void Netctl::restartProfileSlot()
QList<QVariant> args; QList<QVariant> args;
args.append(info[QString("name")]); args.append(info[QString("name")]);
sendDBusRequest(QString("Restart"), args); sendDBusRequest(QString("Restart"), args);
} } else {
else {
QProcess command; QProcess command;
QString commandLine = QString(""); QString commandLine = QString("");
if (useSudo) if (useSudo)
@ -352,8 +345,7 @@ void Netctl::startProfileSlot(QAction *profile)
sendDBusRequest(QString("SwitchTo"), args); sendDBusRequest(QString("SwitchTo"), args);
else else
sendDBusRequest(QString("Start"), args); sendDBusRequest(QString("Start"), args);
} } else {
else {
QProcess command; QProcess command;
QString commandLine = QString(""); QString commandLine = QString("");
if (useSudo) if (useSudo)
@ -376,8 +368,7 @@ void Netctl::stopProfileSlot()
QList<QVariant> args; QList<QVariant> args;
args.append(info[QString("name")]); args.append(info[QString("name")]);
sendDBusRequest(QString("Start"), args); sendDBusRequest(QString("Start"), args);
} } else {
else {
QProcess command; QProcess command;
QString commandLine = QString(""); QString commandLine = QString("");
if (useSudo) if (useSudo)
@ -399,8 +390,7 @@ void Netctl::switchToProfileSlot(QAction *profile)
QList<QVariant> args; QList<QVariant> args;
args.append(profile->text().remove(QChar('&'))); args.append(profile->text().remove(QChar('&')));
sendDBusRequest(QString("autoStart"), args); sendDBusRequest(QString("autoStart"), args);
} } else {
else {
QProcess command; QProcess command;
QString commandLine = paths[QString("netctlAuto")] + QString(" switch-to ") + QString commandLine = paths[QString("netctlAuto")] + QString(" switch-to ") +
profile->text().remove(QChar('&')); profile->text().remove(QChar('&'));
@ -415,6 +405,7 @@ void Netctl::startHelper()
QProcess command; QProcess command;
QString commandLine = paths[QString("helper")]; QString commandLine = paths[QString("helper")];
command.startDetached(commandLine); command.startDetached(commandLine);
} }
@ -423,7 +414,8 @@ void Netctl::checkHelperStatus()
{ {
if (debug) qDebug() << "[PLASMOID]" << "[checkHelperStatus]"; if (debug) qDebug() << "[PLASMOID]" << "[checkHelperStatus]";
if (useHelper) useHelper = !sendDBusRequest(QString("Active"), QList<QVariant>()).isEmpty(); if (useHelper)
useHelper = !sendDBusRequest(QString("Active"), QList<QVariant>()).isEmpty();
} }
@ -443,14 +435,12 @@ QList<QAction*> Netctl::contextualActions()
contextMenu[QString("switch")]->setVisible(true); contextMenu[QString("switch")]->setVisible(true);
contextMenu[QString("restart")]->setVisible(false); contextMenu[QString("restart")]->setVisible(false);
contextMenu[QString("enable")]->setVisible(false); contextMenu[QString("enable")]->setVisible(false);
switchToProfileMenu->clear(); switchToProfileMenu->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);
switchToProfileMenu->addAction(profile); switchToProfileMenu->addAction(profile);
} }
} } else {
else {
contextMenu[QString("start")]->setVisible(true); contextMenu[QString("start")]->setVisible(true);
contextMenu[QString("stop")]->setVisible(status); contextMenu[QString("stop")]->setVisible(status);
contextMenu[QString("switch")]->setVisible(false); contextMenu[QString("switch")]->setVisible(false);
@ -592,51 +582,41 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
if (debug) qDebug() << "[PLASMOID]" << "[dataUpdated]"; if (debug) qDebug() << "[PLASMOID]" << "[dataUpdated]";
if (debug) qDebug() << "[PLASMOID]" << "[dataUpdated]" << ":" << "Source" << sourceName; if (debug) qDebug() << "[PLASMOID]" << "[dataUpdated]" << ":" << "Source" << sourceName;
if (data.isEmpty()) if (isIconified()) return;
return; if (data.isEmpty()) return;
QString value = data[QString("value")].toString(); QString value = data[QString("value")].toString();
if (value.isEmpty()) if (value.isEmpty())
value = QString("N\\A"); value = QString("N\\A");
if (sourceName == QString("currentProfile")) { if (sourceName == QString("currentProfile")) {
info[QString("name")] = value; info[QString("name")] = value;
// update text // update text
if (bigInterface) if (bigInterface)
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]); textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
} } else if (sourceName == QString("extIp")) {
else if (sourceName == QString("extIp")) {
info[QString("extIp")] = value; info[QString("extIp")] = value;
} } else if (sourceName == QString("extIp6")) {
else if (sourceName == QString("extIp6")) {
info[QString("extIp6")] = value; info[QString("extIp6")] = value;
} } else if (sourceName == QString("interfaces")) {
else if (sourceName == QString("interfaces")) {
info[QString("interfaces")] = value; info[QString("interfaces")] = value;
} } else if (sourceName == QString("intIp")) {
else if (sourceName == QString("intIp")) {
info[QString("intIp")] = value; info[QString("intIp")] = value;
} } else if (sourceName == QString("intIp6")) {
else if (sourceName == QString("intIp6")) {
info[QString("intIp6")] = value; info[QString("intIp6")] = value;
} } else if (sourceName == QString("profiles")) {
else if (sourceName == QString("profiles")) {
profileList = value.split(QChar(',')); profileList = value.split(QChar(','));
} } else if (sourceName == QString("statusBool")) {
else if (sourceName == QString("statusBool")) {
if (value == QString("true")) { if (value == QString("true")) {
if (!status) if (!status)
sendNotification(QString("Info"), i18n("Network is up")); sendNotification(QString("Info"), i18n("Network is up"));
status = true; status = true;
} } else {
else {
if (status) if (status)
sendNotification(QString("Info"), i18n("Network is down")); sendNotification(QString("Info"), i18n("Network is down"));
status = false; status = false;
} }
updateIcon(); updateIcon();
} } else if (sourceName == QString("statusString")) {
else if (sourceName == QString("statusString")) {
info[QString("status")] = QString("(") + value + QString(")"); info[QString("status")] = QString("(") + value + QString(")");
} }
@ -657,6 +637,7 @@ void Netctl::disconnectFromEngine()
netctlEngine->disconnectSource(QString("profiles"), this); netctlEngine->disconnectSource(QString("profiles"), this);
netctlEngine->disconnectSource(QString("statusBool"), this); netctlEngine->disconnectSource(QString("statusBool"), this);
netctlEngine->disconnectSource(QString("statusString"), this); netctlEngine->disconnectSource(QString("statusString"), this);
updateInterface(false); updateInterface(false);
} }
@ -691,12 +672,10 @@ void Netctl::selectAbstractSomething()
if (sender() == uiAppConfig.pushButton_activeIcon) { if (sender() == uiAppConfig.pushButton_activeIcon) {
path = QString("/usr/share/icons"); path = QString("/usr/share/icons");
lineEdit = uiAppConfig.lineEdit_activeIcon; lineEdit = uiAppConfig.lineEdit_activeIcon;
} } else if (sender() == uiAppConfig.pushButton_inactiveIcon) {
else if (sender() == uiAppConfig.pushButton_inactiveIcon) {
path = QString("/usr/share/icons"); path = QString("/usr/share/icons");
lineEdit = uiAppConfig.lineEdit_inactiveIcon; lineEdit = uiAppConfig.lineEdit_inactiveIcon;
} } else if (sender() == uiWidConfig.pushButton_gui)
else if (sender() == uiWidConfig.pushButton_gui)
lineEdit = uiWidConfig.lineEdit_gui; lineEdit = uiWidConfig.lineEdit_gui;
else if (sender() == uiWidConfig.pushButton_helper) else if (sender() == uiWidConfig.pushButton_helper)
lineEdit = uiWidConfig.lineEdit_helper; lineEdit = uiWidConfig.lineEdit_helper;
@ -953,6 +932,7 @@ void Netctl::configChanged()
if (useHelper) startHelper(); if (useHelper) startHelper();
QTimer::singleShot(1000, this, SLOT(checkHelperStatus())); QTimer::singleShot(1000, this, SLOT(checkHelperStatus()));
connectToEngine(); connectToEngine();
setAssociatedApplication(paths[QString("gui")]);
} }
@ -974,8 +954,7 @@ void Netctl::setDataEngineExternalIp()
if (uiDEConfig.checkBox_extIp->checkState() == 0) { if (uiDEConfig.checkBox_extIp->checkState() == 0) {
uiDEConfig.lineEdit_extIp->setDisabled(true); uiDEConfig.lineEdit_extIp->setDisabled(true);
uiDEConfig.pushButton_extIp->setDisabled(true); uiDEConfig.pushButton_extIp->setDisabled(true);
} } else if (uiDEConfig.checkBox_extIp->checkState() == 2) {
else if (uiDEConfig.checkBox_extIp->checkState() == 2) {
uiDEConfig.lineEdit_extIp->setEnabled(true); uiDEConfig.lineEdit_extIp->setEnabled(true);
uiDEConfig.pushButton_extIp->setEnabled(true); uiDEConfig.pushButton_extIp->setEnabled(true);
} }
@ -989,8 +968,7 @@ void Netctl::setDataEngineExternalIp6()
if (uiDEConfig.checkBox_extIp6->checkState() == 0) { if (uiDEConfig.checkBox_extIp6->checkState() == 0) {
uiDEConfig.lineEdit_extIp6->setDisabled(true); uiDEConfig.lineEdit_extIp6->setDisabled(true);
uiDEConfig.pushButton_extIp6->setDisabled(true); uiDEConfig.pushButton_extIp6->setDisabled(true);
} } else if (uiDEConfig.checkBox_extIp6->checkState() == 2) {
else if (uiDEConfig.checkBox_extIp6->checkState() == 2) {
uiDEConfig.lineEdit_extIp6->setEnabled(true); uiDEConfig.lineEdit_extIp6->setEnabled(true);
uiDEConfig.pushButton_extIp6->setEnabled(true); uiDEConfig.pushButton_extIp6->setEnabled(true);
} }
@ -1002,8 +980,7 @@ void Netctl::setHelper()
if (uiWidConfig.checkBox_helper->checkState() == 0) { if (uiWidConfig.checkBox_helper->checkState() == 0) {
uiWidConfig.lineEdit_helper->setDisabled(true); uiWidConfig.lineEdit_helper->setDisabled(true);
uiWidConfig.pushButton_helper->setDisabled(true); uiWidConfig.pushButton_helper->setDisabled(true);
} } else if (uiWidConfig.checkBox_helper->checkState() == 2) {
else if (uiWidConfig.checkBox_helper->checkState() == 2) {
uiWidConfig.lineEdit_helper->setEnabled(true); uiWidConfig.lineEdit_helper->setEnabled(true);
uiWidConfig.pushButton_helper->setEnabled(true); uiWidConfig.pushButton_helper->setEnabled(true);
} }
@ -1017,8 +994,7 @@ void Netctl::setSudo()
if (uiWidConfig.checkBox_sudo->checkState() == 0) { if (uiWidConfig.checkBox_sudo->checkState() == 0) {
uiWidConfig.lineEdit_sudo->setDisabled(true); uiWidConfig.lineEdit_sudo->setDisabled(true);
uiWidConfig.pushButton_sudo->setDisabled(true); uiWidConfig.pushButton_sudo->setDisabled(true);
} } else if (uiWidConfig.checkBox_sudo->checkState() == 2) {
else if (uiWidConfig.checkBox_sudo->checkState() == 2) {
uiWidConfig.lineEdit_sudo->setEnabled(true); uiWidConfig.lineEdit_sudo->setEnabled(true);
uiWidConfig.pushButton_sudo->setEnabled(true); uiWidConfig.pushButton_sudo->setEnabled(true);
} }
@ -1032,8 +1008,7 @@ void Netctl::setWifi()
if (uiWidConfig.checkBox_wifi->checkState() == 0) { if (uiWidConfig.checkBox_wifi->checkState() == 0) {
uiWidConfig.lineEdit_wifi->setDisabled(true); uiWidConfig.lineEdit_wifi->setDisabled(true);
uiWidConfig.pushButton_wifi->setDisabled(true); uiWidConfig.pushButton_wifi->setDisabled(true);
} } else if (uiWidConfig.checkBox_wifi->checkState() == 2) {
else if (uiWidConfig.checkBox_wifi->checkState() == 2) {
uiWidConfig.lineEdit_wifi->setEnabled(true); uiWidConfig.lineEdit_wifi->setEnabled(true);
uiWidConfig.pushButton_wifi->setEnabled(true); uiWidConfig.pushButton_wifi->setEnabled(true);
} }

1
sources/plasmoid/netctl.h
View File

@ -28,7 +28,6 @@
#include <ui_widget.h> #include <ui_widget.h>
class QGraphicsLinearLayout;
class Netctl; class Netctl;
class IconLabel : public QLabel class IconLabel : public QLabel