From 656f46c17ec12533475a79469578c8d1ba135c5a Mon Sep 17 00:00:00 2001
From: xueyan hu <576627988@qq.com>
Date: Tue, 28 Dec 2021 18:23:02 +0800
Subject: [PATCH] translation improvement

---
 cfgs/usct-product.json          |   9 +-
 src/AccountTableForm.cpp        | 216 +++++++++++----------
 src/AdminSettingForm.cpp        |  11 +-
 src/ScanFormWidget.cpp          |  14 ++
 src/SelectDialog.cpp            |  24 +--
 src/SelectFormWidget.cpp        |  15 ++
 src/UserOperationLogForm.cpp    |   9 +-
 src/device/networkmanager.cpp   |  18 +-
 src/device/networkmanager.h     |   4 +-
 src/dicomcfgdialog.ui           | 319 ++++++++++++++++++++++++++++++++
 src/editpatientform.cpp         | 236 ++++++++++++-----------
 src/generalform.cpp             |   7 +-
 src/icons/dicomsettings.png     | Bin 0 -> 4902 bytes
 src/icons/dicomsettings_d.png   | Bin 0 -> 4838 bytes
 src/icons/networksettings.png   | Bin 0 -> 14283 bytes
 src/icons/networksettings_d.png | Bin 0 -> 13760 bytes
 src/json/jsonobject.cpp         |   8 +-
 src/json/jsonobject.h           |   2 +-
 src/network/dicomcfgdialog.cpp  |  95 ++++++++++
 src/network/dicomcfgdialog.h    |  25 +++
 src/network/networkcfgdialog.h  |   7 +-
 src/networkcfgdialog.ui         | 103 +++++++++--
 src/res.qrc                     |   4 +
 src/stylesheet/Dark2.qss        |   2 +-
 src/systemsettingform.cpp       | 127 +++----------
 src/systemsettingform.h         |   3 -
 src/systemsettingform.ui        | 294 ++++++++---------------------
 src/translations/en_US.ts       | 173 ++++++++++-------
 src/translations/en_US.ts.bak   | 173 ++++++++++-------
 src/translations/zh_CN.qm       | Bin 9671 -> 10018 bytes
 src/translations/zh_CN.ts       | 318 +++++++++++++++++++++----------
 src/translations/zh_CN.ts.bak   | 318 +++++++++++++++++++++----------
 32 files changed, 1620 insertions(+), 914 deletions(-)
 create mode 100644 src/dicomcfgdialog.ui
 create mode 100644 src/icons/dicomsettings.png
 create mode 100644 src/icons/dicomsettings_d.png
 create mode 100644 src/icons/networksettings.png
 create mode 100644 src/icons/networksettings_d.png
 create mode 100644 src/network/dicomcfgdialog.cpp
 create mode 100644 src/network/dicomcfgdialog.h

diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json
index 601c693..d0d8305 100644
--- a/cfgs/usct-product.json
+++ b/cfgs/usct-product.json
@@ -51,12 +51,6 @@
 		"name":	"pacsserver22",
 		"port":	"102"
 	},
-	"daq":	{
-		"ae":	"MOON",
-		"ip":	"127.0.0.3",
-		"name":	"daq",
-		"port":	"103"
-	},
 	"recon":	{
 		"ae":	"TURTLE",
 		"ip":	"127.0.0.4",
@@ -68,6 +62,9 @@
 		"dhcp":	"true",
 		"ip":	"192.168.1.197",
 		"mask":	"255.255.255.0",
+		"ae":	"MOON",
+		"name":	"daq",
+		"port":	"103",
 		"additional":	[{
 				"ip":	"192.168.2.197",
 				"netmask":	"255.255.255.0"
diff --git a/src/AccountTableForm.cpp b/src/AccountTableForm.cpp
index c95b1f6..94bc5ef 100644
--- a/src/AccountTableForm.cpp
+++ b/src/AccountTableForm.cpp
@@ -15,112 +15,126 @@
 #include <QSqlRecord>
 #include "components/SlideableTableView.h"
 #include "AccountFormDialog.h"
+#include "event/EventCenter.h"
+AccountTableForm::AccountTableForm(QWidget* parent) {
+	layout = new QVBoxLayout(this);
+	layout->setMargin(0);
+	QTableView* table = new SlideableTableView(this);
+	layout->addWidget(table);
+	// TableView for patient
+	table->setAlternatingRowColors(true);
+	table->setSelectionMode(QAbstractItemView::SingleSelection);
+	table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+	table->setSelectionBehavior(QAbstractItemView::SelectRows);
+	table->verticalHeader()->setDefaultSectionSize(38);
+	table->horizontalHeader()->setStretchLastSection(true);
+	//data from SQLITE
 
-AccountTableForm::AccountTableForm(QWidget *parent) {
-    layout =  new QVBoxLayout(this);
-    layout->setMargin(0);
-    QTableView* table = new SlideableTableView(this);
-    layout->addWidget(table);
-    // TableView for patient
-    table->setAlternatingRowColors(true);
-    table->setSelectionMode(QAbstractItemView::SingleSelection);
-    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    table->setSelectionBehavior(QAbstractItemView::SelectRows);
-    table->verticalHeader()->setDefaultSectionSize(38);
-    table->horizontalHeader()->setStretchLastSection(true);
-    //data from SQLITE
+	auto model = SQLHelper::getTable("Account");
+	model->sort(5, Qt::DescendingOrder);
+	model->select();
+	model->setHeaderData(1, Qt::Horizontal, tr("ID"));
+	model->setHeaderData(2, Qt::Horizontal, tr("Name"));
+	model->setHeaderData(4, Qt::Horizontal, tr("Role"));
+	model->setHeaderData(5, Qt::Horizontal, tr("Comment"));
+	table->setModel((QAbstractItemModel*)model);
+	table->hideColumn(0);
+	table->hideColumn(3);
+	AccountRoleComboDelegate* comboDelegate = new AccountRoleComboDelegate(this);
+	table->setItemDelegateForColumn(4, comboDelegate);
+	table->show();
 
-    auto model = SQLHelper::getTable("Account");
-    model->sort(5,Qt::DescendingOrder);
-    model->select();
-    model->setHeaderData(1,Qt::Horizontal,"ID");
-    model->setHeaderData(2,Qt::Horizontal,"Name");
-    model->setHeaderData(4,Qt::Horizontal,"Role");
-    model->setHeaderData(5,Qt::Horizontal,"Comment");
-    table->setModel((QAbstractItemModel*)model);
-    table->hideColumn(0);
-    table->hideColumn(3);
-    AccountRoleComboDelegate* comboDelegate =  new AccountRoleComboDelegate(this);
-    table->setItemDelegateForColumn(4,comboDelegate);
-    table->show();
+	//    table->setSortingEnabled(true);
+	table->setColumnWidth(1, 250);
+	table->setColumnWidth(2, 250);
+	table->setColumnWidth(4, 150);
 
-//    table->setSortingEnabled(true);
-    table->setColumnWidth(1,250);
-    table->setColumnWidth(2,250);
-    table->setColumnWidth(4,150);
+	QWidget* cmdPanel = new QWidget(this);
+	cmdPanel->setObjectName("commandWidget");
+	QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel);
+	cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
+	QWidget* spacerLine = new QWidget(this);
+	spacerLine->setFixedWidth(2);
+	spacerLine->setObjectName("verSpaceLine");
+	cmdLayout->addWidget(spacerLine);
+	ADD_TOOL_BTN_TO_LAYOUT(Add, ":/icons/add.png", cmdLayout);
+	ADD_TOOL_BTN_TO_LAYOUT(Edit, ":/icons/details.png", cmdLayout);
+	ADD_TOOL_BTN_TO_LAYOUT(Delete, ":/icons/close_circle.png", cmdLayout);
+	btnAdd->setText(tr("Add"));
+	btnEdit->setText(tr("Edit"));
+	btnDelete->setText(tr("Delete"));
+	layout->addWidget(cmdPanel);
+	//index change
+	connect(table, &QTableView::clicked, [=](const QModelIndex& modelIndex) {
+		if (currentRow != modelIndex.row())
+		{
+			currentRow = modelIndex.row();
+		}
+		});
+	//add new account
+	connect(btnAdd, &QToolButton::clicked, [=]() {
+		AccountFormDialog dialog(this, New);
+		dialog.setWindowModality(Qt::WindowModal);
+		dialog.setReferenceModel(model);
+		if (dialog.exec() == QDialog::Accepted)
+		{
+			table->selectRow(0);
+		}
+		});
+	connect(btnEdit, &QToolButton::clicked, [=]() {
+		if (currentRow < 0)return;
+		QMap<QString, QVariant> map;
+		auto record = model->record(currentRow);
+		for (int i = 0; i < model->columnCount(); i++)
+		{
+			map[record.fieldName(i)] = record.value(i);
+		}
+		auto mode = map["UserID"] == User::Current()->getUserID() ? Self : Admin;
+		AccountFormDialog dialog(this, mode);
+		dialog.setWindowModality(Qt::WindowModal);
+		if (mode == Admin)dialog.setAccountInformation(map);
+		if (dialog.exec() == QDialog::Accepted)
+		{
+			model->select();
+			table->selectRow(currentRow);
+		}
+		});
+	connect(btnDelete, &QToolButton::clicked, [=]() {
+		if (currentRow < 0)return;
+		QString id = model->data(model->index(currentRow, 1)).toString();
+		if (User::Current()->getUserID() == id)
+		{
+			//尝试删除自己
+			AlertDialog dialog(this);
+			dialog.setButtonMode(OkOnly);
+			dialog.setWindowModality(Qt::WindowModal);
+			dialog.setAlertMessage(tr("Can't delete current log in account!"));
+			dialog.exec();
+			return;
+		}
+		AlertDialog dialog(this);
+		dialog.setWindowModality(Qt::WindowModal);
+
+		dialog.setAlertMessage(QString(tr("Delete account with ID:\"%1\"!")).arg(id));
+		if (dialog.exec() != QDialog::Accepted) return;
+		model->removeRow(currentRow);
+		model->select();
+		table->selectRow(model->rowCount() > currentRow + 1 ? currentRow : currentRow - 1);
+		});
+
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+
+		//model->setHeaderData(1, Qt::Horizontal, tr("ID"));
+		model->setHeaderData(2, Qt::Horizontal, tr("Name"));
+		model->setHeaderData(4, Qt::Horizontal, tr("Role"));
+		model->setHeaderData(5, Qt::Horizontal, tr("Comment"));
+
+		btnAdd->setText(tr("Add"));
+		btnEdit->setText(tr("Edit"));
+		btnDelete->setText(tr("Delete"));
+		});
 
-    QWidget* cmdPanel = new QWidget(this);
-    cmdPanel->setObjectName("commandWidget");
-    QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel);
-    cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
-    QWidget* spacerLine= new QWidget(this);
-    spacerLine->setFixedWidth(2);
-    spacerLine->setObjectName("verSpaceLine");
-    cmdLayout->addWidget(spacerLine);
-    ADD_TOOL_BTN_TO_LAYOUT(Add,":/icons/add.png",cmdLayout);
-    ADD_TOOL_BTN_TO_LAYOUT(Edit,":/icons/details.png",cmdLayout);
-    ADD_TOOL_BTN_TO_LAYOUT(Delete,":/icons/close_circle.png",cmdLayout);
-    btnAdd->setText(tr("Add"));
-    btnEdit->setText(tr("Edit"));
-    btnDelete->setText(tr("Delete"));
-    layout->addWidget(cmdPanel);
-    //index change
-    connect(table,&QTableView::clicked,[=](const QModelIndex & modelIndex){
-        if (currentRow!=modelIndex.row())
-        {
-            currentRow=modelIndex.row();
-        }
-    });
-    //add new account
-    connect(btnAdd, &QToolButton::clicked,[=](){
-        AccountFormDialog dialog(this,New);
-        dialog.setWindowModality(Qt::WindowModal);
-        dialog.setReferenceModel(model);
-        if (dialog.exec() == QDialog::Accepted)
-        {
-            table->selectRow(0);
-        }
-    });
-    connect(btnEdit, &QToolButton::clicked,[=](){
-        if (currentRow<0)return;
-        QMap<QString,QVariant> map;
-        auto record = model->record(currentRow);
-        for (int i = 0; i < model->columnCount(); i++)
-        {
-            map[record.fieldName(i)] = record.value(i);
-        }
-        auto mode = map["UserID"] == User::Current()->getUserID()?Self:Admin;
-        AccountFormDialog dialog(this,mode);
-        dialog.setWindowModality(Qt::WindowModal);
-        if (mode == Admin)dialog.setAccountInformation(map);
-        if (dialog.exec() == QDialog::Accepted)
-        {
-            model->select();
-            table->selectRow(currentRow);
-        }
-    });
-    connect(btnDelete, &QToolButton::clicked,[=](){
-        if (currentRow<0)return;
-        QString id = model->data(model->index(currentRow,1)).toString();
-        if (User::Current()->getUserID() == id)
-        {
-            //尝试删除自己
-            AlertDialog dialog(this);
-            dialog.setButtonMode(OkOnly);
-            dialog.setWindowModality(Qt::WindowModal);
-            dialog.setAlertMessage(tr("Can't delete current log in account!"));
-            dialog.exec();
-            return;
-        }
-        AlertDialog dialog(this);
-        dialog.setWindowModality(Qt::WindowModal);
 
-        dialog.setAlertMessage(QString(tr("Delete account with ID:\"%1\"!")).arg(id));
-        if(dialog.exec()!=QDialog::Accepted) return;
-        model->removeRow(currentRow);
-        model->select();
-        table->selectRow(model->rowCount()>currentRow+1?currentRow:currentRow-1);
-    });
 }
 
 AccountTableForm::~AccountTableForm() {
diff --git a/src/AdminSettingForm.cpp b/src/AdminSettingForm.cpp
index e5e1dbb..b426927 100644
--- a/src/AdminSettingForm.cpp
+++ b/src/AdminSettingForm.cpp
@@ -27,7 +27,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	QListWidget* widget = new QListWidget(this);
 	widget->setFixedWidth(250);
 	QStringList menus;
-	menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
+	//menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
+	menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("About");
 	widget->addItems(menus);
 	widget->setSpacing(3);
 	for (int i = 0; i < menus.count(); ++i) {
@@ -61,9 +62,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	Info->setText("info");
 	stackedWidget->addWidget(Info);
 
-	UserOperationLogForm* operationLogForm = new UserOperationLogForm(this);
-
-	stackedWidget->addWidget(operationLogForm);
+	//UserOperationLogForm* operationLogForm = new UserOperationLogForm(this);
+	//stackedWidget->addWidget(operationLogForm);
 
 	QLabel* about = new QLabel(this);
 	about->setText(tr("About"));
@@ -74,9 +74,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 		});
 	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
 		QStringList menus2;
