translation improvements 1

cfgs/usct-product.json

@@ -1,4 +1,7 @@
 {
+	"login":	{
+		"defaultUser":	""
+	},
 	"deviceparam":	{
 		"aeTitle":	"ACME1",
 		"hospitalAddr":	"北京",

src/AdminSettingForm.cpp

@@ -21,13 +21,13 @@
 AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabFormWidget(parent) {
 
 	QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->setContentsMargins(0,8,0,8);
+	layout->setMargin(0);
+	layout->setContentsMargins(0, 8, 0, 8);
 	this->ui->contentWidget->setLayout(layout);
 	QListWidget* widget = new QListWidget(this);
 	widget->setFixedWidth(250);
 	QStringList menus;
-	menus << tr("General") << tr("Account Manage") << tr("System Setting") << tr("System Information") << tr("Operation Log") << tr("About");
+	menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
 	widget->addItems(menus);
 	widget->setSpacing(3);
 	for (int i = 0; i < menus.count(); ++i) {
@@ -46,7 +46,7 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	GeneralForm* generalForm = new GeneralForm(this);
 	stackedWidget->addWidget(generalForm);
 
-    AccountTableForm* acc = new AccountTableForm(this);
+	AccountTableForm* acc = new AccountTableForm(this);
 
 	stackedWidget->addWidget(acc);
 
@@ -71,18 +71,18 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	widget->setCurrentRow(0);
 	connect(widget, &QListWidget::currentRowChanged, [=](int rowindex) {
 		stackedWidget->setCurrentIndex(rowindex);
-	});
-	connect(EventCenter::Default(),&EventCenter::ReloadLanguage,[=](){
-        QStringList menus2;
-        menus2 << tr("General") << tr("Account Manage") << tr("System Setting") << tr("System Information") << tr("Operation Log") << tr("About");
-        widget->clear();
+		});
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+		QStringList menus2;
+		menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
+		widget->clear();
 
-        widget->addItems(menus2);
-        for (int i = 0; i < menus.count(); ++i) {
-            widget->item(i)->setTextAlignment(Qt::AlignCenter);
-        }
-        about->setText(tr("About"));
-	});
+		widget->addItems(menus2);
+		for (int i = 0; i < menus.count(); ++i) {
+			widget->item(i)->setTextAlignment(Qt::AlignCenter);
+		}
+		about->setText(tr("About"));
+		});
 }
 
 AdminSettingForm::~AdminSettingForm() {

src/SelectFormWidget.cpp

@@ -56,8 +56,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	ui->commandWidget->setLayout(layout);
 	ADD_TOOL_BTN(Account, ":/icons/account.png");
 	ADD_TOOL_BTN(Worklist, ":/icons/setting.png");
-    btnAccount->setText(tr("Account"));
-    btnWorklist->setText(tr("Worklist"));
+	btnAccount->setText(tr("Account"));
+	btnWorklist->setText(tr("Worklist"));
 
 	layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
 	QWidget* spacerLine = new QWidget(this);
@@ -68,10 +68,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	ADD_TOOL_BTN(Edit, ":/icons/details.png");
 	ADD_TOOL_BTN(Delete, ":/icons/close_circle.png");
 	ADD_TOOL_BTN(Select, ":/icons/selected.png");
-    btnAdd->setText(tr("Add"));
-    btnEdit->setText(tr("Edit"));
-    btnDelete->setText(tr("Delete"));
-    btnSelect->setText(tr("Select"));
+	btnAdd->setText(tr("Add"));
+	btnEdit->setText(tr("Edit"));
+	btnDelete->setText(tr("Delete"));
+	btnSelect->setText(tr("Select"));
 
 	//Init content widget
 	QHBoxLayout* contentLayout = new QHBoxLayout();
@@ -91,9 +91,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	model->sort(5, Qt::DescendingOrder);
 	model->select();
 	model->setHeaderData(1, Qt::Horizontal, "ID");
-	model->setHeaderData(2, Qt::Horizontal, "Name");
-	model->setHeaderData(3, Qt::Horizontal, "Birth Date");
-	model->setHeaderData(5, Qt::Horizontal, "Add Date");
+	model->setHeaderData(2, Qt::Horizontal, tr("Name"));
+	model->setHeaderData(3, Qt::Horizontal, tr("Birth Date"));
+	model->setHeaderData(4, Qt::Horizontal, tr("Gender"));
+	model->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
 	table->setModel((QAbstractItemModel*)model);
 	table->hideColumn(0);
 	table->hideColumn(7);
@@ -104,7 +105,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	table->setColumnWidth(1, 250);
 	table->setColumnWidth(2, 250);
 	table->setColumnWidth(3, 120);
-	table->setColumnWidth(4, 60);
+	table->setColumnWidth(4, 80);
 	table->setColumnWidth(5, 250);
 	//    table->sortByColumn(5);
 	//    table->setSortingEnabled(true);

src/json/jsonobject.cpp

@@ -40,10 +40,10 @@ void JsonObject::setJsonString(const char* catergory, const char* stringName, co
 char* JsonObject::getJsonString(const char* catergory, const char* stringName)
 {
 	if (!loadcfg())
-        return nullptr;
+		return nullptr;
 
 	cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
-    if (!first) return nullptr;
+	if (!first) return nullptr;
 
 	cJSON* second = cJSON_GetObjectItem(first, stringName);
 	return second->valuestring;
@@ -52,13 +52,13 @@ char* JsonObject::getJsonString(const char* catergory, const char* stringName)
 char* JsonObject::getArrayNode(const char* catergory, const char* stringName, int index, const char* id)
 {
 	if (!loadcfg())
-        return nullptr;
+		return nullptr;
 
 	cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
-    if (!first) return nullptr;
+	if (!first) return nullptr;
 
 	cJSON* second = cJSON_GetObjectItem(first, stringName);
-    if (!second) return nullptr;
+	if (!second) return nullptr;
 
 	cJSON* third = cJSON_GetArrayItem(second, index);
 
@@ -98,6 +98,15 @@ int JsonObject::getArraySize(const char* catergory, const char* stringName)
 }
 
 
+void JsonObject::setDefaultUser(const QString& str)
+{
+	setJsonString("login", "defaultUser", str.toStdString().c_str());
+}
+QString JsonObject::defaultUser()
+{
+	char* str = getJsonString("login", "defaultUser");
+	return QString(str);
+}
 QStringList JsonObject::protocals()
 {
 	if (!loadcfg())
@@ -121,7 +130,7 @@ QString JsonObject::defaultProtocal()
 	return QString(str);
 }
 
-void JsonObject::setDefaultProtocal(QString str)
+void JsonObject::setDefaultProtocal(const QString& str)
 {
 	setJsonString("protocol", "default", str.toStdString().c_str());
 }
@@ -131,7 +140,7 @@ QString JsonObject::defaultFilter()
 	char* str = getJsonString("worklistfilter", "default");
 	return QString(str);
 }
-void JsonObject::setDefaultFilter(QString str)
+void JsonObject::setDefaultFilter(const QString& str)
 {
 	setJsonString("worklistfilter", "default", str.toStdString().c_str());
 }
@@ -167,7 +176,7 @@ QStringList JsonObject::language()
 
 }
 
-void JsonObject::setDefaultLanguage(QString str)
+void JsonObject::setDefaultLanguage(const QString& str)
 {
 	setJsonString("general", "defaultlanguage", str.toStdString().c_str());
 }
@@ -183,7 +192,7 @@ QString JsonObject::institutionName()
 	char* str = getJsonString("general", "institutionName");
 	return QString(str);
 }
