translation improvement 3

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"

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();
@@ -206,7 +214,7 @@ 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;

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

src/dicomcfgdialog.ui

@@ -0,0 +1,228 @@
+<?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>626</width>
+    <height>510</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="title">
+        <property name="text">
+         <string>DICOM Setting</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="0" column="0">
+           <widget class="QLabel" name="lbl_Name">
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="wl_AE"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_IP">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="wl_IP"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="lbl_Port">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="wl_Port"/>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="wl_Name"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="lbl_AE">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_pacs">
+         <attribute name="title">
+          <string>PACS</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="0" column="0">
+           <widget class="QLabel" name="lbl_Name_2">
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="pacs_Name"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="lbl_AE_2">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="pacs_AE"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="lbl_IP_2">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="pacs_IP"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="lbl_Port_2">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="pacs_Port"/>
+          </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="0" column="1">
+           <widget class="QLineEdit" name="recon_Name"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="lbl_AE_3">
+            <property name="text">
+             <string>AE</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="recon_AE"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="lbl_IP_3">
+            <property name="text">
+             <string>IP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="recon_IP"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_Port_3">
+            <property name="text">
+             <string>Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="recon_Port"/>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lbl_Name_3">
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </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>

src/json/jsonobject.cpp

@@ -281,8 +281,8 @@ host JsonObject::getServer(ServerType type)
 	case JsonObject::PACS:
 		typeName = "pacs";
 		break;
-	case JsonObject::DAQ:
+	case JsonObject::LOCAL:
-		typeName = "daq";
+		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:
+	case JsonObject::LOCAL:
-		typeName = "daq";
+		typeName = "address";
 		break;
 	case JsonObject::RECON:
 		typeName = "recon";

src/json/jsonobject.h

@@ -38,7 +38,7 @@ public:
 	}
 	enum ServerType
 	{
-		WORKLIST, PACS, DAQ, RECON
+		WORKLIST, PACS, LOCAL, RECON
 	};
 
 	//for login

src/network/dicomcfgdialog.cpp

@@ -0,0 +1,94 @@
+#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->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);
+
+
+
+
+
+}

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

src/network/networkcfgdialog.cpp

@@ -191,9 +191,39 @@ void networkCfgDialog::loadData()
 	model_addr->loadData(NetworkManager::getIpAddrList());
 	model_route->loadData(NetworkManager::getIpRouteList());
 
+	loadJsonData();
 }
 
-bool networkCfgDialog::isModified()
+bool networkCfgDialog::isJsonModified()
+{
+	const host& h = NetworkManager::getLocalHost();
+	if (ui->daq_AE->text() != h.ae) return true;
+	if (ui->daq_Name->text() != h.name) return true;
+	if (ui->daq_Port->text() != h.port)return true;
+	return false;
+}
+
+void networkCfgDialog::loadJsonData()
+{
+
+	const host& h = NetworkManager::getLocalHost();
+	ui->daq_AE->setText(h.ae);
+	ui->daq_IP->setText(h.ip);
+	ui->daq_Name->setText(h.name);
+	ui->daq_Port->setText(h.port);
+}
+
+void networkCfgDialog::saveJsonData()
+{
+	host 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();
+	NetworkManager::setLocalHost(h);
+}
+
+bool networkCfgDialog::isNetModified()
 {
 	if (ui->sw_dhcp->getChecked() != NetworkManager::isDHCP()) return true;
 
@@ -201,11 +231,14 @@ bool networkCfgDialog::isModified()
 	if (ui->addr_ip->text() != default_addr.ip) return true;
 	if (ui->addr_mask->text() != default_addr.mask) return true;
 	if (ui->led_gw->text() != NetworkManager::getDefaultGateway())return true;
+
 	if (model_addr->getData() != NetworkManager::getIpAddrList())return true;
 	if (model_route->getData() != NetworkManager::getIpRouteList()) return true;
 	return false;
 }
 
