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

release 1.4.1

Browse Source
This commit is contained in:
arcan1s
2015-03-20 00:20:44 +03:00
parent b7fa17df4e
commit 824a11457b
12 changed files with 256 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,8 @@ void Netctl::init()
layout->addWidget(iconLabel);
textLabel = new QLabel(graphicsWidget);
layout->addWidget(textLabel);
graphicsWidget->adjustSize();
resize(0, 0);
// read variables
configChanged();
}
@ -209,20 +211,6 @@ void Netctl::updateIcon()
}
void Netctl::updateInterface(bool setShown)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "State" << setShown;
if (setShown)
layout->addWidget(textLabel);
else
layout->removeWidget(textLabel);
graphicsWidget->adjustSize();
resize(0, 0);
}
// context menu
void Netctl::enableProfileSlot()
{
@ -439,11 +427,12 @@ void Netctl::createActions()
menuActions.clear();
contextMenu[QString("title")] = new QAction(QString("netctl-gui"), this);
connect(contextMenu[QString("title")], SIGNAL(triggered(bool)), this, SLOT(showGui()));
menuActions.append(contextMenu[QString("title")]);
contextMenu[QString("start")] = new QAction(i18n("Start profile"), this);
contextMenu[QString("start")]->setIcon(QIcon::fromTheme("dialog-apply"));
startProfileMenu = new QMenu(NULL);
startProfileMenu = new QMenu(nullptr);
contextMenu[QString("start")]->setMenu(startProfileMenu);
connect(startProfileMenu, SIGNAL(triggered(QAction *)), this,
SLOT(startProfileSlot(QAction *)));
@ -461,7 +450,7 @@ void Netctl::createActions()
contextMenu[QString("switch")] = new QAction(i18n("Switch to profile"), this);
contextMenu[QString("switch")]->setIcon(QIcon::fromTheme("dialog-apply"));
switchToProfileMenu = new QMenu(NULL);
switchToProfileMenu = new QMenu(nullptr);
contextMenu[QString("switch")]->setMenu(switchToProfileMenu);
connect(switchToProfileMenu, SIGNAL(triggered(QAction *)), this,
SLOT(switchToProfileSlot(QAction *)));
@ -476,11 +465,6 @@ void Netctl::createActions()
connect(contextMenu[QString("enable")], SIGNAL(triggered(bool)), this, SLOT(enableProfileSlot()));
menuActions.append(contextMenu[QString("enable")]);
contextMenu[QString("gui")] = new QAction(i18n("Show netctl-gui"), this);
contextMenu[QString("gui")]->setIcon(QIcon(":icon"));
connect(contextMenu[QString("gui")], SIGNAL(triggered(bool)), this, SLOT(showGui()));
menuActions.append(contextMenu[QString("gui")]);
contextMenu[QString("wifi")] = new QAction(i18n("Show WiFi menu"), this);
contextMenu[QString("wifi")]->setIcon(QIcon(":wifi"));
connect(contextMenu[QString("wifi")], SIGNAL(triggered(bool)), this, SLOT(showWifi()));
@ -541,7 +525,6 @@ void Netctl::connectToEngine()
netctlEngine->connectSource(QString("intip6"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("profiles"), this, autoUpdateInterval);
netctlEngine->connectSource(QString("status"), this, autoUpdateInterval);
updateInterface(bigInterface);
}
@ -577,8 +560,7 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
} else if (sourceName == QString("info")) {
info[QString("info")] = value;
// update text
if (bigInterface)
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
} else if (sourceName == QString("interfaces")) {
info[QString("interfaces")] = value;
} else if (sourceName == QString("intip4")) {
@ -610,8 +592,6 @@ void Netctl::disconnectFromEngine()
netctlEngine->disconnectSource(QString("profiles"), this);
netctlEngine->disconnectSource(QString("statusBool"), this);
netctlEngine->disconnectSource(QString("statusString"), this);
updateInterface(false);
}
@ -708,13 +688,8 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
uiWidConfig.checkBox_wifi->setCheckState(Qt::Unchecked);
uiWidConfig.lineEdit_wifi->setText(paths[QString("wifi")]);
setWifi();
if (bigInterface)
uiWidConfig.checkBox_showBigInterface->setCheckState(Qt::Checked);
else
uiWidConfig.checkBox_showBigInterface->setCheckState(Qt::Unchecked);
QString pattern = textPattern;
uiWidConfig.textEdit->setPlainText(pattern.replace(QString("<br>"), QString("\n")));
setBigInterface();
KConfigGroup cg = config();
QString textAlign = cg.readEntry("textAlign", "center");
@ -784,8 +759,6 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
parent->addPage(aboutWidget, i18n("About"), QString("help-about"));
connect(uiWidConfig.checkBox_helper, SIGNAL(stateChanged(int)), this, SLOT(setHelper()));
connect(uiWidConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this,
SLOT(setBigInterface()));
connect(uiWidConfig.checkBox_sudo, SIGNAL(stateChanged(int)), this, SLOT(setSudo()));
connect(uiWidConfig.checkBox_wifi, SIGNAL(stateChanged(int)), this, SLOT(setWifi()));
connect(uiDEConfig.checkBox_extIp4, SIGNAL(stateChanged(int)), this, SLOT(setDataEngineExternalIp4()));
@ -826,7 +799,6 @@ void Netctl::configAccepted()
cg.writeEntry("sudoPath", uiWidConfig.lineEdit_sudo->text());
cg.writeEntry("useWifi", (uiWidConfig.checkBox_wifi->checkState() != 0));
cg.writeEntry("wifiPath", uiWidConfig.lineEdit_wifi->text());
cg.writeEntry("showBigInterface", (uiWidConfig.checkBox_showBigInterface->checkState() != 0));
QString pattern = uiWidConfig.textEdit->toPlainText();
pattern.replace(QString("\n"), QString("<br>"));
cg.writeEntry("textPattern", pattern);
@ -872,7 +844,6 @@ 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 = cg.readEntry("showBigInterface", true);
useHelper = cg.readEntry("useHelper", true);
textPattern = cg.readEntry("textPattern", "$info<br>IPv4: $intip4<br>IPv6: $intip6");
@ -904,14 +875,6 @@ void Netctl::configChanged()
}
void Netctl::setBigInterface()
{
if (debug) qDebug() << PDEBUG;
uiWidConfig.textEdit->setDisabled(uiWidConfig.checkBox_showBigInterface->checkState() == 0);
}
void Netctl::setDataEngineExternalIp4()
{
if (debug) qDebug() << PDEBUG;

3
sources/plasmoid-kde4/netctl.h
View File

@ -68,7 +68,6 @@ public slots:
// configuration interface
void configAccepted();
void configChanged();
void setBigInterface();
void setDataEngineExternalIp4();
void setDataEngineExternalIp6();
void setHelper();
@ -78,7 +77,6 @@ public slots:
private slots:
// ui
void updateIcon();
void updateInterface(bool setHidden);
// configuration interface
void selectAbstractSomething();
// context menu
@ -124,7 +122,6 @@ private:
Ui::About uiAboutConfig;
// configuration
int autoUpdateInterval = 1000;
bool bigInterface = true;
bool debug = false;
QString textPattern = QString();
QStringList formatLine;

30
sources/plasmoid-kde4/widget.ui
View File

@ -329,36 +329,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_showBigInterface">
<item>
<widget class="QLabel" name="label_showBigInterface">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_showBigInterface">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Show more detailed interface</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPlainTextEdit" name="textEdit">
<property name="toolTip">