From 362a11f0bcf946f831c18f103f8997968e9d05a1 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 9 Mar 2015 08:29:26 +0300 Subject: [PATCH] + new Verbose* DBus calls + new force request to netctl (DBus) + PointType enum + notification on hidding, + new columns in WiFi menu * improve user expierence * fix language definition * fix tests * update 3rdparty components * small refactoring --- sources/3rdparty/language | 2 +- sources/3rdparty/tasks | 2 +- sources/dataengine/netctl.cpp | 8 +- sources/gui/docs/netctl-gui-dbus-api.html | 27 ++++- sources/gui/src/dbusoperation.cpp | 14 ++- sources/gui/src/ipwidget.cpp | 4 +- sources/gui/src/main.cpp | 4 +- sources/gui/src/mainprivateslots.cpp | 112 ++++++++++-------- sources/gui/src/mainpublicslots.cpp | 16 ++- sources/gui/src/mainwindow.cpp | 17 +-- sources/gui/src/mainwindow.ui | 38 +++++- sources/gui/src/netctlautowindow.cpp | 2 +- sources/gui/src/settingswindow.cpp | 3 +- sources/gui/src/trayicon.cpp | 2 +- sources/helper/src/controladaptor.cpp | 38 ++++-- sources/helper/src/controladaptor.h | 1 + sources/helper/src/main.cpp | 4 +- sources/helper/src/messages.cpp | 2 +- sources/helper/src/netctladaptor.cpp | 65 +++++++++- sources/helper/src/netctladaptor.h | 4 + sources/helper/src/netctlhelper.cpp | 9 +- .../include/netctlgui/wpasupinteract.h | 32 ++++- sources/netctlgui/src/wpasupinteract.cpp | 32 ++++- sources/plasmoid-kde4/netctl.cpp | 51 ++++---- sources/plasmoid-kf5/plugin/netctladds.cpp | 28 +++-- sources/test/testnetctl.cpp | 5 +- sources/test/testnetctlauto.cpp | 3 +- sources/test/testnetctlprofile.cpp | 9 +- sources/test/testwpasup.cpp | 5 +- 29 files changed, 363 insertions(+), 176 deletions(-) diff --git a/sources/3rdparty/language b/sources/3rdparty/language index a119b60..2049435 160000 --- a/sources/3rdparty/language +++ b/sources/3rdparty/language @@ -1 +1 @@ -Subproject commit a119b60ed10ba1d2b805ee6607178a699a726180 +Subproject commit 204943574a95d5825fd7190608bfe6d76abf6da3 diff --git a/sources/3rdparty/tasks b/sources/3rdparty/tasks index 230bdec..36f7ac2 160000 --- a/sources/3rdparty/tasks +++ b/sources/3rdparty/tasks @@ -1 +1 @@ -Subproject commit 230bdecd2c18ee2ec5350d94778a51158565c119 +Subproject commit 36f7ac299633e96f246fec160939207257ae0097 diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index 4561782..2722d1a 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -129,7 +129,7 @@ QStringList Netctl::getCurrentProfile(const QString cmdNetctl, const QString cmd else cmd = cmdNetctl; if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd; - TaskResult process = runTask(cmd + QString(" list")); + TaskResult process = runTask(QString("%1 list").arg(cmd)); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (process.exitCode != 0) if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; @@ -217,7 +217,7 @@ QString Netctl::getNetctlAutoStatus(const QString cmdNetctlAuto) { if (debug) qDebug() << PDEBUG; - TaskResult process = runTask(cmdNetctlAuto + QString(" list")); + TaskResult process = runTask(QString("%1 list").arg(cmdNetctlAuto)); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (process.exitCode != 0) if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; @@ -246,7 +246,7 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet else cmd = cmdNetctl; if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd; - TaskResult process = runTask(cmd + QString(" list")); + TaskResult process = runTask(QString("%1 list").arg(cmd)); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (process.exitCode != 0) if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; @@ -270,7 +270,7 @@ QStringList Netctl::getProfileStringStatus(const QString cmdNetctl, const QStrin else { QStringList profiles = getCurrentProfile(cmdNetctl, cmdNetctlAuto); for (int i=0; iyes + + QStringList VerboseWiFi() + returns available WiFi points in format NAME|SECURITY|TYPE|FREQS|MACS|SIGNAL|ACTIVE|EXISTS + yes + QStringList WiFi() - returns available WiFi points in format NAME|SECURITY|FREQS|MACS|SIGNAL|ACTIVE|EXISTS + returns available WiFi points in format NAME|SECURITY|SIGNAL|ACTIVE|EXISTS yes @@ -221,8 +226,28 @@ small { returns general information in format [ActiveProfile, ActiveProfileStatus] no + + QString netctlActiveProfile() + returns active profile from netctl even if netctl-auto is running + no + + + QStringList netctlProfileList() + returns available profiles in format NAME|DESCRIPTION|ACTIVE|ENABLED from netctl even if netctl-auto is running + no + + + QStringList netctlVerboseProfileList() + returns available profiles in format NAME|DESCRIPTION|ESSID|ACTIVE|ENABLED from netctl even if netctl-auto is running + no + QStringList ProfileList() + returns available profiles in format NAME|DESCRIPTION|ACTIVE|ENABLED + no + + + QStringList VerboseProfileList() returns available profiles in format NAME|DESCRIPTION|ESSID|ACTIVE|ENABLED no diff --git a/sources/gui/src/dbusoperation.cpp b/sources/gui/src/dbusoperation.cpp index e228aea..de353c2 100644 --- a/sources/gui/src/dbusoperation.cpp +++ b/sources/gui/src/dbusoperation.cpp @@ -54,15 +54,17 @@ QList parseOutputWifi(const QList raw) QStringList list = raw[0].toStringList(); for (int i=0; i(info[2].toInt()); + for (int j=0; jlineEdit_ipRoutes2->text(), IpRegExp::ip4Regex()))) return ErrorWindow::showWindow(20, QString("[IpWidget::addIpRoutes]")); - ui->listWidget_ipRoutes->addItem(ui->lineEdit_ipRoutes->text() + QString(" via ") + ui->lineEdit_ipRoutes2->text()); + ui->listWidget_ipRoutes->addItem(QString("%1 via %2").arg(ui->lineEdit_ipRoutes->text()).arg(ui->lineEdit_ipRoutes2->text())); ui->lineEdit_ipRoutes->clear(); ui->lineEdit_ipRoutes2->clear(); } @@ -204,7 +204,7 @@ void IpWidget::addIpRoutes6() (!IpRegExp::checkString(ui->lineEdit_ipRoutes62->text(), IpRegExp::ip6Regex()))) return ErrorWindow::showWindow(20, QString("[IpWidget::addIp6Routes]")); - ui->listWidget_ipRoutes6->addItem(ui->lineEdit_ipRoutes6->text() + QString(" via ") + ui->lineEdit_ipRoutes62->text()); + ui->listWidget_ipRoutes6->addItem(QString("%1 via %2").arg(ui->lineEdit_ipRoutes6->text()).arg(ui->lineEdit_ipRoutes62->text())); ui->lineEdit_ipRoutes6->clear(); ui->lineEdit_ipRoutes62->clear(); } diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index 2b24be3..f1e7ce7 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -152,10 +152,10 @@ int main(int argc, char *argv[]) QString language = Language::defineLanguage(args[QString("config")].toString(), args[QString("options")].toString()); QTranslator qtTranslator; - qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + qtTranslator.load(QString("qt_%1").arg(language), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); a.installTranslator(&qtTranslator); QTranslator translator; - translator.load(QString(":/translations/") + language); + translator.load(QString(":/translations/%1").arg(language)); a.installTranslator(&translator); // running diff --git a/sources/gui/src/mainprivateslots.cpp b/sources/gui/src/mainprivateslots.cpp index 0a536b0..ba244c9 100644 --- a/sources/gui/src/mainprivateslots.cpp +++ b/sources/gui/src/mainprivateslots.cpp @@ -61,24 +61,9 @@ void MainWindow::setMenuActionsShown(const bool state) if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG << ":" << "State" << state; - // main - toolBarActions[QString("netctlAuto")]->setVisible(state); - toolBarActions[QString("mainRefresh")]->setVisible(state); - toolBarActions[QString("mainStart")]->setVisible(state); - toolBarActions[QString("mainSwitch")]->setVisible(state); - toolBarActions[QString("mainRestart")]->setVisible(state); - toolBarActions[QString("mainEnable")]->setVisible(state); - toolBarActions[QString("mainStopAll")]->setVisible(state); - toolBarActions[QString("mainEdit")]->setVisible(state); - toolBarActions[QString("mainRemove")]->setVisible(state); - // profile - toolBarActions[QString("profileClear")]->setVisible(state); - toolBarActions[QString("profileLoad")]->setVisible(state); - toolBarActions[QString("profileSave")]->setVisible(state); - toolBarActions[QString("profileRemove")]->setVisible(state); - // wifi - toolBarActions[QString("wifiRefresh")]->setVisible(state); - toolBarActions[QString("wifiStart")]->setVisible(state); + QStringList keys = toolBarActions.keys(); + for (int i=0; isetVisible(state); } @@ -136,17 +121,12 @@ void MainWindow::updateMenuWifi() toolBarActions[QString("wifiRefresh")]->setVisible(true); if (ui->tableWidget_wifi->currentItem() == nullptr) return; - if (!ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 4)->text().isEmpty()) { - if (!ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 3)->text().isEmpty()) { - toolBarActions[QString("wifiStart")]->setText(QApplication::translate("MainWindow", "Stop")); - toolBarActions[QString("wifiStart")]->setIcon(QIcon::fromTheme("process-stop")); - } else { - toolBarActions[QString("wifiStart")]->setText(QApplication::translate("MainWindow", "Start")); - toolBarActions[QString("wifiStart")]->setIcon(QIcon::fromTheme("system-run")); - } - } else { + if (ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 5)->text().isEmpty()) { toolBarActions[QString("wifiStart")]->setText(QApplication::translate("MainWindow", "Start")); toolBarActions[QString("wifiStart")]->setIcon(QIcon::fromTheme("system-run")); + } else { + toolBarActions[QString("wifiStart")]->setText(QApplication::translate("MainWindow", "Stop")); + toolBarActions[QString("wifiStart")]->setIcon(QIcon::fromTheme("process-stop")); } toolBarActions[QString("wifiStart")]->setVisible(true); } @@ -173,7 +153,7 @@ void MainWindow::updateMainTab() return updateMainTab(); } netctlAutoStatus = responce[0].toBool(); - profiles = parseOutputNetctl(sendRequestToLib(QString("ProfileList"), debug)); + profiles = parseOutputNetctl(sendRequestToLib(QString("netctlVerboseProfileList"), debug)); } else { netctlAutoStatus = netctlCommand->isNetctlAutoRunning(); profiles = netctlCommand->getProfileList(); @@ -255,7 +235,7 @@ void MainWindow::updateProfileTab() void MainWindow::updateWifiTab() { if (debug) qDebug() << PDEBUG; - wifiTabSetEnabled(checkExternalApps(QString("wpasup"))); + wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"))); if (!checkExternalApps(QString("wpasup"))) { ErrorWindow::showWindow(1, QString(PDEBUG), debug); emit(needToBeConfigured()); @@ -265,19 +245,21 @@ void MainWindow::updateWifiTab() ui->tabWidget->setDisabled(true); QList scanResults; if (useHelper) - scanResults = parseOutputWifi(sendRequestToCtrl(QString("WiFi"), debug)); + scanResults = parseOutputWifi(sendRequestToCtrl(QString("VerboseWiFi"), debug)); else scanResults = wpaCommand->scanWifi(); ui->tableWidget_wifi->setSortingEnabled(false); ui->tableWidget_wifi->selectRow(-1); - ui->tableWidget_wifi->sortByColumn(0, Qt::AscendingOrder); + ui->tableWidget_wifi->sortByColumn(3, Qt::AscendingOrder); ui->tableWidget_wifi->clear(); ui->tableWidget_wifi->setRowCount(scanResults.count()); // create header QStringList headerList; headerList.append(QApplication::translate("MainWindow", "Name")); + headerList.append(QApplication::translate("MainWindow", "Type")); + headerList.append(QApplication::translate("MainWindow", "# of points")); headerList.append(QApplication::translate("MainWindow", "Signal")); headerList.append(QApplication::translate("MainWindow", "Security")); headerList.append(QApplication::translate("MainWindow", "Active")); @@ -289,10 +271,32 @@ void MainWindow::updateWifiTab() QFont font; font.setBold(scanResults[i].active); font.setItalic(scanResults[i].exists); + // type + QString type; + switch (scanResults[i].type) { + case PointType::TwoG: + type = QApplication::translate("MainWindow", "2G"); + break; + case PointType::FiveG: + type = QApplication::translate("MainWindow", "5G"); + break; + case PointType::TwoAndFiveG: + type = QApplication::translate("MainWindow", "2G and 5G"); + break; + case PointType::None: + default: + type = QApplication::translate("MainWindow", "N\\A"); + break; + } // tooltip QString toolTip = QString(""); - toolTip += QString("%1: %2\n").arg(QApplication::translate("MainWindow", "MAC")).arg(scanResults[i].macs.join(QString(", "))); - toolTip += QString("%1: %2\n").arg(QApplication::translate("MainWindow", "Frequency")).arg(scanResults[i].frequencies.join(QString(", "))); + for (int j=0; jtableWidget_wifi->item(i, 0)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); ui->tableWidget_wifi->item(i, 0)->setToolTip(toolTip); ui->tableWidget_wifi->item(i, 0)->setFont(font); - // signal - ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(QString::number(scanResults[i].signal))); + // type + ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(type)); ui->tableWidget_wifi->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); ui->tableWidget_wifi->item(i, 1)->setToolTip(toolTip); - // security - ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(scanResults[i].security)); + // count + ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(QString::number(scanResults[i].frequencies.count()))); ui->tableWidget_wifi->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); ui->tableWidget_wifi->item(i, 2)->setToolTip(toolTip); - // active - ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(checkStatus(scanResults[i].active, true))); + // signal + ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(QString::number(scanResults[i].signal))); ui->tableWidget_wifi->item(i, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - // exists - ui->tableWidget_wifi->setItem(i, 4, new QTableWidgetItem(checkStatus(scanResults[i].exists, true))); + ui->tableWidget_wifi->item(i, 3)->setToolTip(toolTip); + // security + ui->tableWidget_wifi->setItem(i, 4, new QTableWidgetItem(scanResults[i].security)); ui->tableWidget_wifi->item(i, 4)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + ui->tableWidget_wifi->item(i, 4)->setToolTip(toolTip); + // active + ui->tableWidget_wifi->setItem(i, 5, new QTableWidgetItem(checkStatus(scanResults[i].active, true))); + ui->tableWidget_wifi->item(i, 5)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + // exists + ui->tableWidget_wifi->setItem(i, 6, new QTableWidgetItem(checkStatus(scanResults[i].exists, true))); + ui->tableWidget_wifi->item(i, 6)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); } ui->tableWidget_wifi->setSortingEnabled(true); @@ -596,7 +608,7 @@ void MainWindow::profileTabClear() ui->comboBox_profile->clear(); QList profiles; if (useHelper) - profiles = parseOutputNetctl(sendRequestToLib(QString("ProfileList"), debug)); + profiles = parseOutputNetctl(sendRequestToLib(QString("netctlVerboseProfileList"), debug)); else profiles = netctlCommand->getProfileList(); for (int i=0; itableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 4)->text().isEmpty()) { - if (!ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 3)->text().isEmpty()) { - startWifi->setText(QApplication::translate("MainWindow", "Stop WiFi")); - startWifi->setIcon(QIcon::fromTheme("process-stop")); - } else { - startWifi->setText(QApplication::translate("MainWindow", "Start WiFi")); - startWifi->setIcon(QIcon::fromTheme("system-run")); - } - } else { + if (ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 5)->text().isEmpty()) { startWifi->setText(QApplication::translate("MainWindow", "Start WiFi")); startWifi->setIcon(QIcon::fromTheme("system-run")); + + } else { + startWifi->setText(QApplication::translate("MainWindow", "Stop WiFi")); + startWifi->setIcon(QIcon::fromTheme("process-stop")); } // actions @@ -972,7 +980,7 @@ void MainWindow::wifiTabStart() hiddenNetwork = false; QString profile = ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 0)->text(); QString profileName = QString(""); - if (!ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 4)->text().isEmpty()) { + if (!ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 6)->text().isEmpty()) { if (useHelper) { QList args; args.append(profile); diff --git a/sources/gui/src/mainpublicslots.cpp b/sources/gui/src/mainpublicslots.cpp index 6fce4ed..ea5aba3 100644 --- a/sources/gui/src/mainpublicslots.cpp +++ b/sources/gui/src/mainpublicslots.cpp @@ -228,7 +228,7 @@ void MainWindow::showApi() { if (debug) qDebug() << PDEBUG; - if (QDesktopServices::openUrl(QUrl(QString(DOCS_PATH) + QString("netctl-gui-dbus-api.html")))) + if (QDesktopServices::openUrl(QUrl(QString("%1netctl-gui-dbus-api.html").arg(QString(DOCS_PATH))))) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); else ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); @@ -239,7 +239,7 @@ void MainWindow::showLibrary() { if (debug) qDebug() << PDEBUG; - if (QDesktopServices::openUrl(QUrl(QString(DOCS_PATH) + QString("html/index.html")))) + if (QDesktopServices::openUrl(QUrl(QString("%1html/index.html").arg(QString(DOCS_PATH))))) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); else ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); @@ -250,7 +250,7 @@ void MainWindow::showSecurityNotes() { if (debug) qDebug() << PDEBUG; - if (QDesktopServices::openUrl(QUrl(QString(DOCS_PATH) + QString("netctl-gui-security-notes.html")))) + if (QDesktopServices::openUrl(QUrl(QString("%1netctl-gui-security-notes.html").arg(QString(DOCS_PATH))))) ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); else ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); @@ -303,7 +303,7 @@ void MainWindow::setTab(int tab) if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG << ":" << "Set tab" << tab; - if (tab > 2) tab = 0; + if ((tab > 2) || (tab < 0)) tab = 0; if (tab == ui->tabWidget->currentIndex()) updateTabs(tab); else @@ -336,6 +336,7 @@ void MainWindow::updateConfiguration(const QMap args) // update translation qApp->removeTranslator(translator); QString language = Language::defineLanguage(configPath, args[QString("options")].toString()); + if (debug) qDebug() << PDEBUG << ":" << "Language is" << language; qtTranslator->load(QString("qt_%1").arg(language), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qApp->installTranslator(qtTranslator); translator->load(QString(":/translations/%1").arg(language)); @@ -348,10 +349,7 @@ void MainWindow::updateConfiguration(const QMap args) // tray trayIcon->setVisible(QSystemTrayIcon::isSystemTrayAvailable() && (configuration[QString("SYSTRAY")] == QString("true"))); if (trayIcon->isVisible()) { - if (configuration[QString("STARTTOTRAY")] == QString("true")) - hide(); - else - show(); + setHidden(configuration[QString("STARTTOTRAY")] == QString("true")); if (args[QString("minimized")].toInt() == 1) show(); else if (args[QString("minimized")].toInt() == 2) @@ -442,7 +440,7 @@ void MainWindow::connectToUnknownEssid(const QString passwd) if (hiddenNetwork) settings[QString("Hidden")] = QString("yes"); - QString profile = QString("netctl-gui-") + settings[QString("ESSID")]; + QString profile = QString("netctl-gui-%1").arg(settings[QString("ESSID")]); profile.remove(QChar('"')).remove(QChar('\'')); if (useHelper) { QStringList settingsList; diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 09886d4..2a22935 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -185,7 +185,7 @@ QStringList MainWindow::printTrayInformation() return printTrayInformation(); } netctlAutoStatus = responce[0].toBool(); - profiles = parseOutputNetctl(sendRequestToLib(QString("ProfileList"), debug)); + profiles = parseOutputNetctl(sendRequestToLib(QString("VerboseProfileList"), debug)); if (netctlAutoStatus) { QList args; args.append(current); @@ -263,6 +263,8 @@ void MainWindow::closeEvent(QCloseEvent *event) if ((QSystemTrayIcon::isSystemTrayAvailable()) && (configuration[QString("SYSTRAY")] == QString("true"))) { hide(); + trayIcon->showMessage(QApplication::translate("MainWindow", "Information"), + QApplication::translate("MainWindow", "Application has been hidden to tray")); event->ignore(); } else closeMainWindow(); @@ -287,15 +289,14 @@ bool MainWindow::checkExternalApps(const QString apps = QString("all")) cmd.append(configuration[QString("NETCTLAUTO_PATH")]); cmd.append(configuration[QString("SUDO_PATH")]); } - if ((apps == QString("sudo")) || (apps == QString("all"))) { + if ((apps == QString("sudo")) || (apps == QString("wpasup")) || (apps == QString("all"))) { cmd.append(configuration[QString("SUDO_PATH")]); } if ((apps == QString("systemctl")) || (apps == QString("all"))) { cmd.append(configuration[QString("SYSTEMCTL_PATH")]); cmd.append(configuration[QString("SUDO_PATH")]); } - if ((apps == QString("wpasup")) || (apps == QString("all"))) { - cmd.append(configuration[QString("SUDO_PATH")]); + if ((apps == QString("wpasup")) || (apps == QString("wpasup-only")) || (apps == QString("all"))) { cmd.append(configuration[QString("WPACLI_PATH")]); cmd.append(configuration[QString("WPASUP_PATH")]); } @@ -417,8 +418,8 @@ void MainWindow::createObjects() ui->setupUi(this); ui->tableWidget_main->setColumnHidden(2, true); ui->tableWidget_main->setColumnHidden(3, true); - ui->tableWidget_wifi->setColumnHidden(3, true); - ui->tableWidget_wifi->setColumnHidden(4, true); + ui->tableWidget_wifi->setColumnHidden(5, true); + ui->tableWidget_wifi->setColumnHidden(6, true); aboutWin = new AboutWindow(this, debug); netctlAutoWin = new NetctlAutoWindow(this, debug, configuration); settingsWin = new SettingsWindow(this, debug, configPath); @@ -506,6 +507,8 @@ void MainWindow::createToolBars() toolBarActions[QString("profileRemove")] = actionToolBar->addAction(QIcon::fromTheme(QString("edit-delete")), QApplication::translate("MainWindow", "Remove"), this, SLOT(profileTabRemoveProfile())); + + setMenuActionsShown(false); ui->centralLayout->insertWidget(0, actionToolBar); } @@ -559,7 +562,7 @@ QMap MainWindow::parseOptions(const QString options) options.split(QChar(','))[i].split(QChar('='))[1]; } for (int i=0; itrue - 5 + 7 true @@ -234,6 +234,22 @@ AlignHCenter|AlignVCenter|AlignCenter + + + Type + + + AlignHCenter|AlignVCenter|AlignCenter + + + + + # of points + + + AlignHCenter|AlignVCenter|AlignCenter + + Signal @@ -289,7 +305,9 @@ - + + + Security @@ -307,7 +325,9 @@ - + + + Report a bug @@ -315,7 +335,9 @@ - + + + About @@ -323,7 +345,9 @@ - + + + Quit @@ -334,7 +358,9 @@ - + + + Settings diff --git a/sources/gui/src/netctlautowindow.cpp b/sources/gui/src/netctlautowindow.cpp index 518ec7c..bae4f39 100644 --- a/sources/gui/src/netctlautowindow.cpp +++ b/sources/gui/src/netctlautowindow.cpp @@ -226,7 +226,7 @@ void NetctlAutoWindow::netctlAutoUpdateTable() } QList profiles; if (useHelper) - profiles = parseOutputNetctl(sendRequestToLib(QString("ProfileList"), debug)); + profiles = parseOutputNetctl(sendRequestToLib(QString("VerboseProfileList"), debug)); else profiles = netctlCommand->getProfileListFromNetctlAuto(); diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index de4d12f..709f3b8 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -397,11 +397,12 @@ QMap SettingsWindow::getDefault() QMap SettingsWindow::getSettings(QString fileName) { if (debug) qDebug() << PDEBUG; - if (fileName == QString("")) fileName = file; + if (fileName.isEmpty()) fileName = file; QMap config; QSettings settings(fileName, QSettings::IniFormat); + config[QString("LANGUAGE")] = Language::defineLanguage(fileName, QString()); settings.beginGroup(QString("Common")); config[QString("LANGUAGE")] = settings.value(QString("LANGUAGE"), QString("en")).toString(); config[QString("SYSTRAY")] = settings.value(QString("SYSTRAY"), QString("true")).toString(); diff --git a/sources/gui/src/trayicon.cpp b/sources/gui/src/trayicon.cpp index 394bd83..1b7dcc4 100644 --- a/sources/gui/src/trayicon.cpp +++ b/sources/gui/src/trayicon.cpp @@ -112,7 +112,7 @@ void TrayIcon::updateMenu() } QStringList profiles; for (int i=0; isetText(profiles.join(QString(" | "))); } diff --git a/sources/helper/src/controladaptor.cpp b/sources/helper/src/controladaptor.cpp index 5e82147..cd9118d 100644 --- a/sources/helper/src/controladaptor.cpp +++ b/sources/helper/src/controladaptor.cpp @@ -53,7 +53,7 @@ bool ControlAdaptor::Active() QString ControlAdaptor::ApiDocs() { - return (QString(DOCS_PATH) + QString("netctl-gui-dbus-api.html")); + return (QString("%1netctl-gui-dbus-api.html").arg(QString(DOCS_PATH))); } @@ -82,8 +82,7 @@ QStringList ControlAdaptor::FindSettings() QStringList settingsList; for (int i=0; itoUnicode(ponyFile.readAll()); ponyFile.close(); @@ -110,7 +108,7 @@ QString ControlAdaptor::Pony() QString ControlAdaptor::SecurityDocs() { - return (QString(DOCS_PATH) + QString("netctl-gui-security-notes.html")); + return (QString("%1netctl-gui-security-notes.html").arg(QString(DOCS_PATH))); } @@ -251,7 +249,7 @@ bool ControlAdaptor::Remove(const QString profile) // wpaCommand -QStringList ControlAdaptor::WiFi() +QStringList ControlAdaptor::VerboseWiFi() { QList wifiPoints = wpaCommand->scanWifi(); QStringList info; @@ -259,7 +257,11 @@ QStringList ControlAdaptor::WiFi() QStringList point; point.append(wifiPoints[i].name); point.append(wifiPoints[i].security); - point.append(wifiPoints[i].frequencies.join(QChar(','))); + point.append(QString::number(wifiPoints[i].type)); + QStringList freqList; + for (int j=0; j wifiPoints = wpaCommand->scanWifi(); + QStringList info; + for (int i=0; i getArgs() { QMap args; - args[QString("config")] = QString(QDir::homePath() + QString("/.config/netctl-gui.conf")); + args[QString("config")] = QString("%1/.config/netctl-gui.conf").arg(QDir::homePath()); args[QString("debug")] = false; args[QString("nodaemon")] = false; args[QString("session")] = false; diff --git a/sources/helper/src/netctladaptor.cpp b/sources/helper/src/netctladaptor.cpp index d3b8224..2f3194b 100644 --- a/sources/helper/src/netctladaptor.cpp +++ b/sources/helper/src/netctladaptor.cpp @@ -106,7 +106,69 @@ bool NetctlAdaptor::isProfileEnabled(const QString profile) } +QString NetctlAdaptor::netctlActiveProfile() +{ + return netctlCommand->getActiveProfile().join(QChar('|')); +} + + +QStringList NetctlAdaptor::netctlProfileList() +{ + QList profilesInfo = netctlCommand->getProfileList(); + QStringList info; + for (int i=0; i profilesInfo = netctlCommand->getProfileList(); + QStringList info; + for (int i=0; i profilesInfo; + if (isNetctlAutoActive()) + profilesInfo = netctlCommand->getProfileListFromNetctlAuto(); + else + profilesInfo = netctlCommand->getProfileList(); + QStringList info; + for (int i=0; i profilesInfo; if (isNetctlAutoActive()) @@ -134,8 +196,7 @@ QStringList NetctlAdaptor::Profile(const QString profile) QMap settings = netctlProfile->getSettingsFromProfile(profile); QStringList settingsList; for (int i=0; i args) system(args[QString("system")].toBool()) { updateConfiguration(); - if (!args[QString("nodaemon")].toBool()) - daemon(0, 0); + if (!args[QString("nodaemon")].toBool()) daemon(0, 0); } @@ -59,8 +58,7 @@ QStringList NetctlHelper::printSettings() QStringList settingsList; for (int i=0; i NetctlHelper::getSettings(const QString file) settings.endGroup(); for (int i=0; i frequencies; QStringList macs; QString name; QString security; int signal; + PointType type = PointType::None; bool active; bool exists; } netctlWifiInfo; diff --git a/sources/netctlgui/src/wpasupinteract.cpp b/sources/netctlgui/src/wpasupinteract.cpp index f2b1ef4..7283cb4 100644 --- a/sources/netctlgui/src/wpasupinteract.cpp +++ b/sources/netctlgui/src/wpasupinteract.cpp @@ -280,10 +280,23 @@ QList WpaSup::scanWifi() // append mac and frequency if exists int index = names.indexOf(name); if ((name != QString("")) && (index > -1)) { - scanResults[index].frequencies.append(line[1]); + scanResults[index].frequencies.append(line[1].toInt()); scanResults[index].macs.append(line[0]); if (scanResults[index].signal < line[2].toInt()) scanResults[index].signal = line[2].toInt(); + // check type + if ((line[1].toInt() >= 5000) && (line[1].toInt() < 6000)) { + if (scanResults[index].type == PointType::None) + scanResults[index].type = PointType::FiveG; + else if (scanResults[index].type == PointType::TwoG) + scanResults[index].type = PointType::TwoAndFiveG; + } else if ((line[1].toInt() < 5000) && (line[1].toInt() > 2000)) { + if (scanResults[index].type == PointType::None) + scanResults[index].type = PointType::TwoG; + else if (scanResults[index].type == PointType::FiveG) + scanResults[index].type = PointType::TwoAndFiveG; + } + continue; } @@ -304,7 +317,14 @@ QList WpaSup::scanWifi() // mac wifiPoint.macs.append(line[0]); // frequencies - wifiPoint.frequencies.append(line[1]); + wifiPoint.frequencies.append(line[1].toInt()); + // type + // check type + if ((line[1].toInt() >= 5000) && (line[1].toInt() < 6000)) { + wifiPoint.type = PointType::FiveG; + } else if ((line[1].toInt() < 5000) && (line[1].toInt() > 2000)) { + wifiPoint.type = PointType::TwoG; + } // point signal wifiPoint.signal = line[2].toInt(); // point security @@ -422,8 +442,8 @@ QString WpaSup::getWpaCliOutput(const QString commandLine) } QString interface = interfaces[0]; - QString cmd = wpaCliPath + QString(" -i ") + interface + QString(" -p ") + ctrlDir + - QString(" -P ") + pidFile + QString(" ") + commandLine; + QString cmd = QString("%1 -i %2 -p %3 -P %4 %5").arg(wpaCliPath).arg(interface) + .arg(ctrlDir).arg(pidFile).arg(commandLine); if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd; TaskResult process = runTask(cmd); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; @@ -479,8 +499,8 @@ bool WpaSup::wpaCliCall(const QString commandLine) } QString interface = interfaces[0]; - QString cmd = wpaCliPath + QString(" -i ") + interface + QString(" -p ") + ctrlDir + - QString(" -P ") + pidFile + QString(" ") + commandLine; + QString cmd = QString("%1 -i %2 -p %3 -P %4 %5").arg(wpaCliPath).arg(interface) + .arg(ctrlDir).arg(pidFile).arg(commandLine); if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd; TaskResult process = runTask(cmd); waitForProcess(1); diff --git a/sources/plasmoid-kde4/netctl.cpp b/sources/plasmoid-kde4/netctl.cpp index f5cbd0c..6cb83f7 100644 --- a/sources/plasmoid-kde4/netctl.cpp +++ b/sources/plasmoid-kde4/netctl.cpp @@ -243,8 +243,7 @@ void Netctl::enableProfileSlot() } else { QProcess command; QString commandLine = QString(""); - if (useSudo) - commandLine = paths[QString("sudo")] + QString(" "); + if (useSudo) commandLine = QString("%1 ").arg(paths[QString("sudo")]); commandLine += paths[QString("netctl")] + enableStatus + info[QString("current")]; command.startDetached(commandLine); } @@ -263,9 +262,8 @@ void Netctl::restartProfileSlot() } else { QProcess command; QString commandLine = QString(""); - if (useSudo) - commandLine = paths[QString("sudo")] + QString(" "); - commandLine += paths[QString("netctl")] + QString(" restart ") + info[QString("current")]; + if (useSudo) commandLine = QString("%1 ").arg(paths[QString("sudo")]); + commandLine += QString("%1 restart %2").arg(paths[QString("netctl")]).arg(info[QString("current")]); command.startDetached(commandLine); } } @@ -287,12 +285,11 @@ void Netctl::startProfileSlot(QAction *profile) } else { QProcess command; QString commandLine = QString(""); - if (useSudo) - commandLine = paths[QString("sudo")] + QString(" "); + if (useSudo) commandLine = QString("%1 ").arg(paths[QString("sudo")]); if (status) - commandLine += paths[QString("netctl")] + QString(" switch-to ") + profile->text().remove(QChar('&')); + commandLine += QString("%1 switch-to %2").arg(paths[QString("netctl")]).arg(profile->text().remove(QChar('&'))); else - commandLine += paths[QString("netctl")] + QString(" start ") + profile->text().remove(QChar('&')); + commandLine += QString("%1 start %2").arg(paths[QString("netctl")]).arg(profile->text().remove(QChar('&'))); command.startDetached(commandLine); } } @@ -310,9 +307,8 @@ void Netctl::stopProfileSlot() } else { QProcess command; QString commandLine = QString(""); - if (useSudo) - commandLine = paths[QString("sudo")] + QString(" "); - commandLine += paths[QString("netctl")] + QString(" stop ") + info[QString("current")]; + if (useSudo) commandLine = QString("%1 ").arg(paths[QString("sudo")]); + commandLine += QString("%1 stop %2").arg(paths[QString("netctl")]).arg(info[QString("current")]); command.startDetached(commandLine); } } @@ -328,9 +324,8 @@ void Netctl::stopAllProfilesSlot() else { QProcess command; QString commandLine = QString(""); - if (useSudo) - commandLine = paths[QString("sudo")] + QString(" "); - commandLine += paths[QString("netctl")] + QString(" stop-all "); + if (useSudo) commandLine = QString("%1 ").arg(paths[QString("sudo")]); + commandLine += QString("%1 stop-all").arg(paths[QString("netctl")]); command.startDetached(commandLine); } } @@ -349,8 +344,7 @@ void Netctl::switchToProfileSlot(QAction *profile) sendDBusRequest(QString("autoStart"), args); } else { QProcess command; - QString commandLine = paths[QString("netctlAuto")] + QString(" switch-to ") + - profile->text().remove(QChar('&')); + QString commandLine = QString("%1 switch-to %2").arg(paths[QString("netctlAuto")]).arg(profile->text().remove(QChar('&'))); command.startDetached(commandLine); } } @@ -384,7 +378,7 @@ QList Netctl::contextualActions() contextMenu[QString("title")]->setIcon(QIcon(paths[QString("active")])); else contextMenu[QString("title")]->setIcon(QIcon(paths[QString("inactive")])); - contextMenu[QString("title")]->setText(info[QString("current")] + QString(" ") + info[QString("status")]); + contextMenu[QString("title")]->setText(info[QString("info")]); if (info[QString("status")] == QString("(netctl-auto)")) { contextMenu[QString("start")]->setVisible(false); @@ -760,13 +754,20 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) uiAboutConfig.label_version->setText(i18n("Version %1\n(build date %2)", QString(VERSION), QString(BUILD_DATE))); uiAboutConfig.label_description->setText(i18n("KDE widget which interacts with netctl.")); uiAboutConfig.label_links->setText(i18n("Links:") + QString("
") + - QString("%2
").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) + - QString("%2
").arg(QString(REPOSITORY)).arg(i18n("Repository")) + - QString("%2
").arg(QString(BUGTRACKER)).arg(i18n("Bugtracker")) + - QString("%2
").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) + - QString("%2").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages"))); - uiAboutConfig.label_license->setText(QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + - i18n("This software is licensed under %1", QString(LICENSE)) + QString("")); + QString("%2
").arg(QString(HOMEPAGE)) + .arg(QApplication::translate("AboutWindow", "Homepage")) + + QString("%2
").arg(QString(REPOSITORY)) + .arg(QApplication::translate("AboutWindow", "Repository")) + + QString("%2
").arg(QString(BUGTRACKER)) + .arg(QApplication::translate("AboutWindow", "Bugtracker")) + + QString("%2
").arg(QString(TRANSLATION)) + .arg(QApplication::translate("AboutWindow", "Translation issue")) +\ + QString("%2").arg(QString(AUR_PACKAGES)) + .arg(QApplication::translate("AboutWindow", "AUR packages"))); + uiAboutConfig.label_license->setText(QString("© %1 %3
") + .arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + + i18n("This software is licensed under %1", QString(LICENSE)) + + QString("")); // 2nd tab QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); for (int i=0; i%2
").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) + QString("%2").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages")); else if (type == QString("copy")) - text = QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + - i18n("This software is licensed under %1", QString(LICENSE)) + QString(""); + text = QString("© %1 %3
") + .arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + + i18n("This software is licensed under %1", QString(LICENSE)) + + QString(""); else if (type == QString("translators")) text = i18n("Translators: %1", QString(TRANSLATORS)); else if (type == QString("3rdparty")) { @@ -126,7 +128,7 @@ QString NetctlAdds::parsePattern(const QString pattern) QString parsed = pattern; for (int i=0; i")); @@ -167,7 +169,7 @@ void NetctlAdds::setDataBySource(const QString sourceName, const QMapsetComponentName(QString("plasma-applet-org.kde.plasma.netctl")); } @@ -200,7 +202,7 @@ void NetctlAdds::enableProfileSlot(const bool useHelper, const QString cmd, cons sendDBusRequest(QString("Enable"), args); } else { QProcess command; - QString commandLine = sudoCmd + QString(" ") + cmd + enableStatus + values[QString("current")]; + QString commandLine = QString("%1 %2%3%4").arg(sudoCmd).arg(cmd).arg(enableStatus).arg(values[QString("current")]); command.startDetached(commandLine); } } @@ -217,7 +219,7 @@ void NetctlAdds::restartProfileSlot(const bool useHelper, const QString cmd, con sendDBusRequest(QString("Restart"), args); } else { QProcess command; - QString commandLine = sudoCmd + QString(" ") + cmd + QString(" restart ") + values[QString("current")]; + QString commandLine = QString("%1 %2 restart %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]); command.startDetached(commandLine); } } @@ -243,11 +245,11 @@ void NetctlAdds::startProfileSlot(const bool useHelper, const QString cmd, const sendDBusRequest(QString("Start"), args); } else { QProcess command; - QString commandLine = sudoCmd + QString(" ") + cmd; + QString commandLine = QString("%1 %2").arg(sudoCmd).arg(cmd); if (values[QString("active")] == QString("true")) - commandLine += QString(" switch-to ") + profile; + commandLine += QString(" switch-to %1").arg(profile); else - commandLine += QString(" start ") + profile; + commandLine += QString(" start %1").arg(profile); command.startDetached(commandLine); } } @@ -264,7 +266,7 @@ void NetctlAdds::stopProfileSlot(const bool useHelper, const QString cmd, const sendDBusRequest(QString("Start"), args); } else { QProcess command; - QString commandLine = sudoCmd + QString(" ") + cmd + QString(" stop ") + values[QString("current")]; + QString commandLine = QString("%1 %2 stop %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]); command.startDetached(commandLine); } } @@ -279,7 +281,7 @@ void NetctlAdds::stopAllProfilesSlot(const bool useHelper, const QString cmd, co sendDBusRequest(QString("StopAll"), QList()); else { QProcess command; - QString commandLine = sudoCmd + QString(" ") + cmd + QString(" stop-all"); + QString commandLine = QString("%1 %2 stop-all").arg(sudoCmd).arg(cmd); command.startDetached(commandLine); } } @@ -302,7 +304,7 @@ void NetctlAdds::switchToProfileSlot(const bool useHelper, const QString cmd) sendDBusRequest(QString("autoStart"), args); } else { QProcess command; - QString commandLine = cmd + QString(" switch-to ") + profile; + QString commandLine = QString("%1 switch-to %2").arg(cmd).arg(profile); command.startDetached(commandLine); } } @@ -338,7 +340,7 @@ void NetctlAdds::writeDataEngineConfiguration(const QMap conf { if (debug) qDebug() << PDEBUG; - QString fileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QString("/plasma-dataengine-netctl.conf"); + QString fileName = QString("%1/plasma-dataengine-netctl.conf").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)); QSettings settings(fileName, QSettings::IniFormat); if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName(); diff --git a/sources/test/testnetctl.cpp b/sources/test/testnetctl.cpp index a26266a..a9d3914 100644 --- a/sources/test/testnetctl.cpp +++ b/sources/test/testnetctl.cpp @@ -121,7 +121,7 @@ void TestNetctl::test_getRecommendedConfiguration() QMap resultMap = Netctl::getRecommendedConfiguration(); QStringList result; for (int i=0; igetActiveProfile(); QStringList dbus; if (helper) - dbus = sendDBusRequest(QString("/netctl"), QString("ActiveProfile")) - [0].toString().split(QChar('|')); + dbus = sendDBusRequest(QString("/netctl"), QString("netctlActiveProfile"))[0].toString().split(QChar('|')); netctl->startProfile(QString("netctlgui-test-dummy")); delete netctl; diff --git a/sources/test/testnetctlauto.cpp b/sources/test/testnetctlauto.cpp index ebee734..c873c74 100644 --- a/sources/test/testnetctlauto.cpp +++ b/sources/test/testnetctlauto.cpp @@ -82,8 +82,7 @@ QList TestNetctlAuto::sendDBusRequest(const QString path, const QStrin QDBusConnection bus = QDBusConnection::systemBus(); QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, path, DBUS_HELPER_INTERFACE, cmd); - if (!args.isEmpty()) - request.setArguments(args); + if (!args.isEmpty()) request.setArguments(args); QDBusMessage response = bus.call(request); QList arguments = response.arguments(); diff --git a/sources/test/testnetctlprofile.cpp b/sources/test/testnetctlprofile.cpp index f9bcecf..8f98f13 100644 --- a/sources/test/testnetctlprofile.cpp +++ b/sources/test/testnetctlprofile.cpp @@ -68,8 +68,7 @@ QList TestNetctlProfile::sendDBusRequest(const QString path, const QSt QDBusConnection bus = QDBusConnection::systemBus(); QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, path, DBUS_HELPER_INTERFACE, cmd); - if (!args.isEmpty()) - request.setArguments(args); + if (!args.isEmpty()) request.setArguments(args); QDBusMessage response = bus.call(request); QList arguments = response.arguments(); @@ -110,7 +109,7 @@ void TestNetctlProfile::test_getRecommendedConfiguration() QMap resultMap = NetctlProfile::getRecommendedConfiguration(); QStringList result; for (int i=0; i resultMap = netctl->getSettingsFromProfile(QString("netctlgui-test-full")); for (int i=0; iremoveProfile(QString("netctlgui-test-full")); delete netctl; diff --git a/sources/test/testwpasup.cpp b/sources/test/testwpasup.cpp index 98b4034..b00eb58 100644 --- a/sources/test/testwpasup.cpp +++ b/sources/test/testwpasup.cpp @@ -43,8 +43,7 @@ QList TestWpaSup::sendDBusRequest(const QString path, const QString cm QDBusConnection bus = QDBusConnection::systemBus(); QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, path, DBUS_HELPER_INTERFACE, cmd); - if (!args.isEmpty()) - request.setArguments(args); + if (!args.isEmpty()) request.setArguments(args); QDBusMessage response = bus.call(request); QList arguments = response.arguments(); @@ -86,7 +85,7 @@ void TestWpaSup::test_getRecommendedConfiguration() QMap resultMap = WpaSup::getRecommendedConfiguration(); QStringList result; for (int i=0; i