diff --git a/sources/gui/src/aboutwindow.cpp b/sources/gui/src/aboutwindow.cpp index 8695e61..7724598 100644 --- a/sources/gui/src/aboutwindow.cpp +++ b/sources/gui/src/aboutwindow.cpp @@ -69,7 +69,7 @@ void AboutWindow::createUi() { if (debug) qDebug() << "[AboutWindow]" << "[createUi]"; - QWidget *aboutWidget = new QWidget; + QWidget *aboutWidget = new QWidget(); uiAbout = new Ui::About; uiAbout->setupUi(aboutWidget); ui->verticalLayout->addWidget(aboutWidget); diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index a9cf9ac..b5e928a 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -184,10 +184,10 @@ void GeneralWidget::setSettings(const QMap settings) for (int i=0; icomboBox_connection->count(); i++) if (generalSettings[QString("Connection")] == ui->comboBox_connection->itemText(i)) ui->comboBox_connection->setCurrentIndex(i); - if (generalSettings.contains(QString("Interface"))) - for (int i=0; icomboBox_interface->count(); i++) - if (generalSettings[QString("Interface")] == ui->comboBox_interface->itemText(i)) - ui->comboBox_interface->setCurrentIndex(i); + if (generalSettings.contains(QString("Interface"))) { + ui->comboBox_interface->addItem(generalSettings[QString("Interface")]); + ui->comboBox_interface->setCurrentIndex(ui->comboBox_interface->count()-1); + } if (generalSettings.contains(QString("BindsToInterfaces"))) ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar('\n'))); if (generalSettings.contains(QString("After"))) diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index d154b56..f1a31ec 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -307,8 +307,14 @@ void WirelessWidget::setSettings(const QMap settings) ui->comboBox_security->setCurrentIndex(i); if (wirelessSettings.contains(QString("ESSID"))) ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]); - if (wirelessSettings.contains(QString("Key"))) + if (wirelessSettings.contains(QString("Key"))) { + // workaround for wireless-wep example + if (wirelessSettings.contains(QString("Security"))) + if ((wirelessSettings[QString("Security")] == QString("wep")) && + (wirelessSettings[QString("Key")][0] == QChar('"'))) + wirelessSettings[QString("Key")] = QChar('\\') + wirelessSettings[QString("Key")]; ui->lineEdit_key->setText(wirelessSettings[QString("Key")]); + } if (wirelessSettings.contains(QString("WPAConfigSection"))) ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QChar('\n'))); if (wirelessSettings.contains(QString("WPAConfigFile")))