added workarounds

This commit is contained in:
arcan1s 2014-07-14 19:07:17 +04:00
parent e02a6a8ce1
commit 4fb02058b1
3 changed files with 12 additions and 6 deletions

View File

@ -69,7 +69,7 @@ void AboutWindow::createUi()
{ {
if (debug) qDebug() << "[AboutWindow]" << "[createUi]"; if (debug) qDebug() << "[AboutWindow]" << "[createUi]";
QWidget *aboutWidget = new QWidget; QWidget *aboutWidget = new QWidget();
uiAbout = new Ui::About; uiAbout = new Ui::About;
uiAbout->setupUi(aboutWidget); uiAbout->setupUi(aboutWidget);
ui->verticalLayout->addWidget(aboutWidget); ui->verticalLayout->addWidget(aboutWidget);

View File

@ -184,10 +184,10 @@ void GeneralWidget::setSettings(const QMap<QString, QString> settings)
for (int i=0; i<ui->comboBox_connection->count(); i++) for (int i=0; i<ui->comboBox_connection->count(); i++)
if (generalSettings[QString("Connection")] == ui->comboBox_connection->itemText(i)) if (generalSettings[QString("Connection")] == ui->comboBox_connection->itemText(i))
ui->comboBox_connection->setCurrentIndex(i); ui->comboBox_connection->setCurrentIndex(i);
if (generalSettings.contains(QString("Interface"))) if (generalSettings.contains(QString("Interface"))) {
for (int i=0; i<ui->comboBox_interface->count(); i++) ui->comboBox_interface->addItem(generalSettings[QString("Interface")]);
if (generalSettings[QString("Interface")] == ui->comboBox_interface->itemText(i)) ui->comboBox_interface->setCurrentIndex(ui->comboBox_interface->count()-1);
ui->comboBox_interface->setCurrentIndex(i); }
if (generalSettings.contains(QString("BindsToInterfaces"))) if (generalSettings.contains(QString("BindsToInterfaces")))
ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar('\n'))); ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar('\n')));
if (generalSettings.contains(QString("After"))) if (generalSettings.contains(QString("After")))

View File

@ -307,8 +307,14 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
ui->comboBox_security->setCurrentIndex(i); ui->comboBox_security->setCurrentIndex(i);
if (wirelessSettings.contains(QString("ESSID"))) if (wirelessSettings.contains(QString("ESSID")))
ui->lineEdit_essid->setText(wirelessSettings[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")]); ui->lineEdit_key->setText(wirelessSettings[QString("Key")]);
}
if (wirelessSettings.contains(QString("WPAConfigSection"))) if (wirelessSettings.contains(QString("WPAConfigSection")))
ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QChar('\n'))); ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QChar('\n')));
if (wirelessSettings.contains(QString("WPAConfigFile"))) if (wirelessSettings.contains(QString("WPAConfigFile")))