diff --git a/src/AdminSettingForm.cpp b/src/AdminSettingForm.cpp index a418c5f..5d806e9 100644 --- a/src/AdminSettingForm.cpp +++ b/src/AdminSettingForm.cpp @@ -16,6 +16,7 @@ #include #include "systemsettingform.h" #include "AccountTableForm.h" +#include "event/EventCenter.h" AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabFormWidget(parent) { @@ -65,12 +66,19 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm stackedWidget->addWidget(operationLogForm); QLabel* about = new QLabel(this); - about->setText("About"); + about->setText(tr("About")); stackedWidget->addWidget(about); widget->setCurrentRow(0); connect(widget, &QListWidget::currentRowChanged, [=](int rowindex) { stackedWidget->setCurrentIndex(rowindex); }); + connect(EventCenter::Default(),&EventCenter::ReloadLanguage,[=](){ + QStringList menus; + menus << tr("General") << tr("Account Manage") << tr("System Setting") << tr("System Information") << tr("Operation Log") << tr("About"); + widget->clear(); + widget->addItems(menus); + about->setText(tr("About")); + }); } AdminSettingForm::~AdminSettingForm() { diff --git a/src/event/EventCenter.h b/src/event/EventCenter.h index c0e1a5d..54e87d4 100644 --- a/src/event/EventCenter.h +++ b/src/event/EventCenter.h @@ -9,6 +9,7 @@ #define ADD_EVENT()\ ADD_EVENT_VALUE(RequestLogin)\ +ADD_EVENT_VALUE(LoginRoleChanged)\ ADD_EVENT_VALUE(PatientSelected)\ ADD_EVENT_VALUE(RequestPreviewScan)\ ADD_EVENT_VALUE(RequestEmptyScan)\ @@ -25,6 +26,7 @@ ADD_EVENT_VALUE(InvokeOperationProgress)\ ADD_EVENT_VALUE(InvokeOperationEnd)\ ADD_EVENT_VALUE(PromptDialogOpen)\ ADD_EVENT_VALUE(GlobalBannerMessage)\ +ADD_EVENT_VALUE(ReloadLanguage)\ ADD_EVENT_VALUE(WarnStateFlagChange)\ ADD_EVENT_VALUE(GUIErrorRaise) diff --git a/src/generalform.cpp b/src/generalform.cpp index 49521cd..954bd6a 100644 --- a/src/generalform.cpp +++ b/src/generalform.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "json/jsonobject.h" #include "SelectDialog.h" @@ -91,6 +92,7 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent) LanguageSwitcher::Instance()->setDefaultLanguage(lan); btnLan->setText(JsonObject::Instance()->defaultLanguage()); + EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr,nullptr); } }); } diff --git a/src/guimacros.h b/src/guimacros.h index edd5958..2b6e0a2 100644 --- a/src/guimacros.h +++ b/src/guimacros.h @@ -10,7 +10,7 @@ btn##name->setIcon(QIcon(img));\ btn##name->setIconSize(QSize(size,size));\ btn##name->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);\ - btn##name->setText(#name);\ + btn##name->setText(tr(#name));\ layout->addWidget(btn##name); #define ADD_TOOL_BTN_TO_LAYOUT(name,img,layout)\