-		menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About");
+		menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("About");
 		widget->clear();
-
 		widget->addItems(menus2);
 		for (int i = 0; i < menus.count(); ++i) {
 			widget->item(i)->setTextAlignment(Qt::AlignCenter);
diff --git a/src/ScanFormWidget.cpp b/src/ScanFormWidget.cpp
index ac19f46..ad625bf 100644
--- a/src/ScanFormWidget.cpp
+++ b/src/ScanFormWidget.cpp
@@ -238,6 +238,20 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
 
 	connect(group, SIGNAL(buttonClicked(int)), this, SLOT(protocolChanged(int)));
 
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+		btnLeft->setText(tr("LEFT"));
+		btnRight->setText(tr("RIGHT"));
+		btnRefresh->setText(tr("Refresh"));
+		btnPreview->setText(tr("Preview"));
+		btnStop->setText(tr("Stop"));
+		btnScan->setText(tr("Scan"));
+		lbl_Protocol->setText(tr("Protocol"));
+		lblPreview->setText(tr("Preview Parameters"));
+		lblParams->setText(tr("Scan Parameters"));
+		});
+
+
+
 	previewfunc = [=](bool val)->void {
 		viewer->setVisible(val);
 		btnPreview->setCheckable(val);
diff --git a/src/SelectDialog.cpp b/src/SelectDialog.cpp
index 867707c..04e98ed 100644
--- a/src/SelectDialog.cpp
+++ b/src/SelectDialog.cpp
@@ -6,12 +6,14 @@
 #include "components/SlidePickerBox.h"
 #include <QVBoxLayout>
 #include <QLabel>
-SelectDialog::SelectDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
-    this->setFixedSize(360,380);
-    QVBoxLayout* layout = new QVBoxLayout(formWidget);
-    box = new SlidePickerBox(formWidget);
-    box->setObjectName("slider_one");
-    layout->addWidget(box);
+SelectDialog::SelectDialog(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
+
+	this->setFixedSize(360, 380);
+	QVBoxLayout* layout = new QVBoxLayout(formWidget);
+	box = new SlidePickerBox(formWidget);
+	box->setObjectName("slider_one");
+	layout->addWidget(box);
+
 }
 
 SelectDialog::~SelectDialog() {
@@ -19,17 +21,17 @@ SelectDialog::~SelectDialog() {
 }
 
 bool SelectDialog::updateReferenceData() {
-    return true;
+	return true;
 }
 
 void SelectDialog::setAvailableDates(QStringList dates) {
-    box->setItems(dates);
+	box->setItems(dates);
 }
 
 QString SelectDialog::getSelectedValue() {
-    return box->getSelectedValue();
+	return box->getSelectedValue();
 }
 
-void SelectDialog::setSelectedValue(const QString & val) {
-    box->setSelectedValue(val);
+void SelectDialog::setSelectedValue(const QString& val) {
+	box->setSelectedValue(val);
 }
diff --git a/src/SelectFormWidget.cpp b/src/SelectFormWidget.cpp
index b436099..07b6a45 100644
--- a/src/SelectFormWidget.cpp
+++ b/src/SelectFormWidget.cpp
@@ -95,6 +95,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	model->setHeaderData(3, Qt::Horizontal, tr("Birth Date"));
 	model->setHeaderData(4, Qt::Horizontal, tr("Gender"));
 	model->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
+	model->setHeaderData(6, Qt::Horizontal, tr("Comment"));
 	table->setModel((QAbstractItemModel*)model);
 	table->hideColumn(0);
 	table->hideColumn(7);
@@ -255,8 +256,22 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 		btnEdit->setEnabled(true);
 		btnAdd->setEnabled(true);
 		});
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
 
+		model->setHeaderData(1, Qt::Horizontal, "ID");
+		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"));
+		model->setHeaderData(6, Qt::Horizontal, tr("Comment"));
 
+		btnAccount->setText(tr("Account"));
+		//btnWorklist->setText(tr("Worklist"));
+		btnAdd->setText(tr("Add"));
+		btnEdit->setText(tr("Edit"));
+		btnDelete->setText(tr("Delete"));
+		btnSelect->setText(tr("Select"));
+		});
 
 }
 
diff --git a/src/UserOperationLogForm.cpp b/src/UserOperationLogForm.cpp
index a7fb598..e1d3daf 100644
--- a/src/UserOperationLogForm.cpp
+++ b/src/UserOperationLogForm.cpp
@@ -15,7 +15,7 @@
 #include <QPushButton>
 #include "SelectDialog.h"
 #include "mainwindow.h"
-
+#include "event/EventCenter.h"
 QString fileNameToDate(QString fileName)
 {
 	return fileName.split("log/")[1].replace("-op.log", "");
@@ -29,7 +29,8 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) {
 	layout = new QVBoxLayout(this);
 	QWidget* header = new QWidget(this);
 	QHBoxLayout* headerLayout = new QHBoxLayout(header);
-	headerLayout->addWidget(new QLabel(tr("Log Date:")));
+	QLabel* logdate = new QLabel(tr("Log Date:"));
+	headerLayout->addWidget(logdate);
 	btn = new QPushButton(header);
 	headerLayout->addWidget(btn, 0, Qt::AlignLeft);
 	headerLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
@@ -60,6 +61,10 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) {
 		}
 		});
 
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+		logdate->setText(tr("Log Date:"));
+		});
+
 }
 
 UserOperationLogForm::~UserOperationLogForm() {
diff --git a/src/device/networkmanager.cpp b/src/device/networkmanager.cpp
index 5a4db6b..18bbc0a 100644
--- a/src/device/networkmanager.cpp
+++ b/src/device/networkmanager.cpp
@@ -32,8 +32,16 @@
 //	args << "-c" << cmd;
 //	myProcess->start("/bin/sh", args);
 //}
+host NetworkManager::getLocalHost()
+{
+	return JsonObject::Instance()->getServer(JsonObject::LOCAL);
+}
 
-
+bool NetworkManager::setLocalHost(const host& h)
+{
+	JsonObject::Instance()->setServer(JsonObject::LOCAL, h);
+	return true;
+}
 QString NetworkManager::interfaceName()
 {
 	return JsonObject::Instance()->interfaceName();
@@ -67,7 +75,7 @@ bool NetworkManager::restart(QString& err_info)
 	QProcess* myProcess = new QProcess;
 	QString inface = JsonObject::Instance()->interfaceName();
 	QString pwd = JsonObject::Instance()->passWord();
-    QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface);
+	QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface);
 	QStringList args;
 	args << "-c" << cmd;
 	connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater()));
@@ -206,12 +214,12 @@ bool NetworkManager::setDefaultGateway(const QString& gw, QString& err_info)
 
 }
 
-bool NetworkManager::checkPassWord(const QString &pwd,QString& err_info)
+bool NetworkManager::checkPassWord(const QString& pwd, QString& err_info)
 {
 
 	QProcess* myProcess = new QProcess;
-    //QString pwd = JsonObject::Instance()->passWord();
-    QString cmd = QString("echo %1 | sudo -S -k whoami").arg(pwd);
+	//QString pwd = JsonObject::Instance()->passWord();
+	QString cmd = QString("echo %1 | sudo -S -k whoami").arg(pwd);
 	QStringList args;
 	args << "-c" << cmd;
 	connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater()));
diff --git a/src/device/networkmanager.h b/src/device/networkmanager.h
index 2d19ec5..36d91e4 100644
--- a/src/device/networkmanager.h
+++ b/src/device/networkmanager.h
@@ -10,6 +10,8 @@ class NetworkManager : public QObject
 {
 	Q_OBJECT
 public:
+	static host getLocalHost();
+	static bool setLocalHost(const host& h);
 	//static NetworkManager* Instance();
 	//static void qIfConfig(const localhost& lhost);
 	static QString interfaceName();
@@ -20,7 +22,7 @@ public:
 	static QList<QStringList> getIpRouteList();
 
 	//static void setInterfaceName(const QString& name);
-    static bool checkPassWord(const QString &pwd,QString& err_info);
+	static bool checkPassWord(const QString& pwd, QString& err_info);
 	static bool restart(QString& err_info);
 	static bool setJsonDHCP(bool enable);
 
diff --git a/src/dicomcfgdialog.ui b/src/dicomcfgdialog.ui
new file mode 100644
index 0000000..96a9e9e
--- /dev/null
+++ b/src/dicomcfgdialog.ui
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dicomCfgDialog</class>
+ <widget class="QDialog" name="dicomCfgDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>400</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">
+
+QTabBar::tab {
+font-size:25px;
+height:40px;
+width:180px;
+border: 0px;
+border-top-left-radius: 0%;
+border-top-right-radius: 0%;
+border-bottom-left-radius:0%;
+border-bottom-right-radius:0%;
+background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333);
+}
+
+QTabBar::tab:selected, QTabBar::tab:hover {
+background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #ABABAB, stop: 1.0 #CDCDCD);
+}</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QWidget" name="formWidget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="title">
+        <property name="text">
+         <string>DICOM Settings</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="currentIndex">
+         <number>2</number>
+        </property>
+        <widget class="QWidget" name="tab_wl">
+         <attribute name="title">
+          <string>Worklist</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="1" column="0">
+           <widget class="QLabel" name="lbl_Name">
+            <property name="minimumSize">
+             <size>
+              <width>165</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="wl_IP"/>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="wl_Name"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="lbl_IP">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="wl_Port"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_AE">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="wl_AE"/>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="lbl_Port">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_pacs">
+         <attribute name="title">
+          <string>PACS</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="3" column="0">
+           <widget class="QLabel" name="lbl_IP_2">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_Port_2">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="pacs_Name"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="lbl_AE_2">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="pacs_AE"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="lbl_Name_2">
+            <property name="minimumSize">
+             <size>
+              <width>165</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="pacs_Port"/>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="pacs_IP"/>
+          </item>
+          <item row="0" column="1">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_recon">
+         <attribute name="title">
+          <string>3D Recon</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="recon_AE"/>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="recon_IP"/>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="recon_Name"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="lbl_IP_3">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="lbl_Port_3">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="recon_Port"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_AE_3">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="lbl_Name_3">
+            <property name="minimumSize">
+             <size>
+              <width>165</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item>
+       <widget class="QDialogButtonBox" name="btn_group">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>btn_group</sender>
+   <signal>accepted()</signal>
+   <receiver>dicomCfgDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>btn_group</sender>
+   <signal>rejected()</signal>
+   <receiver>dicomCfgDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/editpatientform.cpp b/src/editpatientform.cpp
index fd1dd9d..c78a314 100644
--- a/src/editpatientform.cpp
+++ b/src/editpatientform.cpp
@@ -6,137 +6,151 @@
 #include <QButtonGroup>
 #include "guimacros.h"
 #include <qdebug.h>
