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

wireless widget has been completed

Browse Source 
small fix
This commit is contained in:
arcan1s 2014-02-22 03:34:04 +04:00
parent 23df40960c
commit 03b4744097
20 changed files with 143 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/gui/src/bridgewidget.cpp
View File

@ -59,3 +59,9 @@ int BridgeWidget::isOk()
// all fine
return 0;
}
void BridgeWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/bridgewidget.h
View File

@ -34,6 +34,7 @@ public:
~BridgeWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/ethernetwidget.cpp
View File

@ -127,3 +127,9 @@ int EthernetWidget::isOk()
// all fine
return 0;
}
void EthernetWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/ethernetwidget.h
View File

@ -35,6 +35,7 @@ public:
~EthernetWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

8
sources/gui/src/generalwidget.cpp
View File

@ -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<QString, QString> settings)
{
}

1
sources/gui/src/generalwidget.h
View File

@ -38,6 +38,7 @@ public:
~GeneralWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

13
sources/gui/src/ipwidget.cpp
View File

@ -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<QString, QString> IpWidget::getSettings()
QStringList dnsOpt;
for (int i=0; i<ui->listWidget_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<QString, QString> settings)
{
}

1
sources/gui/src/ipwidget.h
View File

@ -34,6 +34,7 @@ public:
~IpWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/mobilewidget.cpp
View File

@ -130,3 +130,9 @@ int MobileWidget::isOk()
// all fine
return 0;
}
void MobileWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/mobilewidget.h
View File

@ -34,6 +34,7 @@ public:
~MobileWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/pppoewidget.cpp
View File

@ -183,3 +183,9 @@ int PppoeWidget::isOk()
// all fine
return 0;
}
void PppoeWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/pppoewidget.h
View File

@ -34,6 +34,7 @@ public:
~PppoeWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/tunnelwidget.cpp
View File

@ -96,3 +96,9 @@ int TunnelWidget::isOk()
// all fine
return 0;
}
void TunnelWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/tunnelwidget.h
View File

@ -34,6 +34,7 @@ public:
~TunnelWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/tuntapwidget.cpp
View File

@ -68,3 +68,9 @@ int TuntapWidget::isOk()
// all fine
return 0;
}
void TuntapWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/tuntapwidget.h
View File

@ -34,6 +34,7 @@ public:
~TuntapWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/vlanwidget.cpp
View File

@ -58,3 +58,9 @@ int VlanWidget::isOk()
// all fine
return 0;
}
void VlanWidget::setSettings(QHash<QString, QString> settings)
{
}

1
sources/gui/src/vlanwidget.h
View File

@ -34,6 +34,7 @@ public:
~VlanWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();

73
sources/gui/src/wirelesswidget.cpp
View File

@ -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<QString, QString> WirelessWidget::getSettings()
QHash<QString, QString> 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; i<ui->listWidget_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; i<ui->listWidget_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; i<ui->listWidget_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<QString, QString> 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<QString, QString> settings)
{
}

1
sources/gui/src/wirelesswidget.h
View File

@ -36,6 +36,7 @@ public:
~WirelessWidget();
QHash<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
public slots:
void clear();