-void JsonObject::setInstitutionName(QString str)
+void JsonObject::setInstitutionName(const QString& str)
 {
 	setJsonString("general", "institutionName", str.toStdString().c_str());
 }
@@ -194,7 +203,7 @@ QString JsonObject::institutionAddr()
 	return QString(str);
 }
 
-void JsonObject::setInstitutionAddr(QString str)
+void JsonObject::setInstitutionAddr(const QString& str)
 {
 	setJsonString("general", "institutionAddr", str.toStdString().c_str());
 }
@@ -212,7 +221,7 @@ QString JsonObject::lockScreenTimeout()
 	return QString(str);
 }
 
-void JsonObject::setLockScreenTimeout(QString str)
+void JsonObject::setLockScreenTimeout(const QString& str)
 {
 	setJsonString("general", "lockscreen", str.toStdString().c_str());
 }
@@ -326,15 +335,12 @@ QString JsonObject::interfaceName()
 
 QString JsonObject::passWord()
 {
-    if (!loadcfg())
-        return QString("");
 	return tmp_psw;
 }
 
 void JsonObject::setPassword(const QString& pwd)
 {
-	//if (!loadcfg())
-	//	return;
+
 	tmp_psw = pwd;
 }
 void JsonObject::setInterfaceName(const QString& name)

