deSettings;
deSettings[QString("CMD")] = uiDEConfig.lineEdit_netctl->text();
deSettings[QString("NETCTLAUTOCMD")] = uiDEConfig.lineEdit_netctlAuto->text();
- deSettings[QString("IPCMD")] = uiDEConfig.lineEdit_ip->text();
- deSettings[QString("NETDIR")] = uiDEConfig.lineEdit_interface->text();
if (uiDEConfig.checkBox_extIp->checkState() == 0)
deSettings[QString("EXTIP")] = QString("false");
else
deSettings[QString("EXTIP")] = QString("true");
deSettings[QString("EXTIPCMD")] = uiDEConfig.lineEdit_extIp->text();
+ if (uiDEConfig.checkBox_extIp6->checkState() == 0)
+ deSettings[QString("EXTIP6")] = QString("false");
+ else
+ deSettings[QString("EXTIP6")] = QString("true");
+ deSettings[QString("EXTIP6CMD")] = uiDEConfig.lineEdit_extIp6->text();
writeDataEngineConfiguration(deSettings);
}
@@ -810,11 +822,10 @@ void Netctl::configChanged()
paths[QString("wifi")] = cg.readEntry("wifiPath", "/usr/bin/netctl-gui -t 3");
useSudo = cg.readEntry("useSudo", true);
useWifi = cg.readEntry("useWifi", false);
- bigInterface[QString("main")] = cg.readEntry("showBigInterface", true);
- bigInterface[QString("extIp")] = cg.readEntry("showExtIp", false);
- bigInterface[QString("netDev")] = cg.readEntry("showNetDev", true);
- bigInterface[QString("intIp")] = cg.readEntry("showIntIp", true);
+ bigInterface = cg.readEntry("showBigInterface", true);
+ textPattern = cg.readEntry("textPattern", "$current $status
IPv4: $intip4
IPv6: $intip6");
+ QString textAlign = cg.readEntry("textAlign", "center");
QString fontFamily = cg.readEntry("fontFamily", "Terminus");
int fontSize = cg.readEntry("fontSize", 10);
QString fontColor = cg.readEntry("fontColor", "#000000");
@@ -825,13 +836,17 @@ void Netctl::configChanged()
paths[QString("inactive")] = cg.readEntry("inactiveIconPath",
"/usr/share/icons/hicolor/64x64/apps/netctl-offline.png");
- formatLine[0] = ("");
- formatLine[1] = ("
");
+ formatLine[0] = QString("\
+\
+")
+ .arg(textAlign)
+ .arg(fontFamily)
+ .arg(QString::number(fontSize))
+ .arg(QString::number(fontWeight))
+ .arg(fontStyle)
+ .arg(fontColor);
+ formatLine[1] = QString("
");
+
connectToEngine();
}
@@ -840,16 +855,10 @@ void Netctl::setBigInterface()
{
if (debug) qDebug() << "[PLASMOID]" << "[setBigInterface]";
- if (uiWidConfig.checkBox_showBigInterface->checkState() == 0) {
- uiWidConfig.checkBox_showNetDev->setDisabled(true);
- uiWidConfig.checkBox_showExtIp->setDisabled(true);
- uiWidConfig.checkBox_showIntIp->setDisabled(true);
- }
- else if (uiWidConfig.checkBox_showBigInterface->checkState() == 2) {
- uiWidConfig.checkBox_showNetDev->setEnabled(true);
- uiWidConfig.checkBox_showExtIp->setEnabled(true);
- uiWidConfig.checkBox_showIntIp->setEnabled(true);
- }
+ if (uiWidConfig.checkBox_showBigInterface->checkState() == 0)
+ uiWidConfig.textEdit->setDisabled(true);
+ else if (uiWidConfig.checkBox_showBigInterface->checkState() == 2)
+ uiWidConfig.textEdit->setDisabled(false);
}
@@ -868,6 +877,21 @@ void Netctl::setDataEngineExternalIp()
}
+void Netctl::setDataEngineExternalIp6()
+{
+ if (debug) qDebug() << "[PLASMOID]" << "[setDataEngineExternalIp6]";
+
+ if (uiDEConfig.checkBox_extIp6->checkState() == 0) {
+ uiDEConfig.lineEdit_extIp6->setDisabled(true);
+ uiDEConfig.pushButton_extIp6->setDisabled(true);
+ }
+ else if (uiDEConfig.checkBox_extIp6->checkState() == 2) {
+ uiDEConfig.lineEdit_extIp6->setEnabled(true);
+ uiDEConfig.pushButton_extIp6->setEnabled(true);
+ }
+}
+
+
void Netctl::setSudo()
{
if (debug) qDebug() << "[PLASMOID]" << "[setSudo]";
diff --git a/sources/plasmoid/netctl.h b/sources/plasmoid/netctl.h
index bc35479..ddf08a5 100644
--- a/sources/plasmoid/netctl.h
+++ b/sources/plasmoid/netctl.h
@@ -55,6 +55,7 @@ public:
Netctl(QObject *parent, const QVariantList &args);
~Netctl();
void init();
+ QString parsePattern(const QString rawLine);
QMap readDataEngineConfiguration();
void writeDataEngineConfiguration(const QMap settings);
QMap updateDataEngineConfiguration(const QMap rawConfig);
@@ -71,6 +72,7 @@ public slots:
void configChanged();
void setBigInterface();
void setDataEngineExternalIp();
+ void setDataEngineExternalIp6();
void setSudo();
void setWifi();
@@ -117,9 +119,10 @@ private:
Ui::ConfigWindow uiWidConfig;
Ui::About uiAboutConfig;
// configuration
- bool debug;
int autoUpdateInterval;
- QMap bigInterface;
+ bool bigInterface;
+ bool debug;
+ QString textPattern;
QStringList formatLine;
QMap paths;
bool useSudo, useWifi;
diff --git a/sources/plasmoid/widget.ui b/sources/plasmoid/widget.ui
index c65895b..ea12e4d 100644
--- a/sources/plasmoid/widget.ui
+++ b/sources/plasmoid/widget.ui
@@ -7,7 +7,7 @@
0
0
480
- 337
+ 335