-EditPatientForm::EditPatientForm(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::EditPatientForm)
+#include "event/EventCenter.h"
+
+EditPatientForm::EditPatientForm(QWidget* parent) :
+	QWidget(parent),
+	ui(new Ui::EditPatientForm)
 {
-    ui->setupUi(this);
-    ui->lbl_Sex->setText(tr("Gender"));
-    QHBoxLayout* sexlayout =new QHBoxLayout(ui->sexpanelwidget);
-    sexlayout->setMargin(6);
-    ADD_TOOL_SIZE_BTN_TO_LAYOUT(F,":/icons/female_d.png",30, sexlayout);
-    ADD_TOOL_SIZE_BTN_TO_LAYOUT(M,":/icons/male_d.png", 30,sexlayout);
-    btnF->setText(tr("Female"));
-    btnM->setText(tr("Male"));
+	ui->setupUi(this);
+	//ui->lbl_Sex->setText(tr("Gender"));
+	QHBoxLayout* sexlayout = new QHBoxLayout(ui->sexpanelwidget);
+	sexlayout->setMargin(6);
+	ADD_TOOL_SIZE_BTN_TO_LAYOUT(F, ":/icons/female_d.png", 30, sexlayout);
+	ADD_TOOL_SIZE_BTN_TO_LAYOUT(M, ":/icons/male_d.png", 30, sexlayout);
+	btnF->setText(tr("Female"));
+	btnM->setText(tr("Male"));
+
+	//    btnFemale->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	//    btnMale->setToolButtonStyle(Qt::ToolButtonIconOnly);
+
+	btnF->setObjectName("sexBtn");
+	btnM->setObjectName("sexBtn");
+	//btnF->setText("Female");
+	//btnM->setText("Male");
+	ui->sexpanelwidget->setEnabled(editEnable);
+	btnF->setEnabled(editEnable);
+	btnM->setEnabled(editEnable);
+	btnF->setCheckable(true);
+	btnM->setCheckable(true);
+	QButtonGroup* group = new QButtonGroup(this);
+	group->addButton(btnF);
+	group->addButton(btnM);
+	btnF->setChecked(true);
+	btnFemale = btnF;
+	btnMale = btnM;
+	QHBoxLayout* layout = new QHBoxLayout(this->ui->editcmdWidget);
+
+	ADD_TOOL_BTN(Cancel, ":/icons/close_circle.png");
+	ADD_TOOL_BTN(Accpet, ":/icons/selected.png");
+	btnCancel->setText(tr("Cancel"));
+	btnAccpet->setText(tr("Accept"));
+	btnCancel->setEnabled(editEnable);
+	btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	btnCancel->setIcon(QIcon(editEnable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png"));
+	btnAccpet->setEnabled(editEnable);
+	btnAccpet->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	btnAccpet->setIcon(QIcon(editEnable ? ":/icons/selected.png" : ":/icons/selected_d.png"));
+	btnEditAccept = btnAccpet;
+	btnEditCancel = btnCancel;
+	connect(btnEditCancel, &QToolButton::clicked, [=]() {
+		clearPatientInformation();
+		this->setEditEnable(false);
+		restorePatientInformation();
+		emit editCancel();
+		});
+	connect(btnEditAccept, &QToolButton::clicked, [=]() {
+		if (ui->tbx_ID->text().isEmpty())return;
+		if (ui->tbx_Name->text().isEmpty())return;
+		storePatientInformation();
+		bool result = true;
+		emit editAccept(getPatientInformation(), result);
+		if (result) this->setEditEnable(false);
+		});
+	ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd");
+
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+
+		ui->retranslateUi(this);
+		btnF->setText(tr("Female"));
+		btnM->setText(tr("Male"));
+		btnCancel->setText(tr("Cancel"));
+		btnAccpet->setText(tr("Accept"));
+		});
+
 
-//    btnFemale->setToolButtonStyle(Qt::ToolButtonIconOnly);
-//    btnMale->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
-    btnF->setObjectName("sexBtn");
-    btnM->setObjectName("sexBtn");
-    btnF->setText("Female");
-    btnM->setText("Male");
-    ui->sexpanelwidget->setEnabled(editEnable);
-    btnF->setEnabled(editEnable);
-    btnM->setEnabled(editEnable);
-    btnF->setCheckable(true);
-    btnM->setCheckable(true);
-    QButtonGroup* group= new QButtonGroup(this);
-    group->addButton(btnF);
-    group->addButton(btnM);
-    btnF->setChecked(true);
-    btnFemale=btnF;
-    btnMale=btnM;
-    QHBoxLayout* layout =new QHBoxLayout(this->ui->editcmdWidget);
-    
-    ADD_TOOL_BTN(Cancel,":/icons/close_circle.png");
-    ADD_TOOL_BTN(Accpet,":/icons/selected.png");
-    btnCancel->setText(tr("Cancel"));
-    btnAccpet->setText(tr("Accept"));
-    btnCancel->setEnabled(editEnable);
-    btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    btnCancel->setIcon(QIcon(editEnable?":/icons/close_circle.png":":/icons/close_circle_d.png"));
-    btnAccpet->setEnabled(editEnable);
-    btnAccpet->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    btnAccpet->setIcon(QIcon(editEnable?":/icons/selected.png":":/icons/selected_d.png"));
-    btnEditAccept = btnAccpet;
-    btnEditCancel = btnCancel;
-    connect(btnEditCancel,&QToolButton::clicked,[=](){
-        clearPatientInformation();
-        this->setEditEnable(false);
-        restorePatientInformation();
-        emit editCancel();
-    });
-    connect(btnEditAccept,&QToolButton::clicked,[=](){
-        if (ui->tbx_ID->text().isEmpty())return;
-        if (ui->tbx_Name->text().isEmpty())return;
-        storePatientInformation();
-        bool result = true;
-        emit editAccept(getPatientInformation(), result);
-        if (result) this->setEditEnable(false);
-    });
-    ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd");
 }
 
 EditPatientForm::~EditPatientForm()
 {
-    delete ui;
+	delete ui;
 }
 
-void EditPatientForm::setPatientInformation(PatientInformation *information) {
-    if (information)
-    {
-        ui->tbx_ID->setText(information->ID);
-        ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate,"yyyy-MM-dd"));
-        ui->tbx_Name->setText(information->Name);
-        ui->rtbx_Comment->setText(information->Comment);
-        btnFemale->setChecked(information->Sex=="F");
-        btnMale->setChecked(information->Sex!="F");
-        currentPatientUID = information->PatientUID;
-        AddDate = information->AddDate;
-        storePatientInformation();
-    }
+void EditPatientForm::setPatientInformation(PatientInformation* information) {
+	if (information)
+	{
+		ui->tbx_ID->setText(information->ID);
+		ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate, "yyyy-MM-dd"));
+		ui->tbx_Name->setText(information->Name);
+		ui->rtbx_Comment->setText(information->Comment);
+		btnFemale->setChecked(information->Sex == "F");
+		btnMale->setChecked(information->Sex != "F");
+		currentPatientUID = information->PatientUID;
+		AddDate = information->AddDate;
+		storePatientInformation();
+	}
 }
 
 void EditPatientForm::clearPatientInformation() {
-    ui->tbx_ID->setText("");
-    ui->tbx_Dob->setDate(QDate::currentDate());
-    ui->tbx_Name->setText("");
-    btnFemale->setChecked(true);
-    btnMale->setChecked(false);
-    ui->rtbx_Comment->setText("");
-    currentPatientUID = "";
-    AddDate = "";
+	ui->tbx_ID->setText("");
+	ui->tbx_Dob->setDate(QDate::currentDate());
+	ui->tbx_Name->setText("");
+	btnFemale->setChecked(true);
+	btnMale->setChecked(false);
+	ui->rtbx_Comment->setText("");
+	currentPatientUID = "";
+	AddDate = "";
 }
 
 void EditPatientForm::setEditEnable(bool enable) {
-    ui->tbx_ID->setEnabled(enable);
-    ui->tbx_Dob->setEnabled(enable);
-    ui->tbx_Name->setEnabled(enable);
-    ui->sexpanelwidget->setEnabled(enable);
-    btnFemale->setEnabled(enable);
-    btnFemale->setIcon(QIcon(enable?":/icons/female.png":":/icons/female_d.png"));
-    btnMale->setEnabled(enable);
-    btnMale->setIcon(QIcon(enable?":/icons/male.png":":/icons/male_d.png"));
-    ui->rtbx_Comment->setEnabled(enable);
-    btnEditAccept->setEnabled(enable);
-    btnEditCancel->setEnabled(enable);
-    btnEditCancel->setIcon(QIcon(enable?":/icons/close_circle.png":":/icons/close_circle_d.png"));
-    btnEditAccept->setIcon(QIcon(enable?":/icons/selected.png":":/icons/selected_d.png"));
-    editEnable = enable;
-//    ui->->setEnabled(enable);
+	ui->tbx_ID->setEnabled(enable);
+	ui->tbx_Dob->setEnabled(enable);
+	ui->tbx_Name->setEnabled(enable);
+	ui->sexpanelwidget->setEnabled(enable);
+	btnFemale->setEnabled(enable);
+	btnFemale->setIcon(QIcon(enable ? ":/icons/female.png" : ":/icons/female_d.png"));
+	btnMale->setEnabled(enable);
+	btnMale->setIcon(QIcon(enable ? ":/icons/male.png" : ":/icons/male_d.png"));
+	ui->rtbx_Comment->setEnabled(enable);
+	btnEditAccept->setEnabled(enable);
+	btnEditCancel->setEnabled(enable);
+	btnEditCancel->setIcon(QIcon(enable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png"));
+	btnEditAccept->setIcon(QIcon(enable ? ":/icons/selected.png" : ":/icons/selected_d.png"));
+	editEnable = enable;
+	//    ui->->setEnabled(enable);
 }
 
 void EditPatientForm::storePatientInformation() {
-    store.PatientUID =currentPatientUID;
-    store.AddDate = AddDate;
-    store.ID = ui->tbx_ID->text();
-    store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd");
-    store.Name = ui->tbx_Name->text();
-    store.Sex = btnFemale->isChecked()?"F":"M";
-    store.Comment = ui->rtbx_Comment->toPlainText();
-    qDebug()<<store.PatientUID<<","<<store.ID<<","<<store.BirthDate<<","<<store.Name<<","<<store.Sex;
+	store.PatientUID = currentPatientUID;
+	store.AddDate = AddDate;
+	store.ID = ui->tbx_ID->text();
+	store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd");
+	store.Name = ui->tbx_Name->text();
+	store.Sex = btnFemale->isChecked() ? "F" : "M";
+	store.Comment = ui->rtbx_Comment->toPlainText();
+	qDebug() << store.PatientUID << "," << store.ID << "," << store.BirthDate << "," << store.Name << "," << store.Sex;
 }
 
 void EditPatientForm::restorePatientInformation() {
-    currentPatientUID = store.PatientUID;
-    AddDate = store.AddDate;
-    ui->tbx_ID->setText(store.ID);
-    ui->tbx_Dob->setDate(QDate::fromString(store.BirthDate,"yyyy-MM-dd"));
-    ui->tbx_Name->setText(store.Name);
-    ui->rtbx_Comment->setText(store.Comment);
-    btnFemale->setChecked(store.Sex=="F");
-    btnMale->setChecked(store.Sex!="F");
-//    ui->cb_Sex->setCurrentText(store.Sex=="F"?"Female":(store.Name=="M"?"Male":"Other"));
+	currentPatientUID = store.PatientUID;
+	AddDate = store.AddDate;
+	ui->tbx_ID->setText(store.ID);
+	ui->tbx_Dob->setDate(QDate::fromString(store.BirthDate, "yyyy-MM-dd"));
+	ui->tbx_Name->setText(store.Name);
+	ui->rtbx_Comment->setText(store.Comment);
+	btnFemale->setChecked(store.Sex == "F");
+	btnMale->setChecked(store.Sex != "F");
+	//    ui->cb_Sex->setCurrentText(store.Sex=="F"?"Female":(store.Name=="M"?"Male":"Other"));
 
 }
diff --git a/src/generalform.cpp b/src/generalform.cpp
index bdb154c..4036242 100644
--- a/src/generalform.cpp
+++ b/src/generalform.cpp
@@ -50,12 +50,15 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 	layout->addWidget(lockHeader);
 	QHBoxLayout* lockHeaderLayout = new QHBoxLayout(lockHeader);
 
-	QLabel* lbl_lock = new QLabel(tr("Lock Screen Timeout"));
+	QLabel* lbl_lock = new QLabel(tr("Lock Screen"));
 	lockHeaderLayout->addWidget(lbl_lock);
 
 	QLineEdit* lockTime = new QLineEdit(lockHeader);
 	lockTime->setMaximumSize(QSize(300, 32768));
 	lockHeaderLayout->addWidget(lockTime);
+
+	QLabel* ss = new QLabel(tr("s"));
+	lockHeaderLayout->addWidget(ss);
 	lockHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
 
 	//...
@@ -108,6 +111,6 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 		lbl_lan->setText(tr("Language"));
 		lbl_ins->setText(tr("Institution Addr"));
 		lbl_insaddr->setText(tr("Institution Addr"));
-		lbl_lock->setText(tr("Lock Screen Timeout"));
+		lbl_lock->setText(tr("Lock Screen"));
 		});
 }