src/json/jsonobject.h

@@ -41,29 +41,34 @@ public:
 		WORKLIST, PACS, DAQ, RECON
 	};
 
+	//for login
+	void setDefaultUser(const QString& str);
+	QString defaultUser();
+
+
 	QStringList language();
-	void setDefaultLanguage(QString str);
+	void setDefaultLanguage(const QString& str);
 	QString defaultLanguage();
 
 	QString institutionName();
-	void setInstitutionName(QString str);
+	void setInstitutionName(const QString& str);
 
 	QString institutionAddr();
-	void setInstitutionAddr(QString str);
+	void setInstitutionAddr(const QString& str);
 
 	int lockerCount();
 	QString lockScreenTimeout();
-	void setLockScreenTimeout(QString str);
+	void setLockScreenTimeout(const QString& str);
 
 
 	QStringList protocals();
 	QString defaultProtocal();
-	void setDefaultProtocal(QString str);
+	void setDefaultProtocal(const QString& str);
 
 
 	QStringList worklistFilters();
 	QString defaultFilter();
-	void setDefaultFilter(QString str);
+	void setDefaultFilter(const QString& str);
 
 	host getServer(ServerType type);
 	void setServer(ServerType type, const host& list);

src/loginwindow.cpp

@@ -12,21 +12,23 @@
 #include "InputObject.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
-
+#include "json/jsonobject.h"
 LoginWindow::LoginWindow(QWidget* parent)
-    : QDialog(parent)
-    , m_pLoginButton(nullptr)
-    , m_pVMainLayout(nullptr)
-    , m_pUserCodeFrame(nullptr)
-    , m_pUserCodeLayout(nullptr)
-    , m_pUserCodeEdit(nullptr)
-    , m_pPassWordEdit(nullptr)
+	: QDialog(parent)
+	, m_pLoginButton(nullptr)
+	, m_pVMainLayout(nullptr)
+	, m_pUserCodeFrame(nullptr)
+	, m_pUserCodeLayout(nullptr)
+	, m_pUserCodeEdit(nullptr)
+	, m_pPassWordEdit(nullptr)
 {
-    initUi();
-    init();
-    setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
-    //Dialog::Instance()->InitForm();
-    m_pUserCodeEdit->setText(tr("usct"));
+	initUi();
+	init();
+	setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+	//Dialog::Instance()->InitForm();
+	m_pUserCodeEdit->setText(JsonObject::Instance()->defaultUser());
+
+
 }
 
 LoginWindow::~LoginWindow()
