[bug fixes]

.gitignore

@@ -9,3 +9,5 @@
 /out/
 /.vs/
 /CMakeSettings.json
+/src/translations/*.ts
+*.ts

CMakeLists.txt

@@ -35,6 +35,18 @@ file(GLOB  project_uis ./src/*.ui)
 qt5_wrap_ui(ui_FILES ${project_uis})
 file(GLOB  project_res ./src/*.qrc)
 
+#ADD_SUBDIRECTORY(./src/translations)
+#set(TS_FILES
+#        ./src/translations/en_US.ts
+#        ./src/translations/zh_CN.ts)
+#find_package(Qt5 COMPONENTS ${REQUIRED_LIBS} LinguistTools REQUIRED)
+#qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+#add_executable(${PROJECT_NAME} ${project_headers} ${project_cpps} ${project_cxx} ${project_res} ${project_cc} ${project_c} ${ui_FILES} ${QM_FILES} )
+
+#file(GLOB  TS_FILES ./src/translations/*.ts)
+
+SET_DIRECTORY_PROPERTIES(PROPERTIES CLEAN_NO_CUSTOM TRUE)
+#file(GLOB  TS_FILES ./src/translations/*.ts)
 set(TS_FILES
         ./src/translations/en_US.ts
         ./src/translations/zh_CN.ts)
@@ -50,7 +62,7 @@ set(cpp_source_all ${project_headers} ${project_cpps} ${project_cxx} ${project_r
 qt5_create_translation(QM_FILES ${cpp_source_all} ${TS_FILES})
 add_executable(${PROJECT_NAME} ${cpp_source_all} ${ui_FILES} ${QM_FILES} )
 
-add_executable(${PROJECT_NAME} ${project_headers} ${project_cpps} ${project_cxx} ${project_res} ${project_cc} ${project_c} ${ui_FILES} )
+add_executable(${PROJECT_NAME} ${project_headers} ${project_cpps} ${project_cxx} ${project_res} ${project_cc} ${project_c} ${ui_FILES} ${QM_FILES} )
 if(UNIX AND USE_SHIMLIB)
         link_directories(/usr/local/lib64)
         target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql Qt5::VirtualKeyboard Qt5::Network pthread usct_shim dmapi log4c cunit ctomat hdf5 matio m)

src/AccountFormDialog.cpp

@@ -10,8 +10,8 @@
 #include <QToolButton>
 #include <QPushButton>
 #include <QLineEdit>
-#include <src/event/EventCenter.h>
+#include "event/EventCenter.h"
-#include <src/log/UserOperationLog.h>
+#include "log/UserOperationLog.h"
 #include "db/SQLHelper.h"
 #include "models/User.h"
 #include "components/SlidePickerBox.h"
@@ -64,7 +64,8 @@ AccountFormDialog::AccountFormDialog(QWidget *parent,AccountEditMode mode, Qt::W
 		le_Pwd->setPlaceholderText(tr("Input password"));
 		le_Pwd->setEchoMode(QLineEdit::Password);
 		layout->addWidget(le_Pwd);
-    } else{//edit mode
+	}
+	else {//edit mode
 		btn_Pwd = new QPushButton(this);
 		btn_Pwd->setText(tr(m_mode == Self ? "Change Password" : "Reset Password"));
 		layout->addWidget(btn_Pwd);
@@ -117,7 +118,7 @@ AccountFormDialog::AccountFormDialog(QWidget *parent,AccountEditMode mode, Qt::W
 		layout->addWidget(lbl_endline0);
 		//set default value
 		if (m_mode == New) {
-            btn_Role->setText("doctor");
+			btn_Role->setText(tr("doctor"));
 			m_RoleID = User::getRoleID("doctor");
 		}
 		else {
@@ -184,7 +185,6 @@ AccountFormDialog::AccountFormDialog(QWidget *parent,AccountEditMode mode, Qt::W
 		m_NewUserName = text;
 		userNameChanged = true;
 		});
-
 }
 
 AccountFormDialog::~AccountFormDialog() {
@@ -211,7 +211,8 @@ bool AccountFormDialog::updateReferenceData() {
 			warn(tr("Submit change to database fail!"));
 		}
 		return ret;
-    } else if (m_mode == Admin){
+	}
+	else if (m_mode == Admin) {
 		if (!this->userNameChanged && !this->roleChanged) return true;
 		User user;
 		if (!User::getUser(m_UserID, user)) return true;
@@ -229,7 +230,8 @@ bool AccountFormDialog::updateReferenceData() {
 			LOG_USER_OPERATION(AdminChangeAcountInformation);
 		}
 		return ret;
-    } else {
+	}
+	else {
 		//add new
 		User user;
 		if (le_UserCode->text().isEmpty()) {
@@ -283,7 +285,8 @@ bool AccountFormDialog::updateReferenceData() {
 			if (refmodel->submit()) {
 				hideWarn();
 				return true;
-        } else {
+			}
+			else {
 				warn(tr("Submit to data base fail!"));
 				return false;
 			}

src/AccountTableForm.cpp

@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QHeaderView>
-#include <src/components/AccountRoleComboDelegate.h>
+#include "components/AccountRoleComboDelegate.h"
 #include "guimacros.h"
 #include "AlertDialog.h"
 #include "db/SQLHelper.h"

src/ChangePasswordFormDialog.cpp

@@ -5,8 +5,8 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QtWidgets/QLineEdit>
-#include <src/models/User.h>
+#include "models/User.h"
-#include <src/log/UserOperationLog.h>
+#include "log/UserOperationLog.h"
 #include "ChangePasswordFormDialog.h"
 
 ChangePasswordFormDialog::ChangePasswordFormDialog(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {

src/GUIFormBaseDialog.cpp

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

src/ScanFormWidget.cpp

@@ -14,7 +14,7 @@
 #include <QImage>
 #include <QPainter>
 #include <qdebug.h>
-#include <src/log/UserOperationLog.h>
+#include "log/UserOperationLog.h"
 #include <QLabel>
 
 #ifdef WIN32

src/SelectFormWidget.cpp

@@ -248,6 +248,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 		btnAdd->setEnabled(true);
 		});
 
+
+
 }
 
 

src/TopBarWidget.cpp

@@ -5,7 +5,7 @@
 #include "TopBarWidget.h"
 #include <QLabel>
 #include <QHBoxLayout>
-#include <src/components/RollingMessageWidget.h>
+#include "components/RollingMessageWidget.h"
 #include <QDateTime>
 #include "event/EventCenter.h"
 #include "errorhandle/GUIErrorLW.h"

src/device/DeviceManager.cpp

@@ -9,7 +9,7 @@
 #include <QDate>
 #include <QDateTime>
 #include <qdebug.h>
-#include <src/appvals/AppGlobalValues.h>
+#include "appvals/AppGlobalValues.h"
 
 #define TRIGGER_EVENT EventCenter::Default()->triggerEvent
 

src/errorhandle/GUIErrorLW.cpp

@@ -2,7 +2,7 @@
 // Created by Krad on 2021/12/17.
 //
 
-#include <src/event/EventCenter.h>
+#include "event/EventCenter.h"
 #include "GUIErrorLW.h"
 #include <QChar>
 

src/generalform.cpp

@@ -8,13 +8,12 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QEvent>
-#include <src/event/EventCenter.h>
+#include "event/EventCenter.h"
 #include "json/jsonobject.h"
 #include "SelectDialog.h"
 
 #include "locker.h"
 #include "languageswitcher.h"
-#include "event/EventCenter.h"
 
 GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 {
@@ -100,9 +99,8 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 			//take effect
 			JsonObject::Instance()->setDefaultLanguage(lan);
 			LanguageSwitcher::Instance()->setDefaultLanguage(lan);
-
 			btnLan->setText(JsonObject::Instance()->defaultLanguage());
-			EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
+
 		}
 		});
 

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(tr(#name));\
+    btn##name->setText(QObject::tr(#name));\
     layout->addWidget(btn##name);
 
 #define ADD_TOOL_BTN_TO_LAYOUT(name,img,layout)\

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 "";
+        return nullptr;
 
 	cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
-	if (!first) return "";
+    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 "";
+        return nullptr;
 
 	cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
-	if (!first) return "";
+    if (!first) return nullptr;
 
 	cJSON* second = cJSON_GetObjectItem(first, stringName);
-	if (!second) return "";
+    if (!second) return nullptr;
 
 	cJSON* third = cJSON_GetArrayItem(second, index);
 

src/languageswitcher.cpp

@@ -1,5 +1,6 @@
 #include "languageswitcher.h"
 #include <QTranslator>
+#include "event/EventCenter.h"
 
 LanguageSwitcher* LanguageSwitcher::lsw = Q_NULLPTR;
 
@@ -31,5 +32,6 @@ void LanguageSwitcher::setDefaultLanguage(QString str)
 		//qDebug() << "installTranslator";
 		//QApplication::installTranslator(translator);
 	}
+	EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
 }
 

src/locker.cpp

@@ -2,7 +2,7 @@
 
 #include <QTimer>
 #include "appvals/AppGlobalValues.h"
-#include <src/event/EventCenter.h>
+#include "event/EventCenter.h"
 #include "json/jsonobject.h"
 Locker* Locker::locker = Q_NULLPTR;
 

src/loginwindow.cpp

@@ -26,7 +26,7 @@ LoginWindow::LoginWindow(QWidget* parent)
     init();
     setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     //Dialog::Instance()->InitForm();
-	m_pUserCodeEdit->setText("usct");
+    m_pUserCodeEdit->setText(tr("usct"));
 }
 
 LoginWindow::~LoginWindow()
@@ -66,7 +66,7 @@ void LoginWindow::initUi()
 
     QLabel* title = new QLabel(this);
     title->setObjectName("title");
-	title->setText("U S C T");
+    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");
@@ -94,6 +94,7 @@ void LoginWindow::initUi()
     m_pUserCodeLayout->addWidget(m_pPassWordEdit);
 
     ADD_TOOL_BTN_TO_LAYOUT(login, ":/icons/login.png", m_pUserCodeLayout);
+
     m_pUserCodeLayout->removeWidget(btnlogin);
     m_pUserCodeLayout->addWidget(btnlogin, 0, Qt::AlignCenter);
     m_pLoginButton = btnlogin;

src/main.cpp

@@ -3,7 +3,7 @@
 #include "loginwindow.h"
 #include "InputObject.h"
 #include <QQmlApplicationEngine>
-#include <src/db/SQLHelper.h>
+#include "db/SQLHelper.h"
 #include <QTextCodec>
 #include <QFontDatabase>
 #include <QDebug>
@@ -47,10 +47,16 @@ int main(int argc, char* argv[])
 	QTextCodec* codec = QTextCodec::codecForName("utf8");
 	QTextCodec::setCodecForLocale(codec);
 
+
+	//multi-language suppport
+	QTranslator translator;
+	LanguageSwitcher::Instance()->setTranslator(&translator);
+	LanguageSwitcher::Instance()->setDefaultLanguage(JsonObject::Instance()->defaultLanguage());
+	a.installTranslator(&translator);
+
+
 	//QString fontName = loadFontFromFile(":/fonts/MicrosoftYahei.ttf");
 	QString fontName = loadFontFromFile(":/fonts/DroidSansFallback.ttf");
-
-
 	QFont font(fontName);
 	QApplication::setFont(font);
 
@@ -65,11 +71,7 @@ int main(int argc, char* argv[])
 	//QObject::connect(obj, SIGNAL(touchScreen()), Locker::Instance(), SLOT(refreshTimer()));
 
 
-	//multi-language suppport
+
-	QTranslator translator;
-	LanguageSwitcher::Instance()->setTranslator(&translator);
-	LanguageSwitcher::Instance()->setDefaultLanguage(JsonObject::Instance()->defaultLanguage());
-	a.installTranslator(&translator);
 
 
 	QStringList app_args = a.arguments();

src/mainwindow.cpp

@@ -3,7 +3,7 @@
 #include <qtabwidget.h>
 #include <QSizePolicy>
 #include <QHBoxLayout>
-#include <src/event/EventCenter.h>
+#include "event/EventCenter.h"
 #include "tabformwidget.h"
 #include "SelectFormWidget.h"
 #include "ScanFormWidget.h"
@@ -139,11 +139,11 @@ MainWindow::MainWindow(QWidget* parent) :
 		tab->setCurrentIndex(1);
 		});
 	SelectFormWidget* select_form = new SelectFormWidget(this);
-	tab->addTab(select_form, "Select");
+	tab->addTab(select_form, tr("Select"));
 	ScanFormWidget* scan_form = new ScanFormWidget(this);
-	tab->addTab(scan_form, "Scan");
+	tab->addTab(scan_form, tr("Scan"));
 	TabFormWidget* verify_form = new TabFormWidget(this);
-	tab->addTab(verify_form, "Verify");
+	tab->addTab(verify_form, tr("Verify"));
 	tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);
@@ -164,7 +164,8 @@ MainWindow::MainWindow(QWidget* parent) :
 		if (msg) {
 			QString* str = (QString*)msg;
 			msgDialog->showMessage(*str);
-        } else {
+		}
+		else {
 			msgDialog->showMessage("Something went error!");
 		}
 		msgDialog->stopLoading();
@@ -225,9 +226,10 @@ MainWindow::MainWindow(QWidget* parent) :
 			if (admin_tab_index == -1)
 			{
 				AdminSettingForm* form = new AdminSettingForm(this);
-                admin_tab_index = tab->addTab(form,"Admin");
+				admin_tab_index = tab->addTab(form, tr("Admin"));
 			}
-        } else{
+		}
+		else {
 			if (admin_tab_index != -1) {
 				tab->removeTab(admin_tab_index);
 				admin_tab_index = -1;
@@ -258,6 +260,17 @@ MainWindow::MainWindow(QWidget* parent) :
 		});
 	t->start();
 	centerWidgetHide();
+
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+
+		tab->setTabText(0, tr("Select"));
+		tab->setTabText(1, tr("Scan"));
+		tab->setTabText(2, tr("Verify"));
+		tab->setTabText(3, tr("Admin"));
+
+		});
+
+
 }
 
 MainWindow::~MainWindow()

src/network/getadminpsw.cpp

@@ -18,7 +18,7 @@ GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog
 	form->addRow(value1, _psw);
 
 	lbl_error = new QLabel(this);
-	lbl_error->setObjectName("warn");
+	lbl_error->setObjectName(QString::fromUtf8("warn"));
 	form->addRow("", lbl_error);
 
 }

src/network/getipdialog.cpp

@@ -12,15 +12,16 @@ GetIPDialog::GetIPDialog(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog
 
 	setWindowModality(Qt::WindowModal);
 	QFormLayout* form = new QFormLayout(formWidget);
-	QString value1 = QString(tr("IP Address"));
+	QLabel* value1 = new QLabel(tr("IP Address"));
 	_ip = new QLineEdit(this);
 	form->addRow(value1, _ip);
-	QString value2 = QString(tr("Netmask"));
+
+	QLabel* value2 = new QLabel(tr("Netmask"));
 	_mask = new QLineEdit(this);
 	form->addRow(value2, _mask);
 
 	lbl_error = new QLabel(this);
-	lbl_error->setObjectName(tr("warn"));
+	lbl_error->setObjectName(QString::fromUtf8("warn"));
 	form->addRow("", lbl_error);
 
 }

src/network/networkcfgdialog.cpp

@@ -30,12 +30,15 @@ networkCfgDialog::networkCfgDialog(QWidget* parent) :
 	model_route = new NetCfgTableModel(this);
 
 	QStringList header_addr;
-	header_addr << "IP Address" << "Netmask";
+	header_addr << tr("IP Address") << tr("Netmask");
 	model_addr->setHeader(header_addr);
 	QStringList route_addr;
-	route_addr << "Destination" << "Gateway" << "Netmask";
+	route_addr << tr("Destination") << tr("Gateway") << tr("Netmask");
 	model_route->setHeader(route_addr);
 
+	ui->btn_group->button(QDialogButtonBox::Apply)->setText(tr("Apply"));
+	ui->btn_group->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+
 	loadData();
 
 	ui->tbl_addr->setModel(model_addr);
@@ -62,6 +65,7 @@ networkCfgDialog::networkCfgDialog(QWidget* parent) :
 	ui->tbl_route->setColumnWidth(2, 230);
 	ui->tbl_route->horizontalHeader()->setFixedHeight(38);
 
+
 	connect(ui->btn_addr_add, &QPushButton::clicked, [=]()
 		{
 			//GetIPDialog* dialog = new GetIPDialog(this);

src/tabformwidget.cpp

@@ -1,7 +1,7 @@
 #include "tabformwidget.h"
 #include "ui_tabformwidget.h"
 #include <QDateTime>
-#include <src/components/RollingMessageWidget.h>
+#include "components/RollingMessageWidget.h"
 #include "event/EventCenter.h"
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)