Merge branch 'branch'
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
#include <QtWidgets/QLineEdit>
|
#include <QtWidgets/QLineEdit>
|
||||||
#include "getadminpsw.h"
|
#include "getadminpsw.h"
|
||||||
#include "device/networkmanager.h"
|
#include "device/networkmanager.h"
|
||||||
|
#include "device/networkmanager.h"
|
||||||
|
|
||||||
GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
|
GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
|
||||||
|
|
||||||
@@ -33,5 +34,14 @@ QString GetAdminPsw::getPsw()const
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool GetAdminPsw::updateReferenceData() {
|
bool GetAdminPsw::updateReferenceData() {
|
||||||
|
#ifndef WIN32
|
||||||
|
//verify the password
|
||||||
|
QString err;
|
||||||
|
if (!NetworkManager::checkPassWord(_psw->text(),err))
|
||||||
|
{
|
||||||
|
lbl_error->setText(err);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user