@@ -37,76 +39,76 @@ LoginWindow::~LoginWindow()
 
 void LoginWindow::initUi()
 {
-    QString style = "*{background-color:#3c3c3c; color:white;margin:0;font-size:16px;}"
-        "QLabel#title{font-Size:98px;color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
-        "stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);}"
-        "QLabel#warn{color:#930000;background:transparent;font-size:20px;}"
-        "QFrame#login_frame_username{min-width:700px;max-width:700px;max-height:500px;min-height:500px;"
-        "border:1px solid #0078d8;border-radius:20px;"
-        "background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\n"
-        "                          stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray);"
-        "}"
-        "QLineEdit{min-height:100px;max-height:100px; border:1px solid silver;border-radius:10px;font-size:26px;}"
-        "QLineEdit:enabled{background-color: #515151}"
-        "QComboBox{text-align:center;min-height:100px;max-height:100px; "
-        "border:1px solid silver;border-radius:10px;padding:3px}"
-        "QComboBox:enabled{background-color: #515151}"
-        "QComboBox::drop-down{width:80px;border-radius:10px}"
-        "QComboBox QAbstractItemView{min-width:120px;}"
-        "QComboBox QAbstractItemView::item {min-height:60px;max-height:60px;  border:1px solid white;}"
-        "QToolButton{min-height:100px;max-height:100px;border:1px solid #505050;"
-        "border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}"
-        "QToolButton:hover{background:#505050;}";
-    setStyleSheet(style);
+	QString style = "*{background-color:#3c3c3c; color:white;margin:0;font-size:16px;}"
+		"QLabel#title{font-Size:98px;color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
+		"stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);}"
+		"QLabel#warn{color:#930000;background:transparent;font-size:20px;}"
+		"QFrame#login_frame_username{min-width:700px;max-width:700px;max-height:500px;min-height:500px;"
+		"border:1px solid #0078d8;border-radius:20px;"
+		"background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\n"
+		"                          stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray);"
+		"}"
+		"QLineEdit{min-height:100px;max-height:100px; border:1px solid silver;border-radius:10px;font-size:26px;}"
+		"QLineEdit:enabled{background-color: #515151}"
+		"QComboBox{text-align:center;min-height:100px;max-height:100px; "
+		"border:1px solid silver;border-radius:10px;padding:3px}"
+		"QComboBox:enabled{background-color: #515151}"
+		"QComboBox::drop-down{width:80px;border-radius:10px}"
+		"QComboBox QAbstractItemView{min-width:120px;}"
+		"QComboBox QAbstractItemView::item {min-height:60px;max-height:60px;  border:1px solid white;}"
+		"QToolButton{min-height:100px;max-height:100px;border:1px solid #505050;"
+		"border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}"
+		"QToolButton:hover{background:#505050;}";
+	setStyleSheet(style);
 
-    m_pVMainLayout = new QVBoxLayout(this);
-    m_pVMainLayout->setContentsMargins(0, 0, 0, 0);
-    m_pVMainLayout->setSpacing(0);
-    m_pVMainLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
+	m_pVMainLayout = new QVBoxLayout(this);
+	m_pVMainLayout->setContentsMargins(0, 0, 0, 0);
+	m_pVMainLayout->setSpacing(0);
+	m_pVMainLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
 
-    QLabel* title = new QLabel(this);
-    title->setObjectName("title");
-    title->setText(tr("U S C T"));
-    m_pVMainLayout->addWidget(title, 0, Qt::AlignCenter);
-    m_pUserCodeFrame = new QFrame(this);
-    m_pUserCodeFrame->setObjectName("login_frame_username");
-    m_pUserCodeLayout = new QVBoxLayout(m_pUserCodeFrame);
-    m_pUserCodeLayout->setSpacing(30);
-    m_pUserCodeLayout->setContentsMargins(20, 60, 20, 20);
-    warn = new QLabel(this);
-    warn->setObjectName("warn");
-    warn->setText("Login failed, username or password error!");
-    warn->setVisible(false);
-    m_pUserCodeLayout->addWidget(warn, 0, Qt::AlignCenter);
-    m_pUserCodeEdit = new QLineEdit(m_pUserCodeFrame);
-    m_pUserCodeEdit->setObjectName("combobox_UserName");
+	QLabel* title = new QLabel(this);
+	title->setObjectName("title");
+	title->setText(tr("U S C T"));
+	m_pVMainLayout->addWidget(title, 0, Qt::AlignCenter);
+	m_pUserCodeFrame = new QFrame(this);
+	m_pUserCodeFrame->setObjectName("login_frame_username");
+	m_pUserCodeLayout = new QVBoxLayout(m_pUserCodeFrame);
+	m_pUserCodeLayout->setSpacing(30);
+	m_pUserCodeLayout->setContentsMargins(20, 60, 20, 20);
+	warn = new QLabel(this);
+	warn->setObjectName("warn");
+	warn->setText("Login failed, username or password error!");
+	warn->setVisible(false);
+	m_pUserCodeLayout->addWidget(warn, 0, Qt::AlignCenter);
+	m_pUserCodeEdit = new QLineEdit(m_pUserCodeFrame);
+	m_pUserCodeEdit->setObjectName("combobox_UserName");
 
-    //m_pUserCodeEdit->setLineEdit(new QLineEdit(m_pUserCodeFrame));
+	//m_pUserCodeEdit->setLineEdit(new QLineEdit(m_pUserCodeFrame));
 
-    m_pUserCodeEdit->setPlaceholderText(tr("Username"));
-    m_pUserCodeLayout->addWidget(m_pUserCodeEdit);
-    m_pVMainLayout->addWidget(m_pUserCodeFrame, 0, Qt::AlignCenter);
+	m_pUserCodeEdit->setPlaceholderText(tr("Username"));
+	m_pUserCodeLayout->addWidget(m_pUserCodeEdit);
+	m_pVMainLayout->addWidget(m_pUserCodeFrame, 0, Qt::AlignCenter);
 
-    m_pPassWordEdit = new QLineEdit(this);
-    m_pPassWordEdit->setObjectName("edt_Password");
-    m_pPassWordEdit->setEchoMode(QLineEdit::Password);
-    m_pPassWordEdit->setPlaceholderText(tr("Password"));
-    m_pUserCodeLayout->addWidget(m_pPassWordEdit);
+	m_pPassWordEdit = new QLineEdit(this);
+	m_pPassWordEdit->setObjectName("edt_Password");
+	m_pPassWordEdit->setEchoMode(QLineEdit::Password);
+	m_pPassWordEdit->setPlaceholderText(tr("Password"));
+	m_pUserCodeLayout->addWidget(m_pPassWordEdit);
 
-    ADD_TOOL_BTN_TO_LAYOUT(login, ":/icons/login.png", m_pUserCodeLayout);
-    btnlogin->setText(tr("Login"));
-    m_pUserCodeLayout->removeWidget(btnlogin);
-    m_pUserCodeLayout->addWidget(btnlogin, 0, Qt::AlignCenter);
-    m_pLoginButton = btnlogin;
-    //    m_pUserCodeLayout->addWidget(m_pLoginButton, 0, Qt::AlignCenter);
-    m_pVMainLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
+	ADD_TOOL_BTN_TO_LAYOUT(login, ":/icons/login.png", m_pUserCodeLayout);
+	btnlogin->setText(tr("Login"));
+	m_pUserCodeLayout->removeWidget(btnlogin);
+	m_pUserCodeLayout->addWidget(btnlogin, 0, Qt::AlignCenter);
+	m_pLoginButton = btnlogin;
+	//    m_pUserCodeLayout->addWidget(m_pLoginButton, 0, Qt::AlignCenter);
+	m_pVMainLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
 
-    initUserList();
+	initUserList();
 }
 
 void LoginWindow::init()
 {
-    connect(m_pLoginButton, SIGNAL(clicked()), this, SLOT(doLogin()));
+	connect(m_pLoginButton, SIGNAL(clicked()), this, SLOT(doLogin()));
 }
 
 void LoginWindow::initUserList()
