merge fixes2

This commit is contained in:
xueyan hu
2021-12-23 17:15:49 +08:00
parent b90485ab59
commit f748ce7185
5 changed files with 8 additions and 11 deletions

View File

@@ -67,7 +67,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
}
else {//edit mode
btn_Pwd = new QPushButton(this);
btn_Pwd->setText(tr(m_mode == Self ? "Change Password" : "Reset Password"));
btn_Pwd->setText(m_mode == Self ? tr("Change Password") : tr("Reset Password"));
layout->addWidget(btn_Pwd);
}
QLabel* lbl_endline3 = new QLabel(this);
@@ -118,7 +118,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
layout->addWidget(lbl_endline0);
//set default value
if (m_mode == New) {
btn_Role->setText(tr("doctor"));
btn_Role->setText("doctor");
m_RoleID = User::getRoleID("doctor");
}
else {