+
+
 void networkCfgDialog::afterThreadStart()
 {
 	msgDialog->showMessage("Saving Network Configuration...");
@@ -213,7 +246,6 @@ void networkCfgDialog::afterThreadStart()
 }
 void networkCfgDialog::beforeThreadExit()
 {
-
 	msgDialog->hide();
 	ui->output->setPlainText(err);
 	myThread->deleteLater();
@@ -221,9 +253,12 @@ void networkCfgDialog::beforeThreadExit()
 
 void networkCfgDialog::applyData()
 {
-
+	if (isJsonModified())
+	{
+		saveJsonData();
+	}
 	//if it is the same as the old, just exit
-	if (!isModified())
+	if (!isNetModified())
 	{
 		accept();
 		return;

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";

src/networkcfgdialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>819</width>
-    <height>662</height>
+    <height>680</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -67,7 +67,7 @@ QLineEdit#led_inface{font-size:15px;border: 0px;}</string>
          <bool>true</bool>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>2</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="title">
@@ -103,7 +103,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 +432,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>

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>

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->btn_dicom->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 
-	ui->btnCancel->setIcon(QIcon(":/icons/close_circle.png"));
+	ui->btn_dicom->setIcon(QIcon(":/icons/dicomsettings.png"));
-	ui->btnCancel->setIconSize(QSize(50, 50));
+	//ui->btn_dicom->setText(tr("DICOM"));
-	ui->btnAccept->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	ui->btn_dicom->setIconSize(QSize(80, 80));
-	ui->btnAccept->setIcon(QIcon(":/icons/selected.png"));
+
-	ui->btnAccept->setIconSize(QSize(50, 50));
+	//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);
-
-	ui->btnFlt->setFixedWidth(200);
-	ui->btnPro->setFixedWidth(200);
-	ui->lbl_protocal->setFixedWidth(100);
-	//lbl_filter
-	ui->lbl_list->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->btn_dicom, &QToolButton::clicked, [=]() {
-		});
+		dicomCfgDialog dia(this);
-	connect(ui->btnAccept, &QToolButton::clicked, [=]() {
+		dia.setWindowModality(Qt::WindowModal);
-		saveServersInfo();
+		dia.exec();
 		});
+
+
+
 	connect(ui->btnPro, &QPushButton::clicked, [=]() {
 		if (!sd_protocal) {
 			sd_protocal = new SelectDialog(this);
@@ -116,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)
 //{

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

src/systemsettingform.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>619</width>
+    <width>515</width>
     <height>612</height>
    </rect>
   </property>
@@ -20,49 +20,6 @@
       <item>
        <widget class="QWidget" name="block10" native="true">
         <layout class="QGridLayout" name="gridLayout_2">
-         <item row="2" column="1">
-          <spacer name="horizontalSpacer_2">
-           <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="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">
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_protocal">
-           <property name="text">
-            <string>Protocal</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="1">
           <spacer name="horizontalSpacer_7">
            <property name="orientation">
@@ -79,8 +36,15 @@
            </property>
           </spacer>
          </item>
-         <item row="0" column="2">
+         <item row="1" column="0">
-          <widget class="QPushButton" name="btnPro">
+          <widget class="QLabel" name="lbl_filter">
+           <property name="text">
+            <string>Worklist Filter</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2">
+          <widget class="QPushButton" name="btnFlt">
            <property name="minimumSize">
             <size>
              <width>100</width>
@@ -92,10 +56,16 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
+         <item row="0" column="2">
-          <widget class="QLabel" name="lbl_filter">
+          <widget class="QPushButton" name="btnPro">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
-            <string>Worklist Filter</string>
+            <string/>
            </property>
           </widget>
          </item>
@@ -115,8 +85,12 @@
            </property>
           </spacer>
          </item>
-         <item row="2" column="2">
+         <item row="0" column="0">
-          <widget class="ImageSwitch" name="swt_verify" native="true"/>
+          <widget class="QLabel" name="lbl_protocal">
+           <property name="text">
+            <string>Protocal</string>
+           </property>
+          </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="lbl_verify">
@@ -131,21 +105,24 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="2">
+         <item row="2" column="2">
-          <widget class="QPushButton" name="btn_network">
+          <widget class="ImageSwitch" name="swt_verify" native="true">
-           <property name="text">
+           <property name="minimumSize">
-            <string/>
+            <size>
+             <width>25</width>
+             <height>25</height>
+            </size>
            </property>
           </widget>
          </item>
-        </layout>
+         <item row="2" column="1">
-       </widget>
+          <spacer name="horizontalSpacer">
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_6">
            <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>
@@ -157,6 +134,51 @@
         </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>DICOM</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QToolButton" name="btn_network">
+           <property name="text">
+            <string>IP</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QWidget" name="block2" native="true">
      <layout class="QGridLayout" name="gridLayout">
@@ -166,27 +188,12 @@
       <property name="verticalSpacing">
        <number>10</number>
       </property>
-      <item row="5" column="2">
+      <item row="2" column="4">
-       <widget class="QLineEdit" name="recon_AE"/>
+       <widget class="QLineEdit" name="daq_Port"/>
       </item>
-      <item row="4" column="2">
+      <item row="2" 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">
@@ -194,14 +201,15 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="2" column="3">
-       <widget class="QLineEdit" name="wl_Name"/>
+       <widget class="QLineEdit" name="daq_IP"/>
       </item>
-      <item row="3" column="1">
+      <item row="2" column="0">
-       <widget class="QLineEdit" name="pacs_Name"/>
+       <widget class="QLabel" name="lbl_DAQ">
-      </item>
+        <property name="text">
-      <item row="2" column="2">
+         <string>DAQ</string>
-       <widget class="QLineEdit" name="wl_AE"/>
+        </property>
+       </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="lbl_Name">
@@ -217,54 +225,8 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
+      <item row="2" column="1">
-       <widget class="QLineEdit" name="pacs_AE"/>
+       <widget class="QLineEdit" name="daq_Name"/>
-      </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">
@@ -273,43 +235,12 @@
         </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">
+     <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>
    <item>
@@ -332,6 +263,7 @@
    <class>ImageSwitch</class>
    <extends>QWidget</extends>
    <header location="global">components/imageswitch.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

src/translations/en_US.ts

@@ -554,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>DICOM Setting</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>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
@@ -564,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>
@@ -636,6 +679,30 @@ parameters
         <source>Network Setting</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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>
 <context>
     <name>systemSettingForm</name>
@@ -643,10 +710,6 @@ parameters
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Network Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Protocal</source>
         <translation type="unfinished"></translation>
@@ -671,18 +734,6 @@ parameters
         <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>
@@ -692,11 +743,7 @@ parameters
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>DICOM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

src/translations/en_US.ts.bak

@@ -554,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>DICOM Setting</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>
+</context>
 <context>
     <name>networkCfgDialog</name>
     <message>
@@ -564,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>
@@ -636,6 +679,30 @@ parameters
         <source>Network Setting</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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>
 <context>
     <name>systemSettingForm</name>
@@ -643,10 +710,6 @@ parameters
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Network Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Protocal</source>
         <translation type="unfinished"></translation>
@@ -671,18 +734,6 @@ parameters
         <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>
@@ -692,11 +743,7 @@ parameters
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>DICOM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

src/translations/zh_CN.ts

@@ -773,84 +773,179 @@ parameters
         <translation>日志时间</translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="246"/>
+        <source>Dialog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="247"/>
+        <source>DICOM Setting</source>
+        <translation>DICOM 设置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="248"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="253"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="261"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="249"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="255"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="259"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="250"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="256"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="260"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="251"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="254"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="258"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="252"/>
+        <source>Worklist</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="257"/>
+        <source>PACS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="262"/>
+        <source>3D Recon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="15"/>
+        <source>Apply</source>
+        <translation>应用</translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="16"/>
+        <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="456"/>
         <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="467"/>
         <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="458"/>
         <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"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
         <source>Network Setting</source>
         <translation>网络配置</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="460"/>
         <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="462"/>
         <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="463"/>
         <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="464"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
         <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="465"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
         <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="466"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="403"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
         <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="474"/>
         <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="469"/>
         <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="459"/>
+        <source>DHCP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
         <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="475"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="478"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="479"/>
+        <source>DICOM</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="480"/>
         <source>Result</source>
         <translation>结果</translation>
     </message>
@@ -884,27 +979,30 @@ 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="227"/>
         <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="326"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="231"/>
         <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="228"/>
         <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="232"/>
         <source>Auto Verify</source>
         <translation>自动验证</translation>
     </message>
@@ -913,54 +1011,43 @@ parameters
         <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="234"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="235"/>
         <source>IP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="332"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="237"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="333"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="238"/>
         <source>AE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="334"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="236"/>
-        <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"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="239"/>
         <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="233"/>
+        <source>DICOM</source>
+        <translation></translation>
     </message>
 </context>
 </TS>

src/translations/zh_CN.ts.bak

@@ -773,84 +773,179 @@ parameters
         <translation>日志时间</translation>
     </message>
 </context>
+<context>
+    <name>dicomCfgDialog</name>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="246"/>
+        <source>Dialog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="247"/>
+        <source>DICOM Setting</source>
+        <translation>DICOM 设置</translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="248"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="253"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="261"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="249"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="255"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="259"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="250"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="256"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="260"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="251"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="254"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="258"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="252"/>
+        <source>Worklist</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="257"/>
+        <source>PACS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="262"/>
+        <source>3D Recon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="15"/>
+        <source>Apply</source>
+        <translation>应用</translation>
+    </message>
+    <message>
+        <location filename="../network/dicomcfgdialog.cpp" line="16"/>
+        <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="456"/>
         <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="467"/>
         <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="458"/>
         <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"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
         <source>Network Setting</source>
         <translation>网络配置</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="460"/>
         <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="462"/>
         <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="463"/>
         <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="464"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
         <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="465"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
         <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="466"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="403"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
         <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="474"/>
         <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="469"/>
         <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="459"/>
+        <source>DHCP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
         <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="475"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
+        <source>Port</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
+        <source>AE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="478"/>
+        <source>IP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="479"/>
+        <source>DICOM</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="480"/>
         <source>Result</source>
         <translation>结果</translation>
     </message>
@@ -884,27 +979,30 @@ 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="227"/>
         <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="326"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="231"/>
         <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="228"/>
         <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="232"/>
         <source>Auto Verify</source>
         <translation>自动验证</translation>
     </message>
@@ -913,54 +1011,43 @@ parameters
         <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="234"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="235"/>
         <source>IP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="332"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="237"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="333"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="238"/>
         <source>AE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="334"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="236"/>
-        <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"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="239"/>
         <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="233"/>
+        <source>DICOM</source>
+        <translation></translation>
     </message>
 </context>
 </TS>