@@ -115,31 +117,32 @@ void LoginWindow::initUserList()
 
 void LoginWindow::clearInputData()
 {
-    m_pUserCodeEdit->clear();
-    m_pPassWordEdit->clear();
-    //m_pUserCodeEdit->setFocus();
+	m_pUserCodeEdit->clear();
+	m_pPassWordEdit->clear();
+	//m_pUserCodeEdit->setFocus();
 }
 
 
 void LoginWindow::doLogin()
 {
-    QString strUserCode = m_pUserCodeEdit->text();
-    QString strPassWord = m_pPassWordEdit->text();
+	QString strUserCode = m_pUserCodeEdit->text();
+	QString strPassWord = m_pPassWordEdit->text();
 
-    QString encryptedPassword = strPassWord;
-    strPassWord = "123456";
+	QString encryptedPassword = strPassWord;
+	strPassWord = "123456";
 
-    QString encryptPwd = User::getEncryptedPassword(strPassWord);
-    QString sql = QString("select UserCode from Account where UserCode='%1' and Password='%2'")
-        .arg(strUserCode).arg(encryptPwd);
-    if (User::QueryUser(strUserCode, encryptPwd))
-    {
-        accept();
-        LOG_USER_OPERATION(Login);
-    }
-    else {
-        warn->setVisible(true);
-    }
+	QString encryptPwd = User::getEncryptedPassword(strPassWord);
+	QString sql = QString("select UserCode from Account where UserCode='%1' and Password='%2'")
+		.arg(strUserCode).arg(encryptPwd);
+	if (User::QueryUser(strUserCode, encryptPwd))
+	{
+		accept();
+		LOG_USER_OPERATION(Login);
+		JsonObject::Instance()->setDefaultUser(strUserCode);
+	}
+	else {
+		warn->setVisible(true);
+	}
 
 }
 

src/mainwindow.cpp

