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

update KDE4 plasmoid

Browse Source
This commit is contained in:
arcan1s 2015-03-08 19:24:21 +03:00
parent 2cf876cf32
commit d94aa4ebf7
3 changed files with 29 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/.kdev4/sources.kdev4
View File

@ -8,7 +8,7 @@ ProjectRootRelative=./
[CMake][CMake Build Directory 0] [CMake][CMake Build Directory 0]
Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build
Build Type=Debug Build Type=Release
CMake Binary=file:///usr/bin/cmake CMake Binary=file:///usr/bin/cmake
Environment Profile= Environment Profile=
Extra Arguments= Extra Arguments=

2
sources/CMakeLists.txt
View File

@ -1,4 +1,4 @@
wcmake_minimum_required (VERSION 2.8.12) cmake_minimum_required (VERSION 2.8.12)
cmake_policy (SET CMP0003 OLD) cmake_policy (SET CMP0003 OLD)
cmake_policy (SET CMP0002 OLD) cmake_policy (SET CMP0002 OLD)

99
sources/plasmoid-kde4/netctl.cpp
View File

@ -135,10 +135,7 @@ QString Netctl::parsePattern(const QString rawLine)
QString line = rawLine; QString line = rawLine;
for (int i=0; i<info.keys().count(); i++) for (int i=0; i<info.keys().count(); i++)
if (line.contains(QString("$") + info.keys()[i])) line.replace(QString("$%1").arg(info.keys()[i]), info[info.keys()[i]]);
line = line.split(QString("$") + info.keys()[i])[0] +
info[info.keys()[i]] +
line.split(QString("$") + info.keys()[i])[1];
return line; return line;
} }
@ -222,7 +219,7 @@ void Netctl::updateInterface(bool setShown)
else else
layout->removeWidget(textLabel); layout->removeWidget(textLabel);
graphicsWidget->adjustSize(); graphicsWidget->adjustSize();
resize(1, 1); resize(0, 0);
} }
@ -506,7 +503,7 @@ void Netctl::sendNotification(const QString eventId, const QString message)
KNotification *notification = new KNotification(eventId); KNotification *notification = new KNotification(eventId);
notification->setComponentData(KComponentData("plasma_applet_netctl")); notification->setComponentData(KComponentData("plasma_applet_netctl"));
notification->setTitle(QString("Netctl ::: ") + eventId); notification->setTitle(QString("Netctl ::: %1").arg(eventId));
notification->setText(message); notification->setText(message);
notification->sendEvent(); notification->sendEvent();
delete notification; delete notification;
@ -544,6 +541,7 @@ void Netctl::connectToEngine()
netctlEngine->connectSource(QString("current"), this, autoUpdateInterval); netctlEngine->connectSource(QString("current"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("extip4"), this, autoUpdateInterval); netctlEngine->connectSource(QString("extip4"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("extip6"), this, autoUpdateInterval); netctlEngine->connectSource(QString("extip6"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("info"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("interfaces"), this, autoUpdateInterval); netctlEngine->connectSource(QString("interfaces"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("intip4"), this, autoUpdateInterval); netctlEngine->connectSource(QString("intip4"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("intip6"), this, autoUpdateInterval); netctlEngine->connectSource(QString("intip6"), this, autoUpdateInterval);
@ -578,18 +576,15 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
updateIcon(); updateIcon();
} else if (sourceName == QString("current")) { } else if (sourceName == QString("current")) {
info[QString("current")] = value; info[QString("current")] = value;
QStringList profiles;
for (int i=0; i<info[QString("current")].split(QChar('|')).count(); i++)
profiles.append(info[QString("current")].split(QChar('|'))[i] +
QString(" (") + info[QString("status")].split(QChar('|'))[i] + QString(")"));
info[QString("info")] = profiles.join(QString(" | "));
// update text
if (bigInterface)
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
} else if (sourceName == QString("extip4")) { } else if (sourceName == QString("extip4")) {
info[QString("extip4")] = value; info[QString("extip4")] = value;
} else if (sourceName == QString("extip6")) { } else if (sourceName == QString("extip6")) {
info[QString("extip6")] = value; info[QString("extip6")] = value;
} else if (sourceName == QString("info")) {
info[QString("info")] = value;
// update text
if (bigInterface)
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
} else if (sourceName == QString("interfaces")) { } else if (sourceName == QString("interfaces")) {
info[QString("interfaces")] = value; info[QString("interfaces")] = value;
} else if (sourceName == QString("intip4")) { } else if (sourceName == QString("intip4")) {
@ -614,6 +609,7 @@ void Netctl::disconnectFromEngine()
netctlEngine->disconnectSource(QString("currentProfile"), this); netctlEngine->disconnectSource(QString("currentProfile"), this);
netctlEngine->disconnectSource(QString("extIp4"), this); netctlEngine->disconnectSource(QString("extIp4"), this);
netctlEngine->disconnectSource(QString("extIp6"), this); netctlEngine->disconnectSource(QString("extIp6"), this);
netctlEngine->disconnectSource(QString("info"), this);
netctlEngine->disconnectSource(QString("interfaces"), this); netctlEngine->disconnectSource(QString("interfaces"), this);
netctlEngine->disconnectSource(QString("intIp4"), this); netctlEngine->disconnectSource(QString("intIp4"), this);
netctlEngine->disconnectSource(QString("intIp6"), this); netctlEngine->disconnectSource(QString("intIp6"), this);
@ -634,11 +630,10 @@ QList<QVariant> Netctl::sendDBusRequest(const QString cmd, const QList<QVariant>
QDBusConnection bus = QDBusConnection::systemBus(); QDBusConnection bus = QDBusConnection::systemBus();
QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, DBUS_CTRL_PATH, QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, DBUS_CTRL_PATH,
DBUS_HELPER_INTERFACE, cmd); DBUS_HELPER_INTERFACE, cmd);
if (!args.isEmpty()) if (!args.isEmpty()) request.setArguments(args);
request.setArguments(args);
QDBusMessage response = bus.call(request, QDBus::BlockWithGui); QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
QList<QVariant> arguments = response.arguments(); QList<QVariant> arguments = response.arguments();
if (arguments.size() == 0) if (arguments.isEmpty())
if (debug) qDebug() << PDEBUG << ":" << "Error message" << response.errorMessage(); if (debug) qDebug() << PDEBUG << ":" << "Error message" << response.errorMessage();
return arguments; return arguments;
@ -822,27 +817,15 @@ void Netctl::configAccepted()
cg.writeEntry("autoUpdateInterval", uiWidConfig.spinBox_autoUpdate->value()); cg.writeEntry("autoUpdateInterval", uiWidConfig.spinBox_autoUpdate->value());
cg.writeEntry("guiPath", uiWidConfig.lineEdit_gui->text()); cg.writeEntry("guiPath", uiWidConfig.lineEdit_gui->text());
if (uiWidConfig.checkBox_helper->checkState() == 0) cg.writeEntry("useHelper", (uiWidConfig.checkBox_helper->checkState() != 0));
cg.writeEntry("useHelper", false);
else
cg.writeEntry("useHelper", true);
cg.writeEntry("helperPath", uiWidConfig.lineEdit_helper->text()); cg.writeEntry("helperPath", uiWidConfig.lineEdit_helper->text());
cg.writeEntry("netctlPath", uiWidConfig.lineEdit_netctl->text()); cg.writeEntry("netctlPath", uiWidConfig.lineEdit_netctl->text());
cg.writeEntry("netctlAutoPath", uiWidConfig.lineEdit_netctlAuto->text()); cg.writeEntry("netctlAutoPath", uiWidConfig.lineEdit_netctlAuto->text());
if (uiWidConfig.checkBox_sudo->checkState() == 0) cg.writeEntry("useSudo", (uiWidConfig.checkBox_sudo->checkState() != 0));
cg.writeEntry("useSudo", false);
else
cg.writeEntry("useSudo", true);
cg.writeEntry("sudoPath", uiWidConfig.lineEdit_sudo->text()); cg.writeEntry("sudoPath", uiWidConfig.lineEdit_sudo->text());
if (uiWidConfig.checkBox_wifi->checkState() == 0) cg.writeEntry("useWifi", (uiWidConfig.checkBox_wifi->checkState() != 0));
cg.writeEntry("useWifi", false);
else
cg.writeEntry("useWifi", true);
cg.writeEntry("wifiPath", uiWidConfig.lineEdit_wifi->text()); cg.writeEntry("wifiPath", uiWidConfig.lineEdit_wifi->text());
if (uiWidConfig.checkBox_showBigInterface->checkState() == 0) cg.writeEntry("showBigInterface", (uiWidConfig.checkBox_showBigInterface->checkState() != 0));
cg.writeEntry("showBigInterface", false);
else
cg.writeEntry("showBigInterface", true);
QString pattern = uiWidConfig.textEdit->toPlainText(); QString pattern = uiWidConfig.textEdit->toPlainText();
pattern.replace(QString("\n"), QString("<br>")); pattern.replace(QString("\n"), QString("<br>"));
cg.writeEntry("textPattern", pattern); cg.writeEntry("textPattern", pattern);
@ -924,10 +907,7 @@ void Netctl::setBigInterface()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (uiWidConfig.checkBox_showBigInterface->checkState() == 0) uiWidConfig.textEdit->setDisabled(uiWidConfig.checkBox_showBigInterface->checkState() == 0);
uiWidConfig.textEdit->setDisabled(true);
else if (uiWidConfig.checkBox_showBigInterface->checkState() == 2)
uiWidConfig.textEdit->setDisabled(false);
} }
@ -935,13 +915,8 @@ void Netctl::setDataEngineExternalIp4()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (uiDEConfig.checkBox_extIp4->checkState() == 0) { uiDEConfig.lineEdit_extIp4->setDisabled(uiDEConfig.checkBox_extIp4->checkState() == 0);
uiDEConfig.lineEdit_extIp4->setDisabled(true); uiDEConfig.pushButton_extIp4->setDisabled(uiDEConfig.checkBox_extIp4->checkState() == 0);
uiDEConfig.pushButton_extIp4->setDisabled(true);
} else if (uiDEConfig.checkBox_extIp4->checkState() == 2) {
uiDEConfig.lineEdit_extIp4->setEnabled(true);
uiDEConfig.pushButton_extIp4->setEnabled(true);
}
} }
@ -949,25 +924,15 @@ void Netctl::setDataEngineExternalIp6()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (uiDEConfig.checkBox_extIp6->checkState() == 0) { uiDEConfig.lineEdit_extIp6->setDisabled(uiDEConfig.checkBox_extIp6->checkState() == 0);
uiDEConfig.lineEdit_extIp6->setDisabled(true); uiDEConfig.pushButton_extIp6->setDisabled(uiDEConfig.checkBox_extIp6->checkState() == 0);
uiDEConfig.pushButton_extIp6->setDisabled(true);
} else if (uiDEConfig.checkBox_extIp6->checkState() == 2) {
uiDEConfig.lineEdit_extIp6->setEnabled(true);
uiDEConfig.pushButton_extIp6->setEnabled(true);
}
} }
void Netctl::setHelper() void Netctl::setHelper()
{ {
if (uiWidConfig.checkBox_helper->checkState() == 0) { uiWidConfig.lineEdit_helper->setDisabled(uiWidConfig.checkBox_helper->checkState() == 0);
uiWidConfig.lineEdit_helper->setDisabled(true); uiWidConfig.pushButton_helper->setDisabled(uiWidConfig.checkBox_helper->checkState() == 0);
uiWidConfig.pushButton_helper->setDisabled(true);
} else if (uiWidConfig.checkBox_helper->checkState() == 2) {
uiWidConfig.lineEdit_helper->setEnabled(true);
uiWidConfig.pushButton_helper->setEnabled(true);
}
} }
@ -975,13 +940,8 @@ void Netctl::setSudo()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (uiWidConfig.checkBox_sudo->checkState() == 0) { uiWidConfig.lineEdit_sudo->setDisabled(uiWidConfig.checkBox_sudo->checkState() == 0);
uiWidConfig.lineEdit_sudo->setDisabled(true); uiWidConfig.pushButton_sudo->setDisabled(uiWidConfig.checkBox_sudo->checkState() == 0);
uiWidConfig.pushButton_sudo->setDisabled(true);
} else if (uiWidConfig.checkBox_sudo->checkState() == 2) {
uiWidConfig.lineEdit_sudo->setEnabled(true);
uiWidConfig.pushButton_sudo->setEnabled(true);
}
} }
@ -989,13 +949,8 @@ void Netctl::setWifi()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (uiWidConfig.checkBox_wifi->checkState() == 0) { uiWidConfig.lineEdit_wifi->setDisabled(uiWidConfig.checkBox_wifi->checkState() == 0);
uiWidConfig.lineEdit_wifi->setDisabled(true); uiWidConfig.pushButton_wifi->setDisabled(uiWidConfig.checkBox_wifi->checkState() == 0);
uiWidConfig.pushButton_wifi->setDisabled(true);
} else if (uiWidConfig.checkBox_wifi->checkState() == 2) {
uiWidConfig.lineEdit_wifi->setEnabled(true);
uiWidConfig.pushButton_wifi->setEnabled(true);
}
} }