From 996d2d5bee4a415111feb171cccae8b702a6cdc6 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 2 Mar 2014 17:56:19 +0400 Subject: [PATCH] more refactoring and tests profile tab --- sources/gui/src/ethernetwidget.cpp | 4 ++-- sources/gui/src/ipwidget.cpp | 20 ++++++++++++++------ sources/gui/src/mainwindow.cpp | 12 ++++++++---- sources/gui/src/mainwindow.ui | 8 ++++---- sources/gui/src/mobilewidget.cpp | 2 +- sources/gui/src/netctlinteract.cpp | 4 ++-- sources/gui/src/pppoewidget.cpp | 12 ++++++------ sources/gui/src/settingswindow.cpp | 2 +- sources/gui/src/sleepthread.h | 7 ++----- sources/gui/src/vlanwidget.cpp | 2 +- sources/gui/src/wirelesswidget.cpp | 26 +++++++++++++++++++------- sources/gui/src/wpasupinteract.cpp | 6 +++--- 12 files changed, 63 insertions(+), 42 deletions(-) diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index 1093389..ee7ac15 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -120,9 +120,9 @@ QMap EthernetWidget::getSettings() ethernetSettings[QString("WPADriver")] = ui->comboBox_driver->currentText(); } if (ui->spinBox_timeoutCarrier->value() != 5) - ethernetSettings[QString("TimeoutCarrier")] = QString(ui->spinBox_timeoutCarrier->value()); + ethernetSettings[QString("TimeoutCarrier")] = QString::number(ui->spinBox_timeoutCarrier->value()); if (ui->spinBox_timeoutWpa->value() != 15) - ethernetSettings[QString("TimeoutWPA")] = QString(ui->spinBox_timeoutWpa->value()); + ethernetSettings[QString("TimeoutWPA")] = QString::number(ui->spinBox_timeoutWpa->value()); return ethernetSettings; } diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp index 43190fe..3136efa 100644 --- a/sources/gui/src/ipwidget.cpp +++ b/sources/gui/src/ipwidget.cpp @@ -18,6 +18,7 @@ #include "ipwidget.h" #include "ui_ipwidget.h" +#include #include @@ -390,7 +391,7 @@ QMap IpWidget::getSettings() for (int i=0; ilistWidget_ipAddress->count(); i++) addresses.append(QString("'") + ui->listWidget_ipAddress->item(i)->text() + QString("'")); ipSettings[QString("Address")] = addresses.join(QString(" ")); - ipSettings[QString("Gateway")] = ui->lineEdit_gateway->text(); + ipSettings[QString("Gateway")] = QString("'") + ui->lineEdit_gateway->text() + QString("'"); } if (ui->listWidget_ipRoutes->count() > 0) { QStringList routes; @@ -409,7 +410,7 @@ QMap IpWidget::getSettings() for (int i=0; ilistWidget_ipAddress6->count(); i++) addresses.append(QString("'") + ui->listWidget_ipAddress6->item(i)->text() + QString("'")); ipSettings[QString("Address6")] = addresses.join(QString(" ")); - ipSettings[QString("Gateway6")] = ui->lineEdit_gateway6->text(); + ipSettings[QString("Gateway6")] = QString("'") + ui->lineEdit_gateway6->text() + QString("'"); } if (ui->listWidget_ipRoutes6->count() > 0) { QStringList routes; @@ -429,7 +430,7 @@ QMap IpWidget::getSettings() if (!ui->lineEdit_hostname->text().isEmpty()) ipSettings[QString("Hostname")] = QString("'") + ui->lineEdit_hostname->text() + QString("'"); if (ui->spinBox_timeoutDad->value() != 3) - ipSettings[QString("TimeoutDAD")] = QString(ui->spinBox_timeoutDad->value()); + ipSettings[QString("TimeoutDAD")] = QString::number(ui->spinBox_timeoutDad->value()); if (ui->comboBox_dhcp->currentText() == QString("dhcpcd")) { if (!ui->lineEdit_dhcpcdOpt->text().isEmpty()) ipSettings[QString("DhcpcdOptions")] = QString("'") + ui->lineEdit_dhcpcdOpt->text() + QString("'"); @@ -442,7 +443,7 @@ QMap IpWidget::getSettings() ipSettings[QString("DhclientOptions6")] = QString("'") + ui->lineEdit_dhclientOpt6->text() + QString("'"); } if (ui->spinBox_timeoutDhcp->value() != 30) - ipSettings[QString("TimeoutDHCP")] = QString(ui->spinBox_timeoutDhcp->value()); + ipSettings[QString("TimeoutDHCP")] = QString::number(ui->spinBox_timeoutDhcp->value()); if (ui->checkBox_dhcp->checkState() == Qt::Checked) ipSettings[QString("DHCPReleaseOnStop")] = QString("yes"); if (ui->listWidget_dns->count() > 0) { @@ -522,8 +523,15 @@ void IpWidget::setSettings(const QMap settings) ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")].remove(QString("'"))); if (ipSettings.contains(QString("Routes6"))) ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")].remove(QString("'")).split(QString(" "))); - if (ipSettings.contains(QString("IPCustom"))) - ui->listWidget_custom->addItems(ipSettings[QString("IPCustom")].remove(QString("'")).split(QString(" "))); + if (ipSettings.contains(QString("IPCustom"))) { + QStringList custom; + if (ipSettings[QString("IPCustom")].contains(QString("\n"))) + custom = ipSettings[QString("IPCustom")].split(QString("'\n'")); + else + custom = ipSettings[QString("IPCustom")].split(QString("' '")); + for (int i=0; ilistWidget_custom->addItem(custom[i].remove(QString("'"))); + } if (ipSettings.contains(QString("Hostname"))) ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")].remove(QString("'"))); if (ipSettings.contains(QString("TimeoutDAD"))) diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index a175d5f..c992832 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -125,6 +125,7 @@ bool MainWindow::checkExternalApps(const QString apps = QString("all")) commandLine.append(configuration[QString("WPASUP_PATH")]); } QProcess command; + qDebug() << "[MainWindow]" << "[checkExternalApps]" << ":" << "Run cmd" << commandLine.join(QString(" ")); command.start(commandLine.join(QString(" "))); command.waitForFinished(-1); qDebug() << "[MainWindow]" << "[checkExternalApps]" << ":" << "Cmd returns" << command.exitCode(); @@ -137,7 +138,7 @@ bool MainWindow::checkExternalApps(const QString apps = QString("all")) bool MainWindow::checkState(const QString state, const QString item) { - if (item.indexOf(state) > -1) + if (item.contains(state)) return true; else return false; @@ -306,7 +307,8 @@ void MainWindow::mainTabEnableProfile() ui->tabWidget->setDisabled(true); QString profile = ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 0)->text(); netctlCommand->enableProfile(profile); - if (ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 2)->text().indexOf(QString("enabled")) > -1) { + QString item = ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 2)->text(); + if (checkState(QString("enabled"), item)) { if (netctlCommand->isProfileEnabled(profile)) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); else @@ -358,7 +360,8 @@ void MainWindow::mainTabStartProfile() ui->tabWidget->setDisabled(true); QString profile = ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 0)->text(); netctlCommand->startProfile(profile); - if (ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 2)->text().indexOf(QString("inactive")) == -1) { + QString item = ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 2)->text(); + if (checkState(QString("inactive"), item)) { if (netctlCommand->isProfileActive(profile)) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); else @@ -894,7 +897,8 @@ void MainWindow::wifiTabStart() if (checkState(QString("exists"), item)) { QString profileName = wpaCommand->existentProfile(profile); netctlCommand->startProfile(profileName); - if (ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 1)->text().indexOf(QString("inactive")) == -1) { + item = ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 1)->text(); + if (checkState(QString("inactive"), item)) { if (netctlCommand->isProfileActive(profileName)) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); else diff --git a/sources/gui/src/mainwindow.ui b/sources/gui/src/mainwindow.ui index 90ec72e..597dd72 100644 --- a/sources/gui/src/mainwindow.ui +++ b/sources/gui/src/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 471 + 491 519 @@ -190,8 +190,8 @@ 0 0 - 429 - 348 + 98 + 28 @@ -355,7 +355,7 @@ 0 0 - 471 + 491 20 diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp index af1023f..b91d51d 100644 --- a/sources/gui/src/mobilewidget.cpp +++ b/sources/gui/src/mobilewidget.cpp @@ -115,7 +115,7 @@ QMap MobileWidget::getSettings() mobileSettings[QString("PIN")] = QString("None"); mobileSettings[QString("Mode")] = ui->comboBox_mode->currentText(); if (ui->spinBox_fail->value() != 5) - mobileSettings[QString("MaxFail")] = QString(ui->spinBox_fail->value()); + mobileSettings[QString("MaxFail")] = QString::number(ui->spinBox_fail->value()); if (ui->checkBox_route->checkState() == Qt::Unchecked) mobileSettings[QString("DefaultRoute")] = QString("false"); if (ui->checkBox_dns->checkState() == Qt::Unchecked) diff --git a/sources/gui/src/netctlinteract.cpp b/sources/gui/src/netctlinteract.cpp index c47a1ca..560cb70 100644 --- a/sources/gui/src/netctlinteract.cpp +++ b/sources/gui/src/netctlinteract.cpp @@ -182,7 +182,7 @@ bool Netctl::isProfileActive(const QString profile) bool status = false; QString cmdOutput = getNetctlOutput(false, QString("status"), profile); if (!cmdOutput.isEmpty()) - if (cmdOutput.indexOf(QString("Active: active")) > -1) + if (cmdOutput.contains(QString("Active: active"))) status = true; return status; } @@ -196,7 +196,7 @@ bool Netctl::isProfileEnabled(const QString profile) QStringList profileStatus = cmdOutput.split(QString("\n"), QString::SkipEmptyParts); for (int i=0; i -1) + if (profileStatus[i].contains(QString("enabled"))) status = true; } return status; diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp index b3a37e7..4e0b666 100644 --- a/sources/gui/src/pppoewidget.cpp +++ b/sources/gui/src/pppoewidget.cpp @@ -138,9 +138,9 @@ QMap PppoeWidget::getSettings() pppoeSettings[QString("Password")] = QString("'") + ui->lineEdit_password->text() + QString("'"); pppoeSettings[QString("ConnectionMode")] = QString("'") + ui->comboBox_connection->currentText() + QString("'"); if (ui->comboBox_connection->currentText() == QString("demand")) - pppoeSettings[QString("IdleTimeout")] = QString(ui->spinBox_timeout->value()); + pppoeSettings[QString("IdleTimeout")] = QString::number(ui->spinBox_timeout->value()); if (ui->spinBox_fail->value() != 5) - pppoeSettings[QString("MaxFail")] = QString(ui->spinBox_fail->value()); + pppoeSettings[QString("MaxFail")] = QString::number(ui->spinBox_fail->value()); if (ui->checkBox_route->checkState() == Qt::Unchecked) pppoeSettings[QString("DefaultRoute")] = QString("false"); if (ui->checkBox_dns->checkState() == Qt::Unchecked) @@ -148,9 +148,9 @@ QMap PppoeWidget::getSettings() if (!ui->lineEdit_unit->text().isEmpty()) pppoeSettings[QString("PPPUnit")] = ui->lineEdit_unit->text(); if (ui->spinBox_lcpInterval->value() != 30) - pppoeSettings[QString("LCPEchoInterval")] = QString(ui->spinBox_lcpInterval->value()); + pppoeSettings[QString("LCPEchoInterval")] = QString::number(ui->spinBox_lcpInterval->value()); if (ui->spinBox_lcpFailure->value() != 4) - pppoeSettings[QString("LCPEchoFailure")] = QString(ui->spinBox_lcpFailure->value()); + pppoeSettings[QString("LCPEchoFailure")] = QString::number(ui->spinBox_lcpFailure->value()); if (!ui->lineEdit_options->text().isEmpty()) pppoeSettings[QString("OptionsFile")] = QString("'") + ui->lineEdit_options->text() + QString("'"); if (!ui->lineEdit_service->text().isEmpty()) @@ -176,7 +176,7 @@ int PppoeWidget::isOk() return 1; // mac address if (!ui->lineEdit_mac->text().split(QString(":")).join(QString("")).remove(QString(" ")).isEmpty()) - if (ui->lineEdit_mac->text().indexOf(QString(" ")) > -1) + if (ui->lineEdit_mac->text().contains(QString(" "))) return 2; // session id is not set if (!ui->lineEdit_session->text().split(QString(":")).join(QString("")).remove(QString(" ")).isEmpty()) @@ -186,7 +186,7 @@ int PppoeWidget::isOk() if (!ui->lineEdit_session->text().split(QString(":")).join(QString("")).remove(QString(" ")).isEmpty()) { QStringList item = ui->lineEdit_session->text().split(QString(":")); for (int i=1; i<7; i++) - if (item[i].indexOf(QString(" ")) > -1) + if (item[i].contains(QString(" "))) return 4; } // all fine diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index d1dbb87..e37f2f1 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -275,7 +275,7 @@ QMap SettingsWindow::getSettings() while (true) { fileStr = QString(configFile.readLine()); if (fileStr[0] != '#') { - if (fileStr.indexOf(QString("=")) > -1) + if (fileStr.contains(QString("="))) settings[fileStr.split(QString("="))[0]] = fileStr.split(QString("="))[1] .remove(QString(" ")) .trimmed(); diff --git a/sources/gui/src/sleepthread.h b/sources/gui/src/sleepthread.h index 40231c5..fc22c6b 100644 --- a/sources/gui/src/sleepthread.h +++ b/sources/gui/src/sleepthread.h @@ -21,15 +21,11 @@ #include -// class for sleeping function class SleepThread : public QThread { Q_OBJECT - // private run - void run() - {} -public : +public: static void usleep(long iSleepTime) { QThread::usleep(iSleepTime); @@ -46,4 +42,5 @@ public : } }; + #endif /* SLEEPTHREAD_H */ diff --git a/sources/gui/src/vlanwidget.cpp b/sources/gui/src/vlanwidget.cpp index 0ee9ca7..689b475 100644 --- a/sources/gui/src/vlanwidget.cpp +++ b/sources/gui/src/vlanwidget.cpp @@ -56,7 +56,7 @@ QMap VlanWidget::getSettings() if (isOk() != 0) return vlanSettings; - vlanSettings[QString("VLANID")] = QString(ui->spinBox_vlan->value()); + vlanSettings[QString("VLANID")] = QString::number(ui->spinBox_vlan->value()); return vlanSettings; } diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index d04f3e5..da943d4 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -133,7 +133,7 @@ void WirelessWidget::addDriver() void WirelessWidget::addFreq() { - QString freq = QString(ui->spinBox_freq->value()); + QString freq = QString::number(ui->spinBox_freq->value()); bool exists = false; for (int i=0; ilistWidget_freq->count(); i++) if (ui->listWidget_freq->item(i)->text() == freq) @@ -214,8 +214,13 @@ QMap WirelessWidget::getSettings() wirelessSettings[QString("Security")] = ui->comboBox_security->currentText(); wirelessSettings[QString("ESSID")] = QString("'") + ui->lineEdit_essid->text() + QString("'"); - if ((ui->comboBox_security->currentText() == QString("wep")) || - (ui->comboBox_security->currentText() == QString("wpa"))) + if (ui->comboBox_security->currentText() == QString("wep")) { + if (ui->lineEdit_key->text().indexOf(QString("\\\"")) == 0) + wirelessSettings[QString("Key")] = ui->lineEdit_key->text(); + else + wirelessSettings[QString("Key")] = QString("'") + ui->lineEdit_key->text() + QString("'"); + } + else if (ui->comboBox_security->currentText() == QString("wpa")) wirelessSettings[QString("Key")] = QString("'") + ui->lineEdit_key->text() + QString("'"); if (ui->comboBox_security->currentText() == QString("wpa-configsection")) { QStringList section; @@ -236,7 +241,7 @@ QMap WirelessWidget::getSettings() wirelessSettings[QString("ScanFrequencies")] = freqs.join(QString(" ")); } if (ui->spinBox_priority->value() != 0) - wirelessSettings[QString("Priority")] = QString(ui->spinBox_priority->value()); + wirelessSettings[QString("Priority")] = QString::number(ui->spinBox_priority->value()); if (!ui->lineEdit_country->text().isEmpty()) wirelessSettings[QString("Country")] = QString("'") + ui->lineEdit_country->text() + QString("'"); if (ui->lineEdit_wpaGroup->text() != QString("wheel")) @@ -250,7 +255,7 @@ QMap WirelessWidget::getSettings() if (ui->comboBox_rfkill->currentText() != QString("auto")) wirelessSettings[QString("RFKill")] = ui->comboBox_rfkill->currentText(); if (ui->spinBox_timeoutWpa->value() != 15) - wirelessSettings[QString("TimeoutWPA")] = QString(ui->spinBox_timeoutWpa->value()); + wirelessSettings[QString("TimeoutWPA")] = QString::number(ui->spinBox_timeoutWpa->value()); if (ui->checkBox_exclude->checkState() == Qt::Checked) wirelessSettings[QString("ExcludeAuto")] = QString("yes"); @@ -301,8 +306,15 @@ void WirelessWidget::setSettings(const QMap settings) ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")].remove(QString("'"))); if (wirelessSettings.contains(QString("Key"))) ui->lineEdit_key->setText(wirelessSettings[QString("Key")].remove(QString("'"))); - if (wirelessSettings.contains(QString("WPAConfigSection"))) - ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QString("\n"))); + if (wirelessSettings.contains(QString("WPAConfigSection"))) { + QStringList custom; + if (wirelessSettings[QString("WPAConfigSection")].contains(QString("\n"))) + custom = wirelessSettings[QString("WPAConfigSection")].split(QString("'\n'")); + else + custom = wirelessSettings[QString("WPAConfigSection")].split(QString("' '")); + for (int i=0; ilistWidget_wpaConfigSection->addItem(custom[i].remove(QString("'"))); + } if (wirelessSettings.contains(QString("WPAConfigFile"))) ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")].remove(QString("'"))); if (wirelessSettings.contains(QString("Hidden"))) diff --git a/sources/gui/src/wpasupinteract.cpp b/sources/gui/src/wpasupinteract.cpp index 0da7a5d..926bec6 100644 --- a/sources/gui/src/wpasupinteract.cpp +++ b/sources/gui/src/wpasupinteract.cpp @@ -187,11 +187,11 @@ QList WpaSup::scanWifi() wifiPoint.append(rawList[i].split(QString("\t"), QString::SkipEmptyParts)[2]); // point security QString security = rawList[i].split(QString("\t"), QString::SkipEmptyParts)[3]; - if (security.indexOf(QString("WPA2")) > -1) + if (security.contains(QString("WPA2"))) security = QString("WPA2"); - else if (security.indexOf(QString("WPA")) > -1) + else if (security.contains(QString("WPA"))) security = QString("WPA"); - else if (security.indexOf(QString("WEP")) > -1) + else if (security.contains(QString("WEP"))) security = QString("WEP"); else security = QString("none");