@@ -149,7 +149,7 @@ MainWindow::MainWindow(QWidget* parent) :
 			if (admin_tab_index == -1)
 			{
 				AdminSettingForm* form = new AdminSettingForm(this);
-				admin_tab_index = tab->addTab(form, tr("Admin"));
+				admin_tab_index = tab->addTab(form, tr("Settings"));
 			}
 		}
 		else {
@@ -189,7 +189,7 @@ MainWindow::MainWindow(QWidget* parent) :
 		tab->setTabText(0, tr("Select"));
 		tab->setTabText(1, tr("Scan"));
 		tab->setTabText(2, tr("Verify"));
-		tab->setTabText(3, tr("Admin"));
+		tab->setTabText(3, tr("Settings"));
 
 		});
 

src/translations/en_US.ts

@@ -117,26 +117,26 @@
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Account Manage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Operation Log</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AlertDialog</name>
@@ -330,10 +330,6 @@
 </context>
 <context>
     <name>LoginWindow</name>
-    <message>
-        <source>usct</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>U S C T</source>
         <translation type="unfinished"></translation>
@@ -370,7 +366,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Admin</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -496,6 +492,22 @@ parameters
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birth Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Date</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>

src/translations/en_US.ts.bak

@@ -117,26 +117,26 @@
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Account Manage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Operation Log</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AlertDialog</name>
@@ -330,10 +330,6 @@
 </context>
 <context>
     <name>LoginWindow</name>
-    <message>
-        <source>usct</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>U S C T</source>
         <translation type="unfinished"></translation>
@@ -370,7 +366,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Admin</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -496,6 +492,22 @@ parameters
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birth Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Date</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>

src/translations/zh_CN.ts

@@ -6,7 +6,7 @@
     <message>
         <location filename="../AccountFormDialog.cpp" line="28"/>
         <source>Account</source>
-        <translation>用户名</translation>
+        <translation>账户</translation>
     </message>
     <message>
         <location filename="../AccountFormDialog.cpp" line="34"/>
@@ -90,7 +90,7 @@
     <message>
         <location filename="../AccountFormDialog.cpp" line="169"/>
         <source>Comment</source>
-        <translation>评论</translation>
+        <translation>备注</translation>
     </message>
     <message>
         <location filename="../AccountFormDialog.cpp" line="199"/>
@@ -164,26 +164,42 @@
     <message>
         <location filename="../AdminSettingForm.cpp" line="30"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Account</source>
+        <translation>账户</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>System</source>
+        <translation>系统</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Information</source>
+        <translation>信息</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Log</source>
+        <translation>日志</translation>
+    </message>
+    <message>
         <source>Account Manage</source>
-        <translation>用户管理</translation>
+        <translation type="vanished">用户管理</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System Setting</source>
-        <translation>系统设置</translation>
+        <translation type="vanished">系统设置</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System Information</source>
-        <translation>系统信息</translation>
+        <translation type="vanished">系统信息</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>Operation Log</source>
-        <translation>操作日志</translation>
+        <translation type="vanished">操作日志</translation>
     </message>
     <message>
         <location filename="../AdminSettingForm.cpp" line="30"/>
@@ -275,7 +291,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="139"/>
         <source>Comment</source>
-        <translation>评论</translation>
+        <translation>备注</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="137"/>
@@ -432,27 +448,22 @@
 <context>
     <name>LoginWindow</name>
     <message>
-        <location filename="../loginwindow.cpp" line="29"/>
-        <source>usct</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../loginwindow.cpp" line="69"/>
+        <location filename="../loginwindow.cpp" line="71"/>
         <source>U S C T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="86"/>
+        <location filename="../loginwindow.cpp" line="88"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="93"/>
+        <location filename="../loginwindow.cpp" line="95"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="97"/>
+        <location filename="../loginwindow.cpp" line="99"/>
         <source>Login</source>
         <translation>登录</translation>
     </message>
@@ -486,11 +497,15 @@
         <source>Verify</source>
         <translation>确认</translation>
     </message>
+    <message>
+        <source>Admin</source>
+        <translation type="vanished">管理</translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="152"/>
         <location filename="../mainwindow.cpp" line="192"/>
-        <source>Admin</source>
-        <translation>管理</translation>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
 </context>
 <context>
@@ -503,12 +518,12 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="119"/>
         <source>Patient Information</source>
-        <translation>病人信息</translation>
+        <translation>患者信息</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PatientID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;病人ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;患者ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="121"/>
@@ -620,7 +635,7 @@ parameters
     <message>
         <location filename="../SelectFormWidget.cpp" line="59"/>
         <source>Account</source>
