translation improvements 1

This commit is contained in:
xueyan hu
2021-12-28 11:49:07 +08:00
parent 966eca6d0e
commit f43fd26411
12 changed files with 348 additions and 236 deletions

View File

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

View File

@@ -22,12 +22,12 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
QHBoxLayout* layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0,8,0,8);
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) {
@@ -72,9 +72,9 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
connect(widget, &QListWidget::currentRowChanged, [=](int rowindex) {
stackedWidget->setCurrentIndex(rowindex);
});
connect(EventCenter::Default(),&EventCenter::ReloadLanguage,[=](){
connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
QStringList menus2;
menus2 << tr("General") << tr("Account Manage") << tr("System Setting") << tr("System Information") << tr("Operation Log") << tr("About");
menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
widget->clear();
widget->addItems(menus2);

View File

@@ -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);

View File

@@ -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)

View File

@@ -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);

View File

@@ -12,7 +12,7 @@
#include "InputObject.h"
#include "models/User.h"
#include "log/UserOperationLog.h"
#include "json/jsonobject.h"
LoginWindow::LoginWindow(QWidget* parent)
: QDialog(parent)
, m_pLoginButton(nullptr)
@@ -26,7 +26,9 @@ LoginWindow::LoginWindow(QWidget* parent)
init();
setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
//Dialog::Instance()->InitForm();
m_pUserCodeEdit->setText(tr("usct"));
m_pUserCodeEdit->setText(JsonObject::Instance()->defaultUser());
}
LoginWindow::~LoginWindow()
@@ -136,6 +138,7 @@ void LoginWindow::doLogin()
{
accept();
LOG_USER_OPERATION(Login);
JsonObject::Instance()->setDefaultUser(strUserCode);
}
else {
warn->setVisible(true);

View File

@@ -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"));
});

View File

@@ -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>

View File

@@ -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>

Binary file not shown.

View File

@@ -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"/>

View File

@@ -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"/>