sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fixes2

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/AccountFormDialog.cpp
View File

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

2
src/GUIFormBaseDialog.cpp
View File

@@ -27,7 +27,7 @@ GUIFormBaseDialog::GUIFormBaseDialog(QWidget* parent, Qt::WindowFlags f) : QDial
btnCancel->setText(tr("Cancel")); btnCancel->setText(tr("Cancel"));
hLayout->addWidget(btnOk); hLayout->addWidget(btnOk);
hLayout->addWidget(btnCancel); hLayout->addWidget(btnCancel);
btnOk->setObjectName(tr("btnOK")); btnOk->setObjectName("btnOK");
connect(btnOk, &QPushButton::clicked, [t = this]() { connect(btnOk, &QPushButton::clicked, [t = this]() {
if (t->updateReferenceData()) if (t->updateReferenceData())
t->accept(); t->accept();

2
src/editpatientform.ui
View File

@@ -62,7 +62,7 @@
<item> <item>
<widget class="QLabel" name="lbl_Sex"> <widget class="QLabel" name="lbl_Sex">
<property name="text"> <property name="text">
<string>Sex</string> <string>Gender</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/network/getadminpsw.cpp
View File

@@ -12,7 +12,7 @@ GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);
QFormLayout* form = new QFormLayout(formWidget); QFormLayout* form = new QFormLayout(formWidget);
QString value1 = QString("Admin Password"); QString value1 = QString(tr("Admin Password"));
_psw = new QLineEdit(this); _psw = new QLineEdit(this);
_psw->setEchoMode(QLineEdit::Password); _psw->setEchoMode(QLineEdit::Password);
form->addRow(value1, _psw); form->addRow(value1, _psw);

9
src/translations/zh_CN.ts.bak
View File

@@ -68,9 +68,8 @@
<translation>类型</translation> <translation>类型</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="121"/>
<source>doctor</source> <source>doctor</source>
<translation>医生</translation> <translation type="vanished">医生</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="129"/> <location filename="../AccountFormDialog.cpp" line="129"/>
@@ -498,14 +497,12 @@
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/> <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/>
<location filename="../patientinformationform.cpp" line="36"/>
<source>LEFT ONLY</source> <source>LEFT ONLY</source>
<translation>左侧</translation> <translation>左侧</translation>
</message> </message>
<message> <message>
<location filename="../patientinformationform.cpp" line="40"/>
<source>RIGHT ONLY</source> <source>RIGHT ONLY</source>
<translation>右侧</translation> <translation type="vanished">右侧</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -526,7 +523,7 @@
<message> <message>
<location filename="../ScanFormWidget.cpp" line="43"/> <location filename="../ScanFormWidget.cpp" line="43"/>
<source>Protocol</source> <source>Protocol</source>
<translation>协议</translation> <translation>扫描协议</translation>
</message> </message>
<message> <message>
<location filename="../ScanFormWidget.cpp" line="88"/> <location filename="../ScanFormWidget.cpp" line="88"/>