-        <translation>用户</translation>
+        <translation>账户</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="60"/>
@@ -647,6 +662,26 @@ parameters
         <source>Select</source>
         <translation>选择</translation>
     </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="94"/>
+        <source>Name</source>
+        <translation>姓名</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="95"/>
+        <source>Birth Date</source>
+        <translation>出生日期</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="96"/>
+        <source>Gender</source>
+        <translation>性别</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="97"/>
+        <source>Add Date</source>
+        <translation>添加日期</translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -698,7 +733,7 @@ parameters
     <message>
         <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
         <source>Network Setting</source>
-        <translation type="unfinished">网络配置</translation>
+        <translation>网络配置</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>

src/translations/zh_CN.ts.bak

@@ -6,7 +6,7 @@
     <message>
         <location filename="../AccountFormDialog.cpp" line="28"/>
         <source>Account</source>
-        <translation>用户名</translation>
+        <translation>账户</translation>
     </message>
     <message>
         <location filename="../AccountFormDialog.cpp" line="34"/>
@@ -90,7 +90,7 @@
     <message>
         <location filename="../AccountFormDialog.cpp" line="169"/>
         <source>Comment</source>
-        <translation>评论</translation>
+        <translation>备注</translation>
     </message>
     <message>
         <location filename="../AccountFormDialog.cpp" line="199"/>
@@ -164,26 +164,42 @@
     <message>
         <location filename="../AdminSettingForm.cpp" line="30"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Account</source>
+        <translation>账户</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>System</source>
+        <translation>系统</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Information</source>
+        <translation>信息</translation>
+    </message>
+    <message>
+        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="77"/>
+        <source>Log</source>
+        <translation>日志</translation>
+    </message>
+    <message>
         <source>Account Manage</source>
-        <translation>用户管理</translation>
+        <translation type="vanished">用户管理</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System Setting</source>
-        <translation>系统设置</translation>
+        <translation type="vanished">系统设置</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System Information</source>
-        <translation>系统信息</translation>
+        <translation type="vanished">系统信息</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
-        <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>Operation Log</source>
-        <translation>操作日志</translation>
+        <translation type="vanished">操作日志</translation>
     </message>
     <message>
         <location filename="../AdminSettingForm.cpp" line="30"/>
@@ -275,7 +291,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="139"/>
         <source>Comment</source>
-        <translation>评论</translation>
+        <translation>备注</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="137"/>
@@ -432,27 +448,22 @@
 <context>
     <name>LoginWindow</name>
     <message>
-        <location filename="../loginwindow.cpp" line="29"/>
-        <source>usct</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../loginwindow.cpp" line="69"/>
+        <location filename="../loginwindow.cpp" line="71"/>
         <source>U S C T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="86"/>
+        <location filename="../loginwindow.cpp" line="88"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="93"/>
+        <location filename="../loginwindow.cpp" line="95"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../loginwindow.cpp" line="97"/>
+        <location filename="../loginwindow.cpp" line="99"/>
         <source>Login</source>
         <translation>登录</translation>
     </message>
@@ -486,11 +497,15 @@
         <source>Verify</source>
         <translation>确认</translation>
     </message>
+    <message>
+        <source>Admin</source>
+        <translation type="vanished">管理</translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="152"/>
         <location filename="../mainwindow.cpp" line="192"/>
-        <source>Admin</source>
-        <translation>管理</translation>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
 </context>
 <context>
@@ -503,12 +518,12 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="119"/>
         <source>Patient Information</source>
-        <translation>病人信息</translation>
+        <translation>患者信息</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PatientID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;病人ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;患者ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="121"/>
@@ -620,7 +635,7 @@ parameters
     <message>
         <location filename="../SelectFormWidget.cpp" line="59"/>
         <source>Account</source>
-        <translation>用户</translation>
+        <translation>账户</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="60"/>
@@ -647,6 +662,26 @@ parameters
         <source>Select</source>
         <translation>选择</translation>
     </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="94"/>
+        <source>Name</source>
+        <translation>姓名</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="95"/>
+        <source>Birth Date</source>
+        <translation>出生日期</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="96"/>
+        <source>Gender</source>
+        <translation>性别</translation>
+    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="97"/>
+        <source>Add Date</source>
+        <translation>添加日期</translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -698,7 +733,7 @@ parameters
     <message>
         <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
         <source>Network Setting</source>
-        <translation type="unfinished">网络配置</translation>
+        <translation>网络配置</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>