diff --git a/src/icons/dicomsettings.png b/src/icons/dicomsettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e15f7987991664adf7d423d25518d610082d9c1
GIT binary patch
literal 4902
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

literal 0
HcmV?d00001

diff --git a/src/icons/dicomsettings_d.png b/src/icons/dicomsettings_d.png
new file mode 100644
index 0000000000000000000000000000000000000000..f107249fe185e82a67406293c06ec45773f643ba
GIT binary patch
literal 4838
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
buxZ+`y~sW$vzP-mt{~RtcEn1v3%C9YGvL&i

literal 0
HcmV?d00001

diff --git a/src/icons/networksettings.png b/src/icons/networksettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..616a5f15fcd096b0316453b5b9b70c3c351d116b
GIT binary patch
literal 14283
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
HA4UBip&I-u

literal 0
HcmV?d00001

diff --git a/src/icons/networksettings_d.png b/src/icons/networksettings_d.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae39c64d098ad88600dec0751e3e6450cfe97a38
GIT binary patch
literal 13760
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
F{{UsDLx%tW

literal 0
HcmV?d00001

diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp
index d239512..84796ec 100644
--- a/src/json/jsonobject.cpp
+++ b/src/json/jsonobject.cpp
@@ -281,8 +281,8 @@ host JsonObject::getServer(ServerType type)
 	case JsonObject::PACS:
 		typeName = "pacs";
 		break;
-	case JsonObject::DAQ:
-		typeName = "daq";
+	case JsonObject::LOCAL:
+		typeName = "address";
 		break;
 	case JsonObject::RECON:
 		typeName = "recon";
@@ -310,8 +310,8 @@ void JsonObject::setServer(ServerType type, const host& list)
 	case JsonObject::PACS:
 		typeName = "pacs";
 		break;
-	case JsonObject::DAQ:
-		typeName = "daq";
+	case JsonObject::LOCAL:
+		typeName = "address";
 		break;
 	case JsonObject::RECON:
 		typeName = "recon";
diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h
index 468d908..9f255d3 100644
--- a/src/json/jsonobject.h
+++ b/src/json/jsonobject.h
@@ -38,7 +38,7 @@ public:
 	}
 	enum ServerType
 	{
-		WORKLIST, PACS, DAQ, RECON
+		WORKLIST, PACS, LOCAL, RECON
 	};
 
 	//for login
diff --git a/src/network/dicomcfgdialog.cpp b/src/network/dicomcfgdialog.cpp
new file mode 100644
index 0000000..6429576
--- /dev/null
+++ b/src/network/dicomcfgdialog.cpp
@@ -0,0 +1,95 @@
+#include "dicomcfgdialog.h"
+#include "ui_dicomcfgdialog.h"
+#include <QDialogButtonBox>
+#include <QPushButton>
+
+#include "json/jsonobject.h"
+dicomCfgDialog::dicomCfgDialog(QWidget* parent) :
+	QDialog(parent),
+	ui(new Ui::dicomCfgDialog)
+{
+	ui->setupUi(this);
+	//this->setFixedWidth(500);
+	this->setObjectName("formDialog");
+	this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
+
+	ui->btn_group->button(QDialogButtonBox::Apply)->setText(tr("Apply"));
+	ui->btn_group->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+
+	loadServersInfo();
+
+	connect(ui->btn_group->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=]()
+		{
+			saveServersInfo();
+			accept();
+		});
+	connect(ui->btn_group->button(QDialogButtonBox::Cancel), &QPushButton::clicked, [=]()
+		{
+			reject();
+		});
+	ui->tabWidget->setCurrentIndex(0);
+}
+
+dicomCfgDialog::~dicomCfgDialog()
+{
+	delete ui;
+}
+
+
+void dicomCfgDialog::loadServersInfo()
+{
+	host h;
+	h = JsonObject::Instance()->getServer(JsonObject::RECON);
+	ui->recon_AE->setText(h.ae);
+	ui->recon_IP->setText(h.ip);
+	ui->recon_Name->setText(h.name);
+	ui->recon_Port->setText(h.port);
+
+	h = JsonObject::Instance()->getServer(JsonObject::PACS);
+	ui->pacs_AE->setText(h.ae);
+	ui->pacs_IP->setText(h.ip);
+	ui->pacs_Name->setText(h.name);
+	ui->pacs_Port->setText(h.port);
+
+
+	h = JsonObject::Instance()->getServer(JsonObject::WORKLIST);
+	ui->wl_AE->setText(h.ae);
+	ui->wl_IP->setText(h.ip);
+	ui->wl_Name->setText(h.name);
+	ui->wl_Port->setText(h.port);
+
+
+
+	//qIfConfig(lhost);
+
+
+}
+
+
+void dicomCfgDialog::saveServersInfo()
+{
+
+	host h;
+	h.ae = ui->recon_AE->text();
+	h.ip = ui->recon_IP->text();
+	h.name = ui->recon_Name->text();
+	h.port = ui->recon_Port->text();
+	JsonObject::Instance()->setServer(JsonObject::RECON, h);
+
+	h.ae = ui->pacs_AE->text();
+	h.ip = ui->pacs_IP->text();
+	h.name = ui->pacs_Name->text();
+	h.port = ui->pacs_Port->text();
+	JsonObject::Instance()->setServer(JsonObject::PACS, h);
+
+	h.ip = ui->wl_IP->text();
+	h.ae = ui->wl_AE->text();
+	h.name = ui->wl_Name->text();
+	h.port = ui->wl_Port->text();
+	JsonObject::Instance()->setServer(JsonObject::WORKLIST, h);
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/network/dicomcfgdialog.h b/src/network/dicomcfgdialog.h
new file mode 100644
index 0000000..d6060ca
--- /dev/null
+++ b/src/network/dicomcfgdialog.h
@@ -0,0 +1,25 @@
+#ifndef DICOMCFGDIALOG_H
+#define DICOMCFGDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+	class dicomCfgDialog;
+}
+
+class dicomCfgDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit dicomCfgDialog(QWidget* parent = nullptr);
+	~dicomCfgDialog();
+
+private:
+	Ui::dicomCfgDialog* ui;
+
+	void loadServersInfo();
+	void saveServersInfo();
+};
+
+#endif // DICOMCFGDIALOG_H
diff --git a/src/network/networkcfgdialog.h b/src/network/networkcfgdialog.h
index b8eafa8..9f05d33 100644
--- a/src/network/networkcfgdialog.h
+++ b/src/network/networkcfgdialog.h
@@ -29,7 +29,12 @@ public slots:
 	void beforeThreadExit();
 
 private:
-	bool isModified();
+	bool isJsonModified();
+	bool isNetModified();
+	void loadJsonData();
+	void saveJsonData();
+
+
 	const char* boolToStr(bool b)
 	{
 		return b ? "sucess" : "failed";
diff --git a/src/networkcfgdialog.ui b/src/networkcfgdialog.ui
index 672d896..ce4262a 100644
--- a/src/networkcfgdialog.ui
+++ b/src/networkcfgdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>819</width>
-    <height>662</height>
+    <width>820</width>
+    <height>671</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,27 +20,21 @@
    <string>Network Settings</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">
-QTabWidget::pane {
-    border-top: 0px;
-}
-
-QTabBar::tab {
+   <string notr="true">QTabBar::tab {
 font-size:25px;
 height:40px;
-width:120px;
-background:#4d4d4d;
+width:190px;
 border: 0px;
 border-top-left-radius: 0%;
 border-top-right-radius: 0%;
 border-bottom-left-radius:0%;
 border-bottom-right-radius:0%;
-padding: 2px;
+background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333);
 }
 
 QTabBar::tab:selected, QTabBar::tab:hover {
-border-bottom:5px solid #4a88c7;
-background:  #505050;}
+background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #ABABAB, stop: 1.0 #CDCDCD);
+}
 
 QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
   </property>
@@ -54,7 +48,7 @@ QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
       <item>
        <widget class="QLabel" name="title">
         <property name="text">
-         <string>Network Setting</string>
+         <string>Network Settings</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -66,9 +60,18 @@ QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="tabPosition">
+         <enum>QTabWidget::North</enum>
+        </property>
+        <property name="tabShape">
+         <enum>QTabWidget::Rounded</enum>
+        </property>
         <property name="currentIndex">
          <number>0</number>
         </property>
+        <property name="elideMode">
+         <enum>Qt::ElideLeft</enum>
+        </property>
         <widget class="QWidget" name="tab">
          <attribute name="title">
           <string>Address</string>
@@ -103,7 +106,7 @@ QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
              <item row="2" column="0">
               <widget class="QLabel" name="label_3">
                <property name="text">
-                <string>Dynamic Address</string>
+                <string>DHCP</string>
                </property>
               </widget>
              </item>
@@ -432,6 +435,76 @@ QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="tab_dicom">
+         <attribute name="title">
+          <string>DICOM</string>
+         </attribute>
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <item>
+           <widget class="QWidget" name="block2" native="true">
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="0">
+              <widget class="QLabel" name="lbl_Name">
+               <property name="text">
+                <string>Name</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="daq_AE"/>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="daq_Name"/>
+             </item>
+             <item row="3" column="1">
+              <widget class="QLineEdit" name="daq_Port"/>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="lbl_Port">
+               <property name="text">
+                <string>Port</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <spacer name="horizontalSpacer_6">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="lbl_AE">
+               <property name="text">
+                <string>AE</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="lbl_IP">
+               <property name="text">
+                <string>IP</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLineEdit" name="daq_IP">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
         <widget class="QWidget" name="tab_3">
          <attribute name="title">
           <string>Result</string>
diff --git a/src/res.qrc b/src/res.qrc
index 3038e07..5a629dd 100644
--- a/src/res.qrc
+++ b/src/res.qrc
@@ -27,6 +27,10 @@
     <file>icons/female_d.png</file>
     <file>icons/male_d.png</file>
     <file>icons/login.png</file>
+    <file>icons/dicomsettings.png</file>
+    <file>icons/dicomsettings_d.png</file>
+    <file>icons/networksettings.png</file>
+    <file>icons/networksettings_d.png</file>
     <file>fonts/DroidSansFallback.ttf</file>
     <file>translations/en_US.qm</file>
     <file>translations/zh_CN.qm</file>
diff --git a/src/stylesheet/Dark2.qss b/src/stylesheet/Dark2.qss
index 64ca969..44565a3 100644
--- a/src/stylesheet/Dark2.qss
+++ b/src/stylesheet/Dark2.qss
@@ -1 +1 @@
-

/*------1.silver-->grey--------------------------*/

*{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;}

QTabBar::tab {
height:60px;
width:300px;
font-size: 25px;
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #333333, stop: 1.0 #505050);
border: 2px solid #505050;
border-bottom-left-radius: 50%;
border-bottom-right-radius: 50%;
min-width: 8ex;
padding: 2px;
}
QTabBar::tab:selected, QTabBar::tab:hover {
border-top:5px solid #4a88c7;
background:  #505050;}
QTabWidget::pane{margin:0}
QPlainTextEdit{border:0px}
QGroupBox{border:0px}
QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;}

QLineEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;}
QLineEdit:enabled{background-color: #505050;color:#fcfcfc;}
QDateEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;}
QDateEdit:enabled{background-color: #505050;color:#fcfcfc;}
QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;}
QTextEdit:enabled{background-color: #505050;color:#fcfcfc;}

QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050}
QComboBox:enabled{background-color: #505050}
QComboBox::drop-down{width:20px}
QComboBox QAbstractItemView{min-width:120px;}
QComboBox QAbstractItemView::item {min-height:60px;max-height:60px;  border:1px solid white;}

QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget QToolButton:disabled{color:#606060  }
QWidget QToolButton:hover{background:#505050;}
QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}

QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:#4c5052}
QListView{border:none;margin:5px; font-weight:bold}
QListView::item{background:#4c5052;min-height:30px; border:1px solid #505050; border-radius:5px}
QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;}
/*QListView::item:selected{
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                stop: 0 #ABAFE5, stop: 1 #8588B2);
	border:1px solid #505050;
}*/

QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;}
QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);}
QHeaderView::section:vertical{min-height:36px;max-height:36px;}
QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8}


/*-----------Specific---------------*/
QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;}
QWidget#topbarWidget{min-height:36px;max-height:36px;}
QWidget#contentWidget{border-top:1px solid #505050;}
QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;}
QLabel#logo{min-width:30px;max-width:30px}
QLabel#company{min-width:150px;max-width:150px; }
QLabel#systemMsgBar{min-width:500px;}
QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}
QWidget QWidget#statusBarWidget{min-width:300px;}
QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget#editcmdWidget{min-height:83px;max-height:83px;}
QWidget#verSpaceLine{ border-right:1px solid #0078d8;}
QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent}


/*-----蒙版Dialog-----*/
QDialog QWidget#innerWidget{ 
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);
border-radius:20px;border:5px solid #0078d8; }
QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}
QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}
#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}


/*-----FormDialog-----*/
QPushButton#btnOK{background:#365880; font-weight:bold}
QDialog#formDialog{border:3px solid grey; border-radius:8px}
QWidget#slider_one{border:1px solid #505050; border-radius:8px}
QWidget#formWidget QLabel#endline{border-bottom:1px solid grey}
QWidget#formWidget{font-size:30px;}
QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 }
QWidget#edit_patient{min-width:300px;max-width:300px;}
QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;}
QToolButton#sexBtn:disabled{color:grey}
QWidget#sexpanelwidget{border:1px solid #505050;}
QWidget#sexpanelwidget:enabled{background-color: #505050;}
QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;}
\ No newline at end of file
+

/*------1.silver-->grey--------------------------*/

*{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;}

QTabBar::tab {
height:60px;
width:300px;
font-size: 25px;
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333);
border: 2px solid #505050;
border-bottom-left-radius: 50%;
border-bottom-right-radius: 50%;
min-width: 8ex;
padding: 2px;
}
QTabBar::tab:selected, QTabBar::tab:hover {
border-top:5px solid #4a88c7;
background:  #505050;}
QTabWidget::pane{margin:0}
QPlainTextEdit{border:0px}
QGroupBox{border:0px}
QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;}

QLineEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;}
QLineEdit:enabled{background-color: #505050;color:#fcfcfc;}
QDateEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;}
QDateEdit:enabled{background-color: #505050;color:#fcfcfc;}
QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;}
QTextEdit:enabled{background-color: #505050;color:#fcfcfc;}

QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050}
QComboBox:enabled{background-color: #505050}
QComboBox::drop-down{width:20px}
QComboBox QAbstractItemView{min-width:120px;}
QComboBox QAbstractItemView::item {min-height:60px;max-height:60px;  border:1px solid white;}

QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget QToolButton:disabled{color:#606060  }
QWidget QToolButton:hover{background:#505050;}
QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}

QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px;
background:qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #505050, stop:1 #606060);}
QListView{border:none;margin:5px; font-weight:bold}
QListView::item{background:#4d4d4d;min-height:30px; border:1px solid #505050; border-radius:5px}
QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;}
/*QListView::item:selected{
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                stop: 0 #ABAFE5, stop: 1 #8588B2);
	border:1px solid #505050;
}*/

QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;}
QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);}
QHeaderView::section:vertical{min-height:36px;max-height:36px;}
QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8}


/*-----------Specific---------------*/
QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;}
QWidget#topbarWidget{min-height:36px;max-height:36px;}
QWidget#contentWidget{border-top:1px solid #505050;}
QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;}
QLabel#logo{min-width:30px;max-width:30px}
QLabel#company{min-width:150px;max-width:150px; }
QLabel#systemMsgBar{min-width:500px;}
QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}
QWidget QWidget#statusBarWidget{min-width:300px;}
QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget#editcmdWidget{min-height:83px;max-height:83px;}
QWidget#verSpaceLine{ border-right:1px solid #0078d8;}
QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent}


/*-----蒙版Dialog-----*/
QDialog QWidget#innerWidget{ 
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);
border-radius:20px;border:5px solid #0078d8; }
QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}
QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}
#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}


/*-----FormDialog-----*/
QPushButton#btnOK{background:#365880; font-weight:bold}
QDialog#formDialog{border:3px solid grey; border-radius:8px}
QWidget#slider_one{border:1px solid #505050; border-radius:8px}
QWidget#formWidget QLabel#endline{border-bottom:1px solid grey}
QWidget#formWidget{font-size:30px;}
QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 }
QWidget#edit_patient{min-width:300px;max-width:300px;}
QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;}
QToolButton#sexBtn:disabled{color:grey}
QWidget#sexpanelwidget{border:1px solid #505050;}
QWidget#sexpanelwidget:enabled{background-color: #505050;}
QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;}
\ No newline at end of file
diff --git a/src/systemsettingform.cpp b/src/systemsettingform.cpp
index c8ce749..ebb8825 100644
--- a/src/systemsettingform.cpp
+++ b/src/systemsettingform.cpp
@@ -9,12 +9,14 @@
 #include <QLineEdit>
 #include <QEvent>
 #include <QToolButton>
-#include "json/jsonobject.h"
+
 #include "SelectDialog.h"
 #include "components/imageswitch.h"
 #include "network/networkcfgdialog.h"
+#include "network/dicomcfgdialog.h"
 #include "network/getadminpsw.h"
 
+#include "json/jsonobject.h"
 #include "event/EventCenter.h"
 systemSettingForm::systemSettingForm(QWidget* parent) :
 	QWidget(parent),
@@ -24,29 +26,27 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 
 
 	//style init
-	ui->btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	ui->btnCancel->setIcon(QIcon(":/icons/close_circle.png"));
-	ui->btnCancel->setIconSize(QSize(50, 50));
-	ui->btnAccept->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	ui->btnAccept->setIcon(QIcon(":/icons/selected.png"));
-	ui->btnAccept->setIconSize(QSize(50, 50));
+	//ui->btn_dicom->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 
+	ui->btn_dicom->setIcon(QIcon(":/icons/dicomsettings.png"));
+	//ui->btn_dicom->setText(tr("DICOM"));
+	ui->btn_dicom->setIconSize(QSize(80, 80));
+
+	//ui->btn_network->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+	ui->btn_network->setIcon(QIcon(":/icons/networksettings.png"));
+	//ui->btn_network->setText(tr("IP"));
+	ui->btn_network->setIconSize(QSize(80, 80));
+
 	ui->swt_verify->setChecked(true);
-	//ui->swt_verify->setButtonStyle(ImageSwitch::ButtonStyle_1);
-
-
-
-	ui->btnFlt->setFixedWidth(200);
-	ui->btnPro->setFixedWidth(200);
-	ui->lbl_protocal->setFixedWidth(100);
-	//lbl_filter
-	ui->lbl_list->setFixedWidth(100);
+	//ui->btnFlt->setFixedWidth(200);
+	//ui->btnPro->setFixedWidth(200);
+	//ui->lbl_protocal->setFixedWidth(100);
 	ui->lbl_verify->setFixedWidth(100);
 
 
 	//data init
 	ui->btnPro->setText(JsonObject::Instance()->defaultProtocal());
 	ui->btnFlt->setText(JsonObject::Instance()->defaultFilter());
-	loadServersInfo();
+
 
 	//connection
 	connect(ui->swt_verify, &ImageSwitch::clicked, [=]() {
@@ -65,12 +65,15 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 			dia.exec();
 		}
 		});
-	connect(ui->btnCancel, &QToolButton::clicked, [=]() {
-		loadServersInfo();
-		});
-	connect(ui->btnAccept, &QToolButton::clicked, [=]() {
-		saveServersInfo();
+
+	connect(ui->btn_dicom, &QToolButton::clicked, [=]() {
+		dicomCfgDialog dia(this);
+		dia.setWindowModality(Qt::WindowModal);
+		dia.exec();
 		});
+
+
+
 	connect(ui->btnPro, &QPushButton::clicked, [=]() {
 		if (!sd_protocal) {
 			sd_protocal = new SelectDialog(this);
@@ -105,6 +108,9 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 
 	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
 		ui->retranslateUi(this);
+
+		ui->btnPro->setText(JsonObject::Instance()->defaultProtocal());
+		ui->btnFlt->setText(JsonObject::Instance()->defaultFilter());
 		});
 }
 
@@ -113,84 +119,7 @@ systemSettingForm::~systemSettingForm()
 	delete ui;
 }
 
-void systemSettingForm::loadServersInfo()
-{
-	host h;
-	h = JsonObject::Instance()->getServer(JsonObject::RECON);
-	ui->recon_AE->setText(h.ae);
-	ui->recon_IP->setText(h.ip);
-	ui->recon_Name->setText(h.name);
-	ui->recon_Port->setText(h.port);
 
-	h = JsonObject::Instance()->getServer(JsonObject::PACS);
-	ui->pacs_AE->setText(h.ae);
-	ui->pacs_IP->setText(h.ip);
-	ui->pacs_Name->setText(h.name);
-	ui->pacs_Port->setText(h.port);
-
-
-	h = JsonObject::Instance()->getServer(JsonObject::DAQ);
-	ui->daq_AE->setText(h.ae);
-	ui->daq_IP->setText(h.ip);
-	ui->daq_Name->setText(h.name);
-	ui->daq_Port->setText(h.port);
-
-	h = JsonObject::Instance()->getServer(JsonObject::WORKLIST);
-	ui->wl_AE->setText(h.ae);
-	ui->wl_IP->setText(h.ip);
-	ui->wl_Name->setText(h.name);
-	ui->wl_Port->setText(h.port);
-
-	//localhost lhost = JsonObject::Instance()->getLocalHost();
-	//local_IP->setIP(lhost.ip);
-	//local_Mask->setIP(lhost.mask);
-	//local_Gate->setIP(lhost.gateway);
-
-	//qIfConfig(lhost);
-
-
-}
-
-
-void systemSettingForm::saveServersInfo()
-{
-
-	host h;
-	h.ae = ui->recon_AE->text();
-	h.ip = ui->recon_IP->text();
-	h.name = ui->recon_Name->text();
-	h.port = ui->recon_Port->text();
-	JsonObject::Instance()->setServer(JsonObject::RECON, h);
-
-	h.ae = ui->pacs_AE->text();
-	h.ip = ui->pacs_IP->text();
-	h.name = ui->pacs_Name->text();
-	h.port = ui->pacs_Port->text();
-	JsonObject::Instance()->setServer(JsonObject::PACS, h);
-
-	h.ip = ui->wl_IP->text();
-	h.ae = ui->wl_AE->text();
-	h.name = ui->wl_Name->text();
-	h.port = ui->wl_Port->text();
-	JsonObject::Instance()->setServer(JsonObject::WORKLIST, h);
-
-
-	h.ip = ui->daq_IP->text();
-	h.ae = ui->daq_AE->text();
-	h.name = ui->daq_Name->text();
-	h.port = ui->daq_Port->text();
-	JsonObject::Instance()->setServer(JsonObject::DAQ, h);
-
-
-	//localhost lhost;
-	//lhost.ip = local_IP->getIP();
-	//lhost.mask = local_Mask->getIP();
-	//lhost.gateway = local_Gate->getIP();
-	//JsonObject::Instance()->setLocalHost(lhost);
-
-	//qIfConfig(lhost);
-
-}
 
 //void systemSettingForm::changeEvent(QEvent* event)
 //{
diff --git a/src/systemsettingform.h b/src/systemsettingform.h
index 660122f..2e06b5a 100644
--- a/src/systemsettingform.h
+++ b/src/systemsettingform.h
@@ -27,9 +27,6 @@ private:
 	Ui::systemSettingForm* ui;
 	SelectDialog* sd_protocal = nullptr;
 	SelectDialog* sd_filter = nullptr;
-
-	void loadServersInfo();
-	void saveServersInfo();
 };
 
 #endif // SYSTEMSETTINGFORM_H
diff --git a/src/systemsettingform.ui b/src/systemsettingform.ui
index 1e1fbf1..2b3f205 100644
--- a/src/systemsettingform.ui
+++ b/src/systemsettingform.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>619</width>
+    <width>572</width>
     <height>612</height>
    </rect>
   </property>
@@ -20,8 +20,18 @@
       <item>
        <widget class="QWidget" name="block10" native="true">
         <layout class="QGridLayout" name="gridLayout_2">
-         <item row="2" column="1">
-          <spacer name="horizontalSpacer_2">
+         <item row="1" column="2">
+          <widget class="ImageSwitch" name="swt_verify" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>25</width>
+             <height>25</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -36,15 +46,8 @@
            </property>
           </spacer>
          </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Network Setting</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QPushButton" name="btnFlt">
+         <item row="1" column="0">
+          <widget class="QLabel" name="lbl_verify">
            <property name="minimumSize">
             <size>
              <width>100</width>
@@ -52,7 +55,7 @@
             </size>
            </property>
            <property name="text">
-            <string>PushButton</string>
+            <string>Auto Verify</string>
            </property>
           </widget>
          </item>
@@ -63,6 +66,19 @@
            </property>
           </widget>
          </item>
+         <item row="0" column="2">
+          <widget class="QPushButton" name="btnPro">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="1">
           <spacer name="horizontalSpacer_7">
            <property name="orientation">
@@ -79,236 +95,71 @@
            </property>
           </spacer>
          </item>
-         <item row="0" column="2">
-          <widget class="QPushButton" name="btnPro">
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="3" column="0">
+          <widget class="QToolButton" name="btn_dicom">
            <property name="text">
-            <string>PushButton</string>
+            <string>DICOM</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
+         <item row="4" column="0">
           <widget class="QLabel" name="lbl_filter">
            <property name="text">
             <string>Worklist Filter</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <spacer name="horizontalSpacer_8">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="2" column="2">
-          <widget class="ImageSwitch" name="swt_verify" native="true"/>
-         </item>
          <item row="2" column="0">
-          <widget class="QLabel" name="lbl_verify">
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
+          <widget class="QToolButton" name="btn_network">
            <property name="text">
-            <string>Auto Verify</string>
+            <string>IP</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
            </property>
           </widget>
          </item>
-         <item row="3" column="2">
-          <widget class="QPushButton" name="btn_network">
+         <item row="4" column="1">
+          <widget class="QPushButton" name="btnFlt">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>50</height>
+            </size>
+           </property>
            <property name="text">
-            <string>Configure</string>
+            <string/>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
-       <spacer name="horizontalSpacer_6">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="block2" native="true">
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="horizontalSpacing">
-       <number>25</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>10</number>
-      </property>
-      <item row="5" column="2">
-       <widget class="QLineEdit" name="recon_AE"/>
-      </item>
-      <item row="4" column="2">
-       <widget class="QLineEdit" name="daq_AE"/>
-      </item>
-      <item row="4" column="3">
-       <widget class="QLineEdit" name="daq_IP"/>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLineEdit" name="wl_IP"/>
-      </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="recon_Name"/>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="daq_Name"/>
-      </item>
-      <item row="3" column="4">
-       <widget class="QLineEdit" name="pacs_Port"/>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLabel" name="lbl_IP">
-        <property name="text">
-         <string>IP</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="wl_Name"/>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="pacs_Name"/>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="wl_AE"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="lbl_Name">
-        <property name="text">
-         <string>Name</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="lbl_AE">
-        <property name="text">
-         <string>AE</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="QLineEdit" name="pacs_AE"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="lbl_PACS">
-        <property name="text">
-         <string>PACS</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="4">
-       <widget class="QLineEdit" name="daq_Port"/>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="lbl_Recon">
-        <property name="text">
-         <string>3D Recon</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="3">
-       <widget class="QLineEdit" name="recon_IP"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lbl_list">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Worklist</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="lbl_DAQ">
-        <property name="text">
-         <string>DAQ</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QLineEdit" name="pacs_IP"/>
-      </item>
-      <item row="2" column="4">
-       <widget class="QLineEdit" name="wl_Port"/>
-      </item>
-      <item row="1" column="4">
-       <widget class="QLabel" name="lbl_Port">
-        <property name="text">
-         <string>Port</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="4">
-       <widget class="QLineEdit" name="recon_Port"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QToolButton" name="btnCancel">
-        <property name="text">
-         <string>Cancel</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="btnAccept">
-        <property name="text">
-         <string>Accept</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -332,6 +183,7 @@
    <class>ImageSwitch</class>
    <extends>QWidget</extends>
    <header location="global">components/imageswitch.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index 28054c3..cf6dde5 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -7,22 +7,10 @@
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>User ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input User ID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Input User name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
@@ -87,6 +75,18 @@
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Input User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Input User name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AccountTableForm</name>
@@ -110,6 +110,22 @@
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Role</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdminSettingForm</name>
@@ -133,10 +149,6 @@
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AlertDialog</name>
@@ -264,7 +276,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock Screen Timeout</source>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock Screen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -508,6 +524,10 @@ parameters
         <source>Add Date</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -534,6 +554,53 @@ parameters
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Worklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PACS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3D Recon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICOM Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
@@ -544,10 +611,6 @@ parameters
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dynamic Address</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Dev</source>
         <translation type="unfinished"></translation>
@@ -613,7 +676,27 @@ parameters
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Setting</source>
+        <source>DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICOM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -623,14 +706,6 @@ parameters
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Network Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PushButton</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Protocal</source>
         <translation type="unfinished"></translation>
@@ -643,48 +718,12 @@ parameters
         <source>Auto Verify</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PACS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3D Recon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Worklist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DAQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
+        <source>DICOM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak
index 28054c3..cf6dde5 100644
--- a/src/translations/en_US.ts.bak
+++ b/src/translations/en_US.ts.bak
@@ -7,22 +7,10 @@
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>User ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input User ID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Input User name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
@@ -87,6 +75,18 @@
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Input User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Input User name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AccountTableForm</name>
@@ -110,6 +110,22 @@
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Role</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdminSettingForm</name>
@@ -133,10 +149,6 @@
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AlertDialog</name>
@@ -264,7 +276,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock Screen Timeout</source>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock Screen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -508,6 +524,10 @@ parameters
         <source>Add Date</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -534,6 +554,53 @@ parameters
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Worklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PACS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3D Recon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICOM Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
@@ -544,10 +611,6 @@ parameters
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Dynamic Address</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Dev</source>
         <translation type="unfinished"></translation>
@@ -613,7 +676,27 @@ parameters
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Setting</source>
+        <source>DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICOM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -623,14 +706,6 @@ parameters
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Network Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PushButton</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Protocal</source>
         <translation type="unfinished"></translation>
@@ -643,48 +718,12 @@ parameters
         <source>Auto Verify</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PACS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3D Recon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Worklist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DAQ</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
+        <source>DICOM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index 03cdfc6f73d4e218e2a77b5f5ebb9885752a2d06..f569de61c8feae72283a104a5c330d5581be9e45 100644
GIT binary patch
delta 1894
zcmZXU3rtg27{|Z1_q4sey=|#L3w;Zyi3%|eg$(DTMFDv^#&jx+1S&G1Oz;shv5M}2
zgE&2+!=X{9CMqhzj08o)L<NQTVkkqVOl4+qZf0(}naI9!78cx1ZhrTC=R4oyf4<yH
zbN3~CV;ZxKmw&CP>U5aTE!o@LHw%F10H7E^QwqSP0|b{an#Ul!0OWm)>J7+y0H#bv
zYbT>41!KGkAVvU8(jXTB%-N5&0!G70MspH?H{l|H)dkS$1PD3>(xp!Tv<DfjYTzo?
z0a)UJJI!I@I!0qHqxD1Jx+?+H6B%`XG5Uuy25n(<gaP5d0SMR(Bq|L34*`kA;!Q`v
zOX4B{q**XT1;?nq$rz+$G=0Ko8xLgFHaytHXuAMpI|fut0#dye!0$K4z<MA@mH-$G
zpo#Xw&Z}WcJLa*^gXmoi0D*llXL~E2dp`=|R!5`6yBW=oA@24x?6`>0{x_s$yu!d1
zc()g&4_p9w5i0<cgET{8^(t3MNb6H<%q)ox_#MMMm(*@K12C#l(iXoSK<AYnsNpeO
zjr9DQMgXBrdaLw2fbBEsqXFFKHpx!y!}_30)?1u|X)eir{t5fj?3O)~;uHk+a$}d{
zzJ41w<zhB~Ov{zjV0vL1S9b9!c!BTcst!!TjYHg*@t9c1V^j|^247~h1aq|$4&V)r
zV>FgBTKc%-8|LGPY+y7+aaW?Q-~=ccbt*>NJ6y-m%}E$Xz2xpBeCx%lO!s{N7<)+M
z04ge-OrrFA0aX2DqpKYiZy^=6Z(zqyNX_{D*olELD3Tnk!nLxA)E#a{+DZEj4|bkF
zIyU#9UmoeWhI1`FPp&2|M<rv(EfZ4v0i&)-9<TGBK*Ln|g45wBeX@LOqzfg>W;DH2
zq{nh7X_2Dh>JGf3CdJNtf0P;+6%~wzj}=EM?gN+`6~{eDO*f<UnKHTl4_sT7hwneY
zLbfpa%~m#7wBaOd<P*F--(zBbe%bxEFzjPKZ?PJ{v6|1zn1Bvpe14q)6|nH_P7LH%
z&3DYe4)yK)D;xUzSE&{*#o6%hRb|Kc3j3OoykHcn8I4J*?Aq^emitwEqHu<dfr6rG
z9$w{q!OKra1&CFMU9LihS%SN`90O(u>k~1dq*17v<;2cPgk$yiE0E1qPha1Q1(mC7
zTpMxt($%LW_?ywsP+uwQLjMx=!x<>C>MPMfZsQQI6C<4c0K7|#S?k6EJz{w(Hl$1u
zH+ACGYVTyQ59=<mwJin}I3sqqqEwRS;y@ab-y#0u!P#&e)hsqYMf+&YgF&QfrdD<G
z1`gdZtx%qh9ME1@qVxfew13K5km<R2=ml*Sto7tBp)a*TG*vLryQ&kqL41_HTa@D~
zjd#&R!9>GD1APwq@*8DE!<*dOh57EG?QKH1bmchODr{{iQ{R)xr0*5eRHHxrNVkku
z>O}fXXO>A<PHhPAtCLI=5(~5P>}gp=ZnsB)IfOZGkGm){e|BL}fkZYUy`;FIM_)vI
z@fuQ%soYSZ56y;#J?2gcy&WRboufrwlbxGYSm0cmL;L*#MCr^}UsPtK65AO0zn>Ad
zu?fSjuH4N0!W@YVJ$2xMcyK}rB!T_&vtG||gBn-7GbPEM=3cQP*OOEHUs#sQJ~A`a
zhAKu{^jvagf&2Ai0eUWVrZeq-X4(<Tk33Jmu)Nlt47;N()?k{ZGSE-0Khnz4BH>(d
z&Q!D-d@DH_DjJt2T41|L*Vq^O%)a921+@KOkMONIUum?(W~Ph$Ei~LQj&8-*=ZIC%
pZbu+(c3h*QLZa#Mkl~ouLyh!YsD_@kDCv`s>GW~vWLg@Q@DDTw_rd@G

delta 1689
zcmYk6eN0nl6vj{6d)waLd;7sx3zSl@z~<Z(8Hh?I+B!Z&ha%#PItWy3&^EMXM&qoY
z*#==**gM={ECDCRAycHzv8izmBBEt(iZVqv7X_Wkro^Gkmf%i()%eHF@4jE>ea>^v
zy}Ot6FY;ydlo`(4ZD|~gGoC1JJAQ2e0CO6jLV%cGkV60hAg=?&#saW&aoi1%tVaF{
zkhKTrHd5;2C?o3tvP%F=0f5|70MV}i6chm{TmXYs0K<KduKNo>qXnri_!9L1n4=7U
zd^@H7Hf8iKU@m<Cz;{q;ODRK}DGh^^rU_uV!vJCb0h^wH!lnYda0d$R1~xktKw3&E
zte`a5C}Xq0$G-hBZoCR?(>4IzD#{2Gu=|SvB6fg!whl9Fg0uk)6f*~Af9}Wm9LU<$
zhl0O?>`k*Vffu1*%_M;KJy<b<j)nI@#dI%#atpYxokaH-I4o&HUWQx$Vxo{tsTlW3
z*uHU8{=THM;TS+@yySFFHCpqB^yN*%0LHbHu~pLc77j0ZSK7O^2OY6Whu`VN^=9eq
zG2GA8$zDjkfmW}QC0|$$AP&mD*^R<sNH*dr$HbClcWz;#YNhONsTLqo&m>jiy3RMr
zq@5}QkZG9BEvQ)4Lumr0<`fF!mNJd)$+-R{^JxwWRE<#zHIz|BlqLt$IjtR?`iD~g
zEoD?cb8rXNUX(Lu)6b#+H>Ji)=`&7c0>PT`TPZ{B%(=az*gQ?l)!ZL&{ye22oJ}1=
z%cUu7dI(ynTFvgX4dA{RY<=ge=)^GF^3op6sG8DH$?k2$u`-qI>Nt+g_Zb`b@G`Dn
zWCK5yV4Pm|TwW#kK(m(}j;=&yLzG&JJV$#7$8GYJN3nBbI^-Xv+OTU|Da{)cg$o(1
z^;JdvxlgdxiHhb8VQ4i_%10<8#ufYPu_Tcbii1w1I+HT`zH&+T1Uk~D?6`5$he{fP
zFBq^(dAuG!z3_Wn?&T|ZFrQn0<24LBm#bKf-=JB}RjiqY>kZt7E<Fm9a|2ckq?2)h
zOea7{3O5;x`@<xvRqL=<!m?Cl89`xRQ1W4_vd)VD`o*f&bZlmQ4X^mlw-mcLiRb2F
z#;l27SgFG9KET^Owb+aUe03gPAnD;77g$ly5&l5;bnJyi!o2Dc6yO$``hP@W8A6L~
zCpKZBa8%+!K^?-`njt*5Ss2YkXH^km9E<;wkUQdZ>+e{S6Jo|TI|_4(wH5i8iQ<e{
zH;A>=yiOV2EB2kvz<FN0)Q8SU9*ScHNG?SD(}_J{ZdR{0j^lj1`sO1fcTA)D`aD{i
ztl?`5kq*tzO0+zDx#ofVBsy`@frm!PL8Hl^&Hl!cBK{Dm6=ssd#wc=8*rKzKzBQ~2
zmQaq5EYDR=T7_u;8{%~t%e?6+P9igPTgi4EqxD4;JbboMnqwo|wNXsftl}j96<wDk
zEHuwmT463Ib=&Pu^K!>VyQ|7e9)*Pa1EFhJ8p=N{GN18x#tcfxb-X<-A%g6S3y}W!
z;dte;eZ`WZ8AX}TZqV2^J4-e?O3m}j%G`F3ha8$>B&}0cl32?u;<Mxknk9DcCYKxU
zw0lWOf{7fl%ps8p7sx$}$SG57=4JL$my>*-XdwBCB3T=!Abp8?QlX7}%)1F`WS7<$
zd^a!+i+#>#H*;2(bDg8S%58son337$FMTp7Bxxr7;|NDAA=>9fcpc92C!5qv{(Nh}
i(*c>ZC?B6_PfQ7F;Z^xnp7jf=yx!;ZwU|WQv-W=q3dqO+

diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index 40418aa..43df1f9 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -127,18 +127,44 @@
 </context>
 <context>
     <name>AccountTableForm</name>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="36"/>
+        <source>ID</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="37"/>
+        <location filename="../AccountTableForm.cpp" line="128"/>
+        <source>Name</source>
+        <translation>姓名</translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="38"/>
+        <location filename="../AccountTableForm.cpp" line="129"/>
+        <source>Role</source>
+        <translation>角色</translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="39"/>
+        <location filename="../AccountTableForm.cpp" line="130"/>
+        <source>Comment</source>
+        <translation>备注</translation>
+    </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="63"/>
+        <location filename="../AccountTableForm.cpp" line="132"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="64"/>
+        <location filename="../AccountTableForm.cpp" line="133"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="65"/>
+        <location filename="../AccountTableForm.cpp" line="134"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
@@ -156,34 +182,32 @@
 <context>
     <name>AdminSettingForm</name>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>Account</source>
-        <translation>账户</translation>
+        <translation>用户</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System</source>
         <translation>系统</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <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>
+        <translation type="vanished">日志</translation>
     </message>
     <message>
         <source>Account Manage</source>
@@ -202,10 +226,10 @@
         <translation type="vanished">操作日志</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="69"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="83"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
@@ -276,7 +300,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="135"/>
         <source>ID</source>
-        <translation>编号</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="136"/>
@@ -295,27 +319,30 @@
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="137"/>
-        <location filename="../editpatientform.cpp" line="14"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="19"/>
+        <location filename="../editpatientform.cpp" line="21"/>
+        <location filename="../editpatientform.cpp" line="75"/>
         <source>Female</source>
-        <translation>女性</translation>
+        <translation>女</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="20"/>
+        <location filename="../editpatientform.cpp" line="22"/>
+        <location filename="../editpatientform.cpp" line="76"/>
         <source>Male</source>
-        <translation>男性</translation>
+        <translation>男</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="44"/>
+        <location filename="../editpatientform.cpp" line="46"/>
+        <location filename="../editpatientform.cpp" line="77"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="45"/>
+        <location filename="../editpatientform.cpp" line="47"/>
+        <location filename="../editpatientform.cpp" line="78"/>
         <source>Accept</source>
         <translation>接受</translation>
     </message>
@@ -350,7 +377,7 @@
     <name>GeneralForm</name>
     <message>
         <location filename="../generalform.cpp" line="25"/>
-        <location filename="../generalform.cpp" line="108"/>
+        <location filename="../generalform.cpp" line="111"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
@@ -361,17 +388,26 @@
     </message>
     <message>
         <location filename="../generalform.cpp" line="42"/>
-        <location filename="../generalform.cpp" line="109"/>
-        <location filename="../generalform.cpp" line="110"/>
+        <location filename="../generalform.cpp" line="112"/>
+        <location filename="../generalform.cpp" line="113"/>
         <source>Institution Addr</source>
         <translation>机构地址</translation>
     </message>
     <message>
         <location filename="../generalform.cpp" line="53"/>
-        <location filename="../generalform.cpp" line="111"/>
-        <source>Lock Screen Timeout</source>
+        <location filename="../generalform.cpp" line="114"/>
+        <source>Lock Screen</source>
         <translation>锁屏时间</translation>
     </message>
+    <message>
+        <source>Lock Screen Timeout</source>
+        <translation type="vanished">锁屏时间</translation>
+    </message>
+    <message>
+        <location filename="../generalform.cpp" line="60"/>
+        <source>s</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>GetAdminPsw</name>
@@ -538,7 +574,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="123"/>
         <source>Female</source>
-        <translation>女性</translation>
+        <translation>女</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="124"/>
@@ -577,41 +613,49 @@
     <name>ScanFormWidget</name>
     <message>
         <location filename="../ScanFormWidget.cpp" line="42"/>
+        <location filename="../ScanFormWidget.cpp" line="248"/>
         <source>Protocol</source>
         <translation>扫描协议</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="52"/>
+        <location filename="../ScanFormWidget.cpp" line="242"/>
         <source>LEFT</source>
         <translation>左侧</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="53"/>
+        <location filename="../ScanFormWidget.cpp" line="243"/>
         <source>RIGHT</source>
         <translation>右侧</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="72"/>
+        <location filename="../ScanFormWidget.cpp" line="244"/>
         <source>Refresh</source>
         <translation>空扫</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="73"/>
+        <location filename="../ScanFormWidget.cpp" line="245"/>
         <source>Preview</source>
         <translation>预扫</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="74"/>
+        <location filename="../ScanFormWidget.cpp" line="246"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="75"/>
+        <location filename="../ScanFormWidget.cpp" line="247"/>
         <source>Scan</source>
         <translation>扫描</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="95"/>
+        <location filename="../ScanFormWidget.cpp" line="249"/>
         <source>Preview Parameters</source>
         <translation>预览参数</translation>
     </message>
@@ -626,6 +670,7 @@ parameters
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="107"/>
+        <location filename="../ScanFormWidget.cpp" line="250"/>
         <source>Scan Parameters</source>
         <translation>扫描参数</translation>
     </message>
@@ -634,6 +679,7 @@ parameters
     <name>SelectFormWidget</name>
     <message>
         <location filename="../SelectFormWidget.cpp" line="59"/>
+        <location filename="../SelectFormWidget.cpp" line="268"/>
         <source>Account</source>
         <translation>账户</translation>
     </message>
@@ -644,44 +690,58 @@ parameters
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="71"/>
+        <location filename="../SelectFormWidget.cpp" line="270"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="72"/>
+        <location filename="../SelectFormWidget.cpp" line="271"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="73"/>
+        <location filename="../SelectFormWidget.cpp" line="272"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="74"/>
+        <location filename="../SelectFormWidget.cpp" line="273"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="94"/>
+        <location filename="../SelectFormWidget.cpp" line="262"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="95"/>
+        <location filename="../SelectFormWidget.cpp" line="263"/>
         <source>Birth Date</source>
         <translation>出生日期</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="96"/>
+        <location filename="../SelectFormWidget.cpp" line="264"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="97"/>
+        <location filename="../SelectFormWidget.cpp" line="265"/>
         <source>Add Date</source>
         <translation>添加日期</translation>
     </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="98"/>
+        <location filename="../SelectFormWidget.cpp" line="266"/>
+        <source>Comment</source>
+        <translation>备注</translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -708,88 +768,188 @@ parameters
     <name>UserOperationLogForm</name>
     <message>
         <location filename="../UserOperationLogForm.cpp" line="32"/>
+        <location filename="../UserOperationLogForm.cpp" line="65"/>
         <source>Log Date:</source>
         <translation>日志时间</translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="287"/>
+        <source>Dialog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>DICOM Setting</source>
+        <translation type="vanished">DICOM 设置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="288"/>
+        <source>DICOM Settings</source>
+        <translation>DICOM 配置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="289"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="297"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="302"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="290"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="294"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="299"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="292"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="295"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="300"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="291"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="296"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="301"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="293"/>
+        <source>Worklist</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="298"/>
+        <source>PACS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="303"/>
+        <source>3D Recon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="16"/>
+        <source>Apply</source>
+        <translation>应用</translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="17"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="386"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="453"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="454"/>
         <source>Network Settings</source>
         <translation>网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="397"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="464"/>
         <source>Address</source>
         <translation>IP配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="388"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="455"/>
         <location filename="../network/networkcfgdialog.cpp" line="33"/>
         <source>IP Address</source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
         <source>Network Setting</source>
-        <translation>网络配置</translation>
+        <translation type="vanished">网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>
         <source>Dynamic Address</source>
-        <translation>动态地址</translation>
+        <translation type="vanished">动态地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="390"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
         <source>Dev</source>
         <translation>设备</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="392"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="459"/>
         <source>Subnet Mask</source>
         <translation>子网掩码</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="393"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="460"/>
         <source>Additional Address</source>
         <translation>额外地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="394"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="461"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="468"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="395"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="462"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="469"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="396"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="403"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="463"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="404"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
         <source>Routing</source>
         <translation>路由配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="399"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="466"/>
         <source>Default IPv4 Gateway</source>
         <translation>默认网关</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="400"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="456"/>
+        <source>DHCP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="467"/>
         <source>Routing Table</source>
         <translation>路由表</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="405"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="474"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="475"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
+        <source>DICOM</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
         <source>Result</source>
         <translation>结果</translation>
     </message>
@@ -823,90 +983,58 @@ parameters
 <context>
     <name>systemSettingForm</name>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="323"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="147"/>
         <source>Form</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="324"/>
         <source>Network Setting</source>
-        <translation>网络配置</translation>
+        <translation type="vanished">网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="325"/>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="327"/>
-        <source>PushButton</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="326"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="149"/>
         <source>Protocal</source>
         <translation>扫描协议</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="328"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="152"/>
         <source>Worklist Filter</source>
         <translation>Worklist过滤器</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="329"/>
+        <source>...</source>
+        <translation type="vanished">DICOM</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="148"/>
         <source>Auto Verify</source>
         <translation>自动验证</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="330"/>
         <source>Configure</source>
-        <translation>配置</translation>
+        <translation type="vanished">配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="331"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="153"/>
         <source>IP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="332"/>
         <source>Name</source>
-        <translation>姓名</translation>
+        <translation type="vanished">姓名</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="333"/>
-        <source>AE</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="334"/>
-        <source>PACS</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="335"/>
-        <source>3D Recon</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="336"/>
-        <source>Worklist</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="337"/>
-        <source>DAQ</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="338"/>
-        <source>Port</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="339"/>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation type="vanished">取消</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="340"/>
         <source>Accept</source>
-        <translation>接受</translation>
+        <translation type="vanished">接受</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="151"/>
+        <source>DICOM</source>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak
index 40418aa..43df1f9 100644
--- a/src/translations/zh_CN.ts.bak
+++ b/src/translations/zh_CN.ts.bak
@@ -127,18 +127,44 @@
 </context>
 <context>
     <name>AccountTableForm</name>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="36"/>
+        <source>ID</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="37"/>
+        <location filename="../AccountTableForm.cpp" line="128"/>
+        <source>Name</source>
+        <translation>姓名</translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="38"/>
+        <location filename="../AccountTableForm.cpp" line="129"/>
+        <source>Role</source>
+        <translation>角色</translation>
+    </message>
+    <message>
+        <location filename="../AccountTableForm.cpp" line="39"/>
+        <location filename="../AccountTableForm.cpp" line="130"/>
+        <source>Comment</source>
+        <translation>备注</translation>
+    </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="63"/>
+        <location filename="../AccountTableForm.cpp" line="132"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="64"/>
+        <location filename="../AccountTableForm.cpp" line="133"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="../AccountTableForm.cpp" line="65"/>
+        <location filename="../AccountTableForm.cpp" line="134"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
@@ -156,34 +182,32 @@
 <context>
     <name>AdminSettingForm</name>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>Account</source>
-        <translation>账户</translation>
+        <translation>用户</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
         <source>System</source>
         <translation>系统</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <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>
+        <translation type="vanished">日志</translation>
     </message>
     <message>
         <source>Account Manage</source>
@@ -202,10 +226,10 @@
         <translation type="vanished">操作日志</translation>
     </message>
     <message>
-        <location filename="../AdminSettingForm.cpp" line="30"/>
+        <location filename="../AdminSettingForm.cpp" line="31"/>
         <location filename="../AdminSettingForm.cpp" line="69"/>
         <location filename="../AdminSettingForm.cpp" line="77"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="83"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
@@ -276,7 +300,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="135"/>
         <source>ID</source>
-        <translation>编号</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="136"/>
@@ -295,27 +319,30 @@
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="137"/>
-        <location filename="../editpatientform.cpp" line="14"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="19"/>
+        <location filename="../editpatientform.cpp" line="21"/>
+        <location filename="../editpatientform.cpp" line="75"/>
         <source>Female</source>
-        <translation>女性</translation>
+        <translation>女</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="20"/>
+        <location filename="../editpatientform.cpp" line="22"/>
+        <location filename="../editpatientform.cpp" line="76"/>
         <source>Male</source>
-        <translation>男性</translation>
+        <translation>男</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="44"/>
+        <location filename="../editpatientform.cpp" line="46"/>
+        <location filename="../editpatientform.cpp" line="77"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../editpatientform.cpp" line="45"/>
+        <location filename="../editpatientform.cpp" line="47"/>
+        <location filename="../editpatientform.cpp" line="78"/>
         <source>Accept</source>
         <translation>接受</translation>
     </message>
@@ -350,7 +377,7 @@
     <name>GeneralForm</name>
     <message>
         <location filename="../generalform.cpp" line="25"/>
-        <location filename="../generalform.cpp" line="108"/>
+        <location filename="../generalform.cpp" line="111"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
@@ -361,17 +388,26 @@
     </message>
     <message>
         <location filename="../generalform.cpp" line="42"/>
-        <location filename="../generalform.cpp" line="109"/>
-        <location filename="../generalform.cpp" line="110"/>
+        <location filename="../generalform.cpp" line="112"/>
+        <location filename="../generalform.cpp" line="113"/>
         <source>Institution Addr</source>
         <translation>机构地址</translation>
     </message>
     <message>
         <location filename="../generalform.cpp" line="53"/>
-        <location filename="../generalform.cpp" line="111"/>
-        <source>Lock Screen Timeout</source>
+        <location filename="../generalform.cpp" line="114"/>
+        <source>Lock Screen</source>
         <translation>锁屏时间</translation>
     </message>
+    <message>
+        <source>Lock Screen Timeout</source>
+        <translation type="vanished">锁屏时间</translation>
+    </message>
+    <message>
+        <location filename="../generalform.cpp" line="60"/>
+        <source>s</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>GetAdminPsw</name>
@@ -538,7 +574,7 @@
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="123"/>
         <source>Female</source>
-        <translation>女性</translation>
+        <translation>女</translation>
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="124"/>
@@ -577,41 +613,49 @@
     <name>ScanFormWidget</name>
     <message>
         <location filename="../ScanFormWidget.cpp" line="42"/>
+        <location filename="../ScanFormWidget.cpp" line="248"/>
         <source>Protocol</source>
         <translation>扫描协议</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="52"/>
+        <location filename="../ScanFormWidget.cpp" line="242"/>
         <source>LEFT</source>
         <translation>左侧</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="53"/>
+        <location filename="../ScanFormWidget.cpp" line="243"/>
         <source>RIGHT</source>
         <translation>右侧</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="72"/>
+        <location filename="../ScanFormWidget.cpp" line="244"/>
         <source>Refresh</source>
         <translation>空扫</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="73"/>
+        <location filename="../ScanFormWidget.cpp" line="245"/>
         <source>Preview</source>
         <translation>预扫</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="74"/>
+        <location filename="../ScanFormWidget.cpp" line="246"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="75"/>
+        <location filename="../ScanFormWidget.cpp" line="247"/>
         <source>Scan</source>
         <translation>扫描</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="95"/>
+        <location filename="../ScanFormWidget.cpp" line="249"/>
         <source>Preview Parameters</source>
         <translation>预览参数</translation>
     </message>
@@ -626,6 +670,7 @@ parameters
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="107"/>
+        <location filename="../ScanFormWidget.cpp" line="250"/>
         <source>Scan Parameters</source>
         <translation>扫描参数</translation>
     </message>
@@ -634,6 +679,7 @@ parameters
     <name>SelectFormWidget</name>
     <message>
         <location filename="../SelectFormWidget.cpp" line="59"/>
+        <location filename="../SelectFormWidget.cpp" line="268"/>
         <source>Account</source>
         <translation>账户</translation>
     </message>
@@ -644,44 +690,58 @@ parameters
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="71"/>
+        <location filename="../SelectFormWidget.cpp" line="270"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="72"/>
+        <location filename="../SelectFormWidget.cpp" line="271"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="73"/>
+        <location filename="../SelectFormWidget.cpp" line="272"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="74"/>
+        <location filename="../SelectFormWidget.cpp" line="273"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="94"/>
+        <location filename="../SelectFormWidget.cpp" line="262"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="95"/>
+        <location filename="../SelectFormWidget.cpp" line="263"/>
         <source>Birth Date</source>
         <translation>出生日期</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="96"/>
+        <location filename="../SelectFormWidget.cpp" line="264"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
         <location filename="../SelectFormWidget.cpp" line="97"/>
+        <location filename="../SelectFormWidget.cpp" line="265"/>
         <source>Add Date</source>
         <translation>添加日期</translation>
     </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="98"/>
+        <location filename="../SelectFormWidget.cpp" line="266"/>
+        <source>Comment</source>
+        <translation>备注</translation>
+    </message>
 </context>
 <context>
     <name>TabFormWidget</name>
@@ -708,88 +768,188 @@ parameters
     <name>UserOperationLogForm</name>
     <message>
         <location filename="../UserOperationLogForm.cpp" line="32"/>
+        <location filename="../UserOperationLogForm.cpp" line="65"/>
         <source>Log Date:</source>
         <translation>日志时间</translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="287"/>
+        <source>Dialog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>DICOM Setting</source>
+        <translation type="vanished">DICOM 设置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="288"/>
+        <source>DICOM Settings</source>
+        <translation>DICOM 配置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="289"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="297"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="302"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="290"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="294"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="299"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="292"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="295"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="300"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="291"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="296"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="301"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="293"/>
+        <source>Worklist</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="298"/>
+        <source>PACS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="303"/>
+        <source>3D Recon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="16"/>
+        <source>Apply</source>
+        <translation>应用</translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="17"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="386"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="453"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="454"/>
         <source>Network Settings</source>
         <translation>网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="397"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="464"/>
         <source>Address</source>
         <translation>IP配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="388"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="455"/>
         <location filename="../network/networkcfgdialog.cpp" line="33"/>
         <source>IP Address</source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
         <source>Network Setting</source>
-        <translation>网络配置</translation>
+        <translation type="vanished">网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>
         <source>Dynamic Address</source>
-        <translation>动态地址</translation>
+        <translation type="vanished">动态地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="390"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
         <source>Dev</source>
         <translation>设备</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="392"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="459"/>
         <source>Subnet Mask</source>
         <translation>子网掩码</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="393"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="460"/>
         <source>Additional Address</source>
         <translation>额外地址</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="394"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="461"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="468"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="395"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="462"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="469"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="396"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="403"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="463"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="404"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
         <source>Routing</source>
         <translation>路由配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="399"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="466"/>
         <source>Default IPv4 Gateway</source>
         <translation>默认网关</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="400"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="456"/>
+        <source>DHCP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="467"/>
         <source>Routing Table</source>
         <translation>路由表</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="405"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="474"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="475"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
+        <source>DICOM</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
         <source>Result</source>
         <translation>结果</translation>
     </message>
@@ -823,90 +983,58 @@ parameters
 <context>
     <name>systemSettingForm</name>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="323"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="147"/>
         <source>Form</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="324"/>
         <source>Network Setting</source>
-        <translation>网络配置</translation>
+        <translation type="vanished">网络配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="325"/>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="327"/>
-        <source>PushButton</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="326"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="149"/>
         <source>Protocal</source>
         <translation>扫描协议</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="328"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="152"/>
         <source>Worklist Filter</source>
         <translation>Worklist过滤器</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="329"/>
+        <source>...</source>
+        <translation type="vanished">DICOM</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="148"/>
         <source>Auto Verify</source>
         <translation>自动验证</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="330"/>
         <source>Configure</source>
-        <translation>配置</translation>
+        <translation type="vanished">配置</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="331"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="153"/>
         <source>IP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="332"/>
         <source>Name</source>
-        <translation>姓名</translation>
+        <translation type="vanished">姓名</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="333"/>
-        <source>AE</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="334"/>
-        <source>PACS</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="335"/>
-        <source>3D Recon</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="336"/>
-        <source>Worklist</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="337"/>
-        <source>DAQ</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="338"/>
-        <source>Port</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="339"/>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation type="vanished">取消</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="340"/>
         <source>Accept</source>
-        <translation>接受</translation>
+        <translation type="vanished">接受</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="151"/>
+        <source>DICOM</source>
+        <translation></translation>
     </message>
 </context>
 </TS>