From 03b47440975ee8361d4fbb37cfb3c269dfdc0b87 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 22 Feb 2014 03:34:04 +0400 Subject: [PATCH] wireless widget has been completed small fix --- sources/gui/src/bridgewidget.cpp | 6 +++ sources/gui/src/bridgewidget.h | 1 + sources/gui/src/ethernetwidget.cpp | 6 +++ sources/gui/src/ethernetwidget.h | 1 + sources/gui/src/generalwidget.cpp | 8 ++++ sources/gui/src/generalwidget.h | 1 + sources/gui/src/ipwidget.cpp | 13 +++++- sources/gui/src/ipwidget.h | 1 + sources/gui/src/mobilewidget.cpp | 6 +++ sources/gui/src/mobilewidget.h | 1 + sources/gui/src/pppoewidget.cpp | 6 +++ sources/gui/src/pppoewidget.h | 1 + sources/gui/src/tunnelwidget.cpp | 6 +++ sources/gui/src/tunnelwidget.h | 1 + sources/gui/src/tuntapwidget.cpp | 6 +++ sources/gui/src/tuntapwidget.h | 1 + sources/gui/src/vlanwidget.cpp | 6 +++ sources/gui/src/vlanwidget.h | 1 + sources/gui/src/wirelesswidget.cpp | 73 +++++++++++++++++++++++++++++- sources/gui/src/wirelesswidget.h | 1 + 20 files changed, 143 insertions(+), 3 deletions(-) diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp index a4934a6..90ccb3b 100644 --- a/sources/gui/src/bridgewidget.cpp +++ b/sources/gui/src/bridgewidget.cpp @@ -59,3 +59,9 @@ int BridgeWidget::isOk() // all fine return 0; } + + +void BridgeWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/bridgewidget.h b/sources/gui/src/bridgewidget.h index 7f78ccb..e91b348 100644 --- a/sources/gui/src/bridgewidget.h +++ b/sources/gui/src/bridgewidget.h @@ -34,6 +34,7 @@ public: ~BridgeWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index 3d0260a..c1922da 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -127,3 +127,9 @@ int EthernetWidget::isOk() // all fine return 0; } + + +void EthernetWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/ethernetwidget.h b/sources/gui/src/ethernetwidget.h index 6d91453..e962b8d 100644 --- a/sources/gui/src/ethernetwidget.h +++ b/sources/gui/src/ethernetwidget.h @@ -35,6 +35,7 @@ public: ~EthernetWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index 6254691..56336e8 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -49,9 +49,11 @@ void GeneralWidget::clear() ui->comboBox_interface->addItems(ifaceDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot)); ui->comboBox_bindto->clear(); ui->comboBox_bindto->addItems(ifaceDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot)); + ui->listWidget_bindto->setCurrentRow(-1); ui->listWidget_bindto->clear(); ui->comboBox_after->clear(); ui->comboBox_after->addItems(profileDirectory->entryList(QDir::Files)); + ui->listWidget_after->setCurrentRow(-1); ui->listWidget_after->clear(); ui->lineEdit_execUpPost->clear(); ui->lineEdit_execDownPre->clear(); @@ -154,3 +156,9 @@ int GeneralWidget::isOk() // all fine return 0; } + + +void GeneralWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/generalwidget.h b/sources/gui/src/generalwidget.h index cffd140..e4ac582 100644 --- a/sources/gui/src/generalwidget.h +++ b/sources/gui/src/generalwidget.h @@ -38,6 +38,7 @@ public: ~GeneralWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp index 5ddd141..80e70a2 100644 --- a/sources/gui/src/ipwidget.cpp +++ b/sources/gui/src/ipwidget.cpp @@ -44,19 +44,23 @@ void IpWidget::clear() ui->comboBox_ip->setCurrentIndex(0); changeIpMode(ui->comboBox_ip->currentIndex()); ui->lineEdit_ipAddress->clear(); + ui->listWidget_ipAddress->setCurrentRow(-1); ui->listWidget_ipAddress->clear(); ui->lineEdit_gateway->clear(); ui->lineEdit_ipRoutes->clear(); ui->lineEdit_ipRoutes2->clear(); + ui->listWidget_ipRoutes->setCurrentRow(-1); ui->listWidget_ipRoutes->clear(); ui->checkBox_ip6->setCheckState(Qt::Unchecked); ui->comboBox_ip6->setCurrentIndex(0); changeIp6Mode(ui->comboBox_ip6->currentIndex()); ui->lineEdit_ipAddress6->clear(); + ui->listWidget_ipAddress6->setCurrentRow(-1); ui->listWidget_ipAddress6->clear(); ui->lineEdit_gateway6->clear(); ui->lineEdit_ipRoutes6->clear(); ui->lineEdit_ipRoutes62->clear(); + ui->listWidget_ipRoutes6->setCurrentRow(-1); ui->listWidget_ipRoutes6->clear(); ui->lineEdit_custom->clear(); ui->listWidget_custom->clear(); @@ -70,10 +74,12 @@ void IpWidget::clear() ui->spinBox_timeoutDhcp->setValue(30); ui->checkBox_dhcp->setCheckState(Qt::Unchecked); ui->lineEdit_dns->clear(); + ui->listWidget_dns->setCurrentRow(-1); ui->listWidget_dns->clear(); ui->lineEdit_dnsDomain->clear(); ui->lineEdit_dnsSearch->clear(); ui->lineEdit_dnsOptions->clear(); + ui->listWidget_dnsOptions->setCurrentRow(-1); ui->listWidget_dnsOptions->clear(); ui->pushButton_ipAdvanced->setChecked(false);; @@ -452,7 +458,7 @@ QHash IpWidget::getSettings() QStringList dnsOpt; for (int i=0; ilistWidget_dnsOptions->count(); i++) dnsOpt.append(QString("'") + ui->listWidget_dnsOptions->item(i)->text() + QString("'")); - ipSettings[QString("DNS")] = dnsOpt.join(QString(" ")); + ipSettings[QString("DNS")] = dnsOpt.join(QString("\n")); } clear(); } @@ -479,3 +485,8 @@ int IpWidget::isOk() return 0; } + +void IpWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/ipwidget.h b/sources/gui/src/ipwidget.h index aa73244..43cb3e7 100644 --- a/sources/gui/src/ipwidget.h +++ b/sources/gui/src/ipwidget.h @@ -34,6 +34,7 @@ public: ~IpWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp index 4701792..e3085f7 100644 --- a/sources/gui/src/mobilewidget.cpp +++ b/sources/gui/src/mobilewidget.cpp @@ -130,3 +130,9 @@ int MobileWidget::isOk() // all fine return 0; } + + +void MobileWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/mobilewidget.h b/sources/gui/src/mobilewidget.h index f794f9e..9f6067b 100644 --- a/sources/gui/src/mobilewidget.h +++ b/sources/gui/src/mobilewidget.h @@ -34,6 +34,7 @@ public: ~MobileWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp index ce192e5..cd0a69c 100644 --- a/sources/gui/src/pppoewidget.cpp +++ b/sources/gui/src/pppoewidget.cpp @@ -183,3 +183,9 @@ int PppoeWidget::isOk() // all fine return 0; } + + +void PppoeWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/pppoewidget.h b/sources/gui/src/pppoewidget.h index b223b1a..e68eefc 100644 --- a/sources/gui/src/pppoewidget.h +++ b/sources/gui/src/pppoewidget.h @@ -34,6 +34,7 @@ public: ~PppoeWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/tunnelwidget.cpp b/sources/gui/src/tunnelwidget.cpp index c08e510..7dcc5b2 100644 --- a/sources/gui/src/tunnelwidget.cpp +++ b/sources/gui/src/tunnelwidget.cpp @@ -96,3 +96,9 @@ int TunnelWidget::isOk() // all fine return 0; } + + +void TunnelWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/tunnelwidget.h b/sources/gui/src/tunnelwidget.h index b01b6ca..654c76a 100644 --- a/sources/gui/src/tunnelwidget.h +++ b/sources/gui/src/tunnelwidget.h @@ -34,6 +34,7 @@ public: ~TunnelWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/tuntapwidget.cpp b/sources/gui/src/tuntapwidget.cpp index ca7bae7..752be94 100644 --- a/sources/gui/src/tuntapwidget.cpp +++ b/sources/gui/src/tuntapwidget.cpp @@ -68,3 +68,9 @@ int TuntapWidget::isOk() // all fine return 0; } + + +void TuntapWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/tuntapwidget.h b/sources/gui/src/tuntapwidget.h index bee5a46..760b79c 100644 --- a/sources/gui/src/tuntapwidget.h +++ b/sources/gui/src/tuntapwidget.h @@ -34,6 +34,7 @@ public: ~TuntapWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/vlanwidget.cpp b/sources/gui/src/vlanwidget.cpp index 4d82ca5..3451050 100644 --- a/sources/gui/src/vlanwidget.cpp +++ b/sources/gui/src/vlanwidget.cpp @@ -58,3 +58,9 @@ int VlanWidget::isOk() // all fine return 0; } + + +void VlanWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/vlanwidget.h b/sources/gui/src/vlanwidget.h index 4d3cf02..9b959bd 100644 --- a/sources/gui/src/vlanwidget.h +++ b/sources/gui/src/vlanwidget.h @@ -34,6 +34,7 @@ public: ~VlanWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear(); diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index d097c91..c0405e0 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -47,17 +47,20 @@ void WirelessWidget::clear() changeSecurity(ui->comboBox_security->currentIndex()); ui->lineEdit_essid->clear(); ui->lineEdit_wpaConfigSection->clear(); + ui->listWidget_wpaConfigSection->setCurrentRow(-1); ui->listWidget_wpaConfigSection->clear(); ui->lineEdit_wpaConfig->setText(QString("/etc/wpa_supplicant.conf")); ui->lineEdit_key->clear(); ui->checkBox_hidden->setCheckState(Qt::Unchecked); ui->checkBox_adhoc->setCheckState(Qt::Unchecked); ui->spinBox_freq->setValue(2412); + ui->listWidget_freq->setCurrentRow(-1); ui->listWidget_freq->clear(); ui->spinBox_priority->setValue(0); ui->lineEdit_country->clear(); - ui->lineEdit_wpaGroup->clear(); + ui->lineEdit_wpaGroup->setText(QString("wheel")); ui->comboBox_drivers->setCurrentIndex(0); + ui->listWidget_drivers->setCurrentRow(-1); ui->listWidget_drivers->clear(); ui->comboBox_rfkill->addItem(QString("auto")); if (rfkillDirectory->exists()) { @@ -193,7 +196,47 @@ QHash WirelessWidget::getSettings() QHash wirelessSettings; if (isOk() == 0) { -// wirelessSettings[QString("VLANID")] = QString(ui->spinBox_vlan->value()); + wirelessSettings[QString("Security")] = ui->comboBox_security->currentText(); + wirelessSettings[QString("ESSID")] = QString("'") + ui->lineEdit_essid->text() + QString("'"); + if ((ui->comboBox_security->currentIndex() == 1) || + (ui->comboBox_security->currentIndex() == 2)) + wirelessSettings[QString("Key")] = QString("'") + ui->lineEdit_key->text() + QString("'"); + if (ui->comboBox_security->currentIndex() == 3) { + QStringList section; + for (int i=0; ilistWidget_wpaConfigSection->count(); i++) + section.append(QString("'") + ui->listWidget_wpaConfigSection->item(i)->text() + QString("'")); + wirelessSettings[QString("WPAConfigSection")] = QString("\n") + section.join(QString("\n")) + QString("\n"); + } + if (ui->comboBox_security->currentIndex() == 4) + wirelessSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'"); + if (ui->checkBox_hidden->checkState() == Qt::Checked) + wirelessSettings[QString("Hidden")] = QString("yes"); + if (ui->checkBox_hidden->checkState() == Qt::Checked) + wirelessSettings[QString("AdHoc")] = QString("yes"); + if (ui->listWidget_freq->count() != 0) { + QStringList freqs; + for (int i=0; ilistWidget_freq->count(); i++) + freqs.append(ui->listWidget_freq->item(i)->text()); + wirelessSettings[QString("ScanFrequencies")] = freqs.join(QString(" ")); + } + if (ui->spinBox_priority->value() != 0) + wirelessSettings[QString("Priority")] = QString(ui->spinBox_priority->value()); + if (!ui->lineEdit_country->text().isEmpty()) + wirelessSettings[QString("Country")] = QString("'") + ui->lineEdit_country->text() + QString("'"); + if (!ui->lineEdit_wpaGroup->text().isEmpty()) + wirelessSettings[QString("WPAGroup")] = QString("'") + ui->lineEdit_wpaGroup->text() + QString("'"); + if (ui->listWidget_drivers->count() != 0) { + QStringList drivers; + for (int i=0; ilistWidget_drivers->count(); i++) + drivers.append(ui->listWidget_drivers->item(i)->text()); + wirelessSettings[QString("WPADriver")] = QString("'") + drivers.join(QString(",")) + QString("'"); + } + if (ui->comboBox_rfkill->currentIndex() != 0) + wirelessSettings[QString("RFKill")] = ui->comboBox_rfkill->currentText(); + if (ui->spinBox_timeoutWpa->value() != 15) + wirelessSettings[QString("TimeoutWPA")] = QString(ui->spinBox_timeoutWpa->value()); + if (ui->checkBox_exclude->checkState() == Qt::Checked) + wirelessSettings[QString("ExcludeAuto")] = QString("yes"); clear(); } @@ -203,6 +246,32 @@ QHash WirelessWidget::getSettings() int WirelessWidget::isOk() { + // empty key + if ((ui->comboBox_security->currentIndex() == 1) || + (ui->comboBox_security->currentIndex() == 2)) + if (ui->lineEdit_key->text().isEmpty()) + return 1; + // empty settings + if (ui->comboBox_security->currentIndex() == 3) + if (ui->listWidget_wpaConfigSection->count() == 0) + return 2; + // file is not set + if (ui->comboBox_security->currentIndex() == 4) + if (ui->lineEdit_wpaConfig->text().isEmpty()) + return 3; + // file wpa_supplicant doesn't exists + if (!ui->lineEdit_wpaConfig->text().isEmpty()) + if (!QFile(ui->lineEdit_wpaConfig->text()).exists()) + return 4; + // essid is not set + if (ui->lineEdit_essid->text().isEmpty()) + return 5; // all fine return 0; } + + +void WirelessWidget::setSettings(QHash settings) +{ + +} diff --git a/sources/gui/src/wirelesswidget.h b/sources/gui/src/wirelesswidget.h index 8c830bf..eba53b6 100644 --- a/sources/gui/src/wirelesswidget.h +++ b/sources/gui/src/wirelesswidget.h @@ -36,6 +36,7 @@ public: ~WirelessWidget(); QHash getSettings(); int isOk(); + void setSettings(QHash settings); public slots: void clear();