diff --git a/CHANGELOG b/CHANGELOG
index 9ce23f0..08f4a05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Ver.1.1.1:
+ [gui] added suppoort of macvlan
+ [gui] added ability to remove profile
++ [gui] added support of hidden wifi network
Ver.1.1.0 (netctl-1.7 update):
+ [gui] added frequency
diff --git a/sources/gui/resources/translations/english.ts b/sources/gui/resources/translations/english.ts
index 40be503..10d1e1b 100644
--- a/sources/gui/resources/translations/english.ts
+++ b/sources/gui/resources/translations/english.ts
@@ -851,6 +851,10 @@
Password
Password
+
+ ESSID
+ ESSID
+
PppoeWidget
diff --git a/sources/gui/resources/translations/russian.ts b/sources/gui/resources/translations/russian.ts
index 548500b..3e8a1e5 100644
--- a/sources/gui/resources/translations/russian.ts
+++ b/sources/gui/resources/translations/russian.ts
@@ -851,6 +851,10 @@
Password
Пароль
+
+ ESSID
+ ESSID
+
PppoeWidget
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index d09dc88..647bad1 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -948,6 +948,13 @@ void MainWindow::connectToUnknownEssid(const QString passwd)
}
+void MainWindow::setHiddenName(const QString name)
+{
+ ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 0)->setText(name);
+ wifiTabStart();
+}
+
+
void MainWindow::wifiTabStart()
{
if (!checkExternalApps(QString("wpasup"))) {
@@ -958,9 +965,15 @@ void MainWindow::wifiTabStart()
if (ui->tableWidget_wifi->currentItem() == 0)
return;
if (ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 0)->text() == QString("")) {
- ui->pushButton_wifiStart->setDisabled(true);
- errorWin = new ErrorWindow(this, 2);
- errorWin->show();
+ passwdWid = new PasswdWidget(this);
+ passwdWid->setPassword(false);
+ int widgetWidth = 270;
+ int widgetHeight = 86;
+ int x = (width() - widgetWidth) / 2;
+ int y = (height() - widgetHeight) / 2;
+ passwdWid->setGeometry(x, y, widgetWidth, widgetHeight);
+ passwdWid->show();
+ passwdWid->setFocusToLineEdit();
return;
}
@@ -991,6 +1004,7 @@ void MainWindow::wifiTabStart()
return connectToUnknownEssid(QString(""));
else {
passwdWid = new PasswdWidget(this);
+ passwdWid->setPassword(true);
int widgetWidth = 270;
int widgetHeight = 86;
int x = (width() - widgetWidth) / 2;
diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h
index 84ed9cf..56ddc8d 100644
--- a/sources/gui/src/mainwindow.h
+++ b/sources/gui/src/mainwindow.h
@@ -62,6 +62,7 @@ public slots:
void updateTabs(const int tab);
// wifi tab slots
void connectToUnknownEssid(const QString passwd);
+ void setHiddenName(const QString name);
private slots:
void updateMainTab();
diff --git a/sources/gui/src/passwdwidget.cpp b/sources/gui/src/passwdwidget.cpp
index cbcccc5..87753e1 100644
--- a/sources/gui/src/passwdwidget.cpp
+++ b/sources/gui/src/passwdwidget.cpp
@@ -18,6 +18,8 @@
#include "passwdwidget.h"
#include "ui_passwdwidget.h"
+#include
+
#include "mainwindow.h"
@@ -59,6 +61,19 @@ void PasswdWidget::setFocusToLineEdit()
}
+void PasswdWidget::setPassword(const bool mode)
+{
+ if (mode) {
+ ui->lineEdit->setEchoMode(QLineEdit::Password);
+ ui->label->setText(QApplication::translate("PasswdWidget", "Password"));
+ }
+ else {
+ ui->lineEdit->setEchoMode(QLineEdit::Normal);
+ ui->label->setText(QApplication::translate("PasswdWidget", "ESSID"));
+ }
+}
+
+
void PasswdWidget::cancel()
{
hide();
@@ -70,5 +85,8 @@ void PasswdWidget::cancel()
void PasswdWidget::passwdApply()
{
hide();
- return parent->connectToUnknownEssid(ui->lineEdit->text());
+ if (ui->lineEdit->echoMode() == QLineEdit::Normal)
+ return parent->setHiddenName(ui->lineEdit->text());
+ else
+ return parent->connectToUnknownEssid(ui->lineEdit->text());
}
diff --git a/sources/gui/src/passwdwidget.h b/sources/gui/src/passwdwidget.h
index b9e5fbc..ea52bdf 100644
--- a/sources/gui/src/passwdwidget.h
+++ b/sources/gui/src/passwdwidget.h
@@ -39,6 +39,7 @@ public:
public slots:
void setFocusToLineEdit();
+ void setPassword(const bool mode = true);
private slots:
void cancel();