diff --git a/app/HGProductionTool/dialog_login.cpp b/app/HGProductionTool/dialog_login.cpp
index 02c6496..00237fd 100644
--- a/app/HGProductionTool/dialog_login.cpp
+++ b/app/HGProductionTool/dialog_login.cpp
@@ -26,6 +26,13 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
ui->label_title->setText(tr("LogIn"));
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
+ QString ipStr = "\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b";
+ QString portStr = "[0-9]+$";
+ ui->lineEdit_dbHost->setValidator(new QRegExpValidator(QRegExp(ipStr)));
+ ui->lineEdit_ftpHost->setValidator(new QRegExpValidator(QRegExp(ipStr)));
+ ui->lineEdit_dbPort->setValidator(new QRegExpValidator(QRegExp(portStr)));
+ ui->lineEdit_ftpPort->setValidator(new QRegExpValidator(QRegExp(portStr)));
+
QString account("root");
QString dbHost("192.168.1.70");
QString dbPort("3306");
@@ -33,7 +40,6 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
QString ftpPort("21");
ui->lineEdit_account->setText(getCfgValue("login", "account", account));
-
ui->lineEdit_dbHost->setText(getCfgValue("login", "dbHost", dbHost));
ui->lineEdit_dbPort->setText(getCfgValue("login", "dbPort", dbPort));
ui->lineEdit_ftpHost->setText(getCfgValue("login", "ftpHost", ftpHost));
@@ -161,7 +167,8 @@ QString Dialog_logIn::getCfgValue(const char *appName, const char *key, const QS
HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini");
+ std::string def2 = getStdString(def);
HGChar value[512] = {0};
- HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512);
+ HGBase_GetProfileString(cfgPath, appName, key, def2.c_str(), value, 512);
return StdStringToUtf8(value).c_str();
}
diff --git a/app/HGProductionTool/dialog_login.ui b/app/HGProductionTool/dialog_login.ui
index 58a65b6..e86a8ac 100644
--- a/app/HGProductionTool/dialog_login.ui
+++ b/app/HGProductionTool/dialog_login.ui
@@ -6,7 +6,7 @@
0
0
- 455
+ 473
278
@@ -146,7 +146,7 @@ QPushButton#pbtn_close::hover
40
40
- 381
+ 411
141
@@ -220,7 +220,7 @@ QPushButton#pbtn_close::hover
150
20
- 151
+ 171
20
@@ -243,7 +243,7 @@ QPushButton#pbtn_close::hover
150
50
- 151
+ 171
20
@@ -266,7 +266,7 @@ QPushButton#pbtn_close::hover
150
80
- 151
+ 171
20
@@ -289,7 +289,7 @@ QPushButton#pbtn_close::hover
150
110
- 151
+ 171
20