diff --git a/sources/gui/show_scripts b/sources/gui/show_scripts deleted file mode 100755 index 33626ea..0000000 --- a/sources/gui/show_scripts +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -kate /usr/lib/network/wpa /usr/lib/network/globals /usr/bin/wifi-menu &> /dev/null - diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp index 28067ec..3484989 100644 --- a/sources/gui/src/bridgewidget.cpp +++ b/sources/gui/src/bridgewidget.cpp @@ -49,9 +49,9 @@ void BridgeWidget::setShown(bool state) } -QHash BridgeWidget::getSettings() +QMap BridgeWidget::getSettings() { - QHash bridgeSettings; + QMap bridgeSettings; if (isOk() == 0) { if (ui->checkBox_skip->checkState() == Qt::Checked) @@ -69,7 +69,7 @@ int BridgeWidget::isOk() } -void BridgeWidget::setSettings(QHash settings) +void BridgeWidget::setSettings(QMap settings) { if (settings.contains(QString("SkipForwardingDelay"))) if (settings[QString("SkipForwardingDelay")].remove(QString("'")) == QString("yes")) diff --git a/sources/gui/src/bridgewidget.h b/sources/gui/src/bridgewidget.h index f4dbb92..d25bd7a 100644 --- a/sources/gui/src/bridgewidget.h +++ b/sources/gui/src/bridgewidget.h @@ -32,9 +32,9 @@ class BridgeWidget : public QWidget public: explicit BridgeWidget(QWidget *parent = 0); ~BridgeWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index a6da1b8..cc70978 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -105,9 +105,9 @@ void EthernetWidget::showWpa(int state) } -QHash EthernetWidget::getSettings() +QMap EthernetWidget::getSettings() { - QHash ethernetSettings; + QMap ethernetSettings; if (isOk() == 0) { if (ui->checkBox_skip->checkState() == Qt::Checked) @@ -138,7 +138,7 @@ int EthernetWidget::isOk() } -void EthernetWidget::setSettings(QHash settings) +void EthernetWidget::setSettings(QMap settings) { if (settings.contains(QString("SkipNoCarrier"))) if (settings[QString("SkipNoCarrier")].remove(QString("'")) == QString("yes")) diff --git a/sources/gui/src/ethernetwidget.h b/sources/gui/src/ethernetwidget.h index 8bb858f..a32f0d4 100644 --- a/sources/gui/src/ethernetwidget.h +++ b/sources/gui/src/ethernetwidget.h @@ -18,7 +18,7 @@ #ifndef ETHERNETWIDGET_H #define ETHERNETWIDGET_H -#include +#include #include @@ -33,9 +33,9 @@ class EthernetWidget : public QWidget public: explicit EthernetWidget(QWidget *parent = 0); ~EthernetWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index 43f127a..2bd7f94 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -121,9 +121,9 @@ void GeneralWidget::showAdvanced() } -QHash GeneralWidget::getSettings() +QMap GeneralWidget::getSettings() { - QHash generalSettings; + QMap generalSettings; if (isOk() == 0) { generalSettings[QString("Description")] = QString("'") + ui->lineEdit_description->text() + QString("'"); @@ -147,6 +147,8 @@ QHash GeneralWidget::getSettings() generalSettings[QString("ExecDownPre")] = QString("'") + ui->lineEdit_execDownPre->text() + QString("'"); if (ui->checkBox_forceConnect->checkState() == Qt::Checked) generalSettings[QString("ForceConnect")] = QString("yes"); + if (ui->checkBox_debug->checkState() == Qt::Checked) + generalSettings[QString("NETCTL_DEBUG")] = QString("yes"); } return generalSettings; @@ -168,7 +170,7 @@ int GeneralWidget::isOk() } -void GeneralWidget::setSettings(QHash settings) +void GeneralWidget::setSettings(QMap settings) { if (settings.contains(QString("Description"))) ui->lineEdit_description->setText(settings[QString("Description")].remove(QString("'"))); @@ -191,4 +193,7 @@ void GeneralWidget::setSettings(QHash settings) if (settings.contains(QString("ForceConnect"))) if (settings[QString("ForceConnect")].remove(QString("'")) == QString("yes")) ui->checkBox_forceConnect->setCheckState(Qt::Checked); + if (settings.contains(QString("NETCTL_DEBUG"))) + if (settings[QString("NETCTL_DEBUG")].remove(QString("'")) == QString("yes")) + ui->checkBox_debug->setCheckState(Qt::Checked); } diff --git a/sources/gui/src/generalwidget.h b/sources/gui/src/generalwidget.h index 3846fdf..3b4182c 100644 --- a/sources/gui/src/generalwidget.h +++ b/sources/gui/src/generalwidget.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include @@ -38,9 +38,9 @@ public: QString profileDir = QString("")); ~GeneralWidget(); QComboBox *connectionType; - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/generalwidget.ui b/sources/gui/src/generalwidget.ui index 485ea6c..9d4b489 100644 --- a/sources/gui/src/generalwidget.ui +++ b/sources/gui/src/generalwidget.ui @@ -333,6 +333,13 @@ + + + + Debug mode + + + diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp index 031b393..96a47e3 100644 --- a/sources/gui/src/ipwidget.cpp +++ b/sources/gui/src/ipwidget.cpp @@ -376,9 +376,9 @@ void IpWidget::showAdvanced() } -QHash IpWidget::getSettings() +QMap IpWidget::getSettings() { - QHash ipSettings; + QMap ipSettings; if (isOk() == 0) { if (ui->checkBox_ip->checkState() == Qt::Checked) { @@ -485,7 +485,7 @@ int IpWidget::isOk() } -void IpWidget::setSettings(QHash settings) +void IpWidget::setSettings(QMap settings) { if (settings.contains(QString("IP"))) { if (settings[QString("IP")].remove(QString("'")) == QString("no")) diff --git a/sources/gui/src/ipwidget.h b/sources/gui/src/ipwidget.h index e9d0265..ae23776 100644 --- a/sources/gui/src/ipwidget.h +++ b/sources/gui/src/ipwidget.h @@ -32,9 +32,9 @@ class IpWidget : public QWidget public: explicit IpWidget(QWidget *parent = 0); ~IpWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index aade1e0..849a76a 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -680,10 +680,10 @@ void MainWindow::profileTabCreateProfile() ui->tabWidget->setDisabled(true); // read settings QString profile = ui->lineEdit_profile->text(); - QHash settings; + QMap settings; settings = generalWid->getSettings(); if (generalWid->connectionType->currentText() == QString("ethernet")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -691,7 +691,7 @@ void MainWindow::profileTabCreateProfile() settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]); } else if (generalWid->connectionType->currentText() == QString("wireless")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -700,12 +700,12 @@ void MainWindow::profileTabCreateProfile() } else if ((generalWid->connectionType->currentText() == QString("bond")) || (generalWid->connectionType->currentText() == QString("dummy"))) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; iconnectionType->currentText() == QString("bridge")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -713,17 +713,17 @@ void MainWindow::profileTabCreateProfile() settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]); } else if (generalWid->connectionType->currentText() == QString("pppoe")) { - QHash addSettings = pppoeWid->getSettings(); + QMap addSettings = pppoeWid->getSettings(); for (int i=0; iconnectionType->currentText() == QString("mobile_ppp")) { - QHash addSettings = mobileWid->getSettings(); + QMap addSettings = mobileWid->getSettings(); for (int i=0; iconnectionType->currentText() == QString("tunnel")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -731,7 +731,7 @@ void MainWindow::profileTabCreateProfile() settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]); } else if (generalWid->connectionType->currentText() == QString("tuntap")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -739,7 +739,7 @@ void MainWindow::profileTabCreateProfile() settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]); } else if (generalWid->connectionType->currentText() == QString("vlan")) { - QHash addSettings = ipWid->getSettings(); + QMap addSettings = ipWid->getSettings(); for (int i=0; igetSettings(); @@ -764,7 +764,7 @@ void MainWindow::profileTabCreateProfile() void MainWindow::profileTabLoadProfile() { QString profile = ui->lineEdit_profile->text(); - QHash settings = netctlProfile->getSettingsFromProfile(profile); + QMap settings = netctlProfile->getSettingsFromProfile(profile); generalWid->setSettings(settings); if (generalWid->connectionType->currentText() == QString("ethernet")) { @@ -827,7 +827,7 @@ void MainWindow::connectToUnknownEssid(QString passwd) if (!passwd.isEmpty()) delete passwdWid; - QHash settings; + QMap settings; settings[QString("Description")] = QString("'Automatically generated profile by Netctl GUI'"); settings[QString("Interface")] = wpaCommand->getInterfaceList()[0]; settings[QString("Connection")] = QString("wireless"); diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp index 9db7ccd..9be26a3 100644 --- a/sources/gui/src/mobilewidget.cpp +++ b/sources/gui/src/mobilewidget.cpp @@ -97,9 +97,9 @@ void MobileWidget::showAdvanced() } -QHash MobileWidget::getSettings() +QMap MobileWidget::getSettings() { - QHash mobileSettings; + QMap mobileSettings; if (isOk() == 0) { if (!ui->lineEdit_username->text().isEmpty()) @@ -140,7 +140,7 @@ int MobileWidget::isOk() } -void MobileWidget::setSettings(QHash settings) +void MobileWidget::setSettings(QMap settings) { if (settings.contains(QString("User"))) ui->lineEdit_username->setText(settings[QString("User")].remove(QString("'"))); diff --git a/sources/gui/src/mobilewidget.h b/sources/gui/src/mobilewidget.h index 5dc6fcb..cbeb60e 100644 --- a/sources/gui/src/mobilewidget.h +++ b/sources/gui/src/mobilewidget.h @@ -32,9 +32,9 @@ class MobileWidget : public QWidget public: explicit MobileWidget(QWidget *parent = 0); ~MobileWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/netctlprofile.cpp b/sources/gui/src/netctlprofile.cpp index 41ea101..ac331c6 100644 --- a/sources/gui/src/netctlprofile.cpp +++ b/sources/gui/src/netctlprofile.cpp @@ -54,7 +54,7 @@ bool NetctlProfile::copyProfile(QString oldPath) } -QString NetctlProfile::createProfile(QString profile, QHash settings) +QString NetctlProfile::createProfile(QString profile, QMap settings) { QString profileTempName = QDir::homePath() + QDir::separator() + @@ -88,9 +88,9 @@ QString NetctlProfile::createProfile(QString profile, QHash se } -QHash NetctlProfile::getSettingsFromProfile(QString profile) +QMap NetctlProfile::getSettingsFromProfile(QString profile) { - QHash settings; + QMap settings; QFile profileFile; QString fileStr; diff --git a/sources/gui/src/netctlprofile.h b/sources/gui/src/netctlprofile.h index 40de89a..187699c 100644 --- a/sources/gui/src/netctlprofile.h +++ b/sources/gui/src/netctlprofile.h @@ -34,8 +34,8 @@ public: QString sudoPath = QString("")); ~NetctlProfile(); bool copyProfile(QString oldPath); - QString createProfile(QString profile, QHash settings); - QHash getSettingsFromProfile(QString profile); + QString createProfile(QString profile, QMap settings); + QMap getSettingsFromProfile(QString profile); private: MainWindow *parent; diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp index 51b96cc..e84ee7f 100644 --- a/sources/gui/src/pppoewidget.cpp +++ b/sources/gui/src/pppoewidget.cpp @@ -125,9 +125,9 @@ void PppoeWidget::showAdvanced() } -QHash PppoeWidget::getSettings() +QMap PppoeWidget::getSettings() { - QHash pppoeSettings; + QMap pppoeSettings; if (isOk() == 0) { if (!ui->lineEdit_username->text().isEmpty()) @@ -193,7 +193,7 @@ int PppoeWidget::isOk() } -void PppoeWidget::setSettings(QHash settings) +void PppoeWidget::setSettings(QMap settings) { if (settings.contains(QString("User"))) ui->lineEdit_username->setText(settings[QString("User")].remove(QString("'"))); diff --git a/sources/gui/src/pppoewidget.h b/sources/gui/src/pppoewidget.h index a73f3de..df0ecf4 100644 --- a/sources/gui/src/pppoewidget.h +++ b/sources/gui/src/pppoewidget.h @@ -32,9 +32,9 @@ class PppoeWidget : public QWidget public: explicit PppoeWidget(QWidget *parent = 0); ~PppoeWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/tunnelwidget.cpp b/sources/gui/src/tunnelwidget.cpp index 6477c7f..8177abd 100644 --- a/sources/gui/src/tunnelwidget.cpp +++ b/sources/gui/src/tunnelwidget.cpp @@ -83,9 +83,9 @@ QString TunnelWidget::getIp(QString rawIp) } -QHash TunnelWidget::getSettings() +QMap TunnelWidget::getSettings() { - QHash tunnelSettings; + QMap tunnelSettings; if (isOk() == 0) { tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'"); @@ -106,7 +106,7 @@ int TunnelWidget::isOk() } -void TunnelWidget::setSettings(QHash settings) +void TunnelWidget::setSettings(QMap settings) { if (settings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) diff --git a/sources/gui/src/tunnelwidget.h b/sources/gui/src/tunnelwidget.h index 6ffc82e..d4f6c82 100644 --- a/sources/gui/src/tunnelwidget.h +++ b/sources/gui/src/tunnelwidget.h @@ -32,9 +32,9 @@ class TunnelWidget : public QWidget public: explicit TunnelWidget(QWidget *parent = 0); ~TunnelWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/tuntapwidget.cpp b/sources/gui/src/tuntapwidget.cpp index d08f989..5d79dec 100644 --- a/sources/gui/src/tuntapwidget.cpp +++ b/sources/gui/src/tuntapwidget.cpp @@ -51,9 +51,9 @@ void TuntapWidget::setShown(bool state) } -QHash TuntapWidget::getSettings() +QMap TuntapWidget::getSettings() { - QHash tuntapSettings; + QMap tuntapSettings; if (isOk() == 0) { tuntapSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'"); @@ -78,7 +78,7 @@ int TuntapWidget::isOk() } -void TuntapWidget::setSettings(QHash settings) +void TuntapWidget::setSettings(QMap settings) { if (settings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) diff --git a/sources/gui/src/tuntapwidget.h b/sources/gui/src/tuntapwidget.h index 1c8a153..e837566 100644 --- a/sources/gui/src/tuntapwidget.h +++ b/sources/gui/src/tuntapwidget.h @@ -32,9 +32,9 @@ class TuntapWidget : public QWidget public: explicit TuntapWidget(QWidget *parent = 0); ~TuntapWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/vlanwidget.cpp b/sources/gui/src/vlanwidget.cpp index 141b9ba..9c7dc63 100644 --- a/sources/gui/src/vlanwidget.cpp +++ b/sources/gui/src/vlanwidget.cpp @@ -49,9 +49,9 @@ void VlanWidget::setShown(bool state) } -QHash VlanWidget::getSettings() +QMap VlanWidget::getSettings() { - QHash vlanSettings; + QMap vlanSettings; if (isOk() == 0) { vlanSettings[QString("VLANID")] = QString(ui->spinBox_vlan->value()); @@ -68,7 +68,7 @@ int VlanWidget::isOk() } -void VlanWidget::setSettings(QHash settings) +void VlanWidget::setSettings(QMap settings) { if (settings.contains(QString("VLANID"))) ui->spinBox_vlan->setValue(settings[QString("VLANID")].toInt()); diff --git a/sources/gui/src/vlanwidget.h b/sources/gui/src/vlanwidget.h index 318d41d..540938b 100644 --- a/sources/gui/src/vlanwidget.h +++ b/sources/gui/src/vlanwidget.h @@ -32,9 +32,9 @@ class VlanWidget : public QWidget public: explicit VlanWidget(QWidget *parent = 0); ~VlanWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear(); diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index d4dcea0..d765707 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -205,9 +205,9 @@ void WirelessWidget::showAdvanced() } -QHash WirelessWidget::getSettings() +QMap WirelessWidget::getSettings() { - QHash wirelessSettings; + QMap wirelessSettings; if (isOk() == 0) { wirelessSettings[QString("Security")] = ui->comboBox_security->currentText(); @@ -288,7 +288,7 @@ int WirelessWidget::isOk() } -void WirelessWidget::setSettings(QHash settings) +void WirelessWidget::setSettings(QMap settings) { if (settings.contains(QString("Security"))) for (int i=0; icomboBox_security->count(); i++) diff --git a/sources/gui/src/wirelesswidget.h b/sources/gui/src/wirelesswidget.h index 9f3e8f9..69a6c20 100644 --- a/sources/gui/src/wirelesswidget.h +++ b/sources/gui/src/wirelesswidget.h @@ -34,9 +34,9 @@ public: explicit WirelessWidget(QWidget *parent = 0, QString rfkillDir = QString("")); ~WirelessWidget(); - QHash getSettings(); + QMap getSettings(); int isOk(); - void setSettings(QHash settings); + void setSettings(QMap settings); public slots: void clear();