Change SelectFormWidget layout and active logic.

src/forms/select/PatientDetailForm.cpp

@@ -6,102 +6,113 @@
 #include <QButtonGroup>
 #include <QDateTime>
 #include <qboxlayout.h>
+#include <QFormLayout>
 #include <qdebug.h>
 #include <qwidget.h>
 
 #include "event/EventCenter.h"
 
 PatientDetailForm::PatientDetailForm(QWidget* parent) :
-QWidget(parent),
-mUI(new Ui::PatientDetailForm)
-, mBtnEdit(new QToolButton())
-, mBtnDelete(new QToolButton())
-, mBtnPlaceWidget(new QWidget(this))
-, mLblMessage(new QLabel(this))
+QWidget(parent)
+, mLblPatInfTitle(new QLabel(this))
+, mLblDOB(new QLabel(this))
+, mLblName(new QLabel(this))
+, mLblPatID(new QLabel(this))
+, mLblSex(new QLabel(this))
+, mLblAccno(new QLabel(this))
+, mLblAddDate(new QLabel(this))
 
 {
-	mUI->setupUi(this);
-    mUI->lblPatInfPanel->setObjectName("PatInfTitle");
-	mUI->lblIcon->setObjectName("PatIcon");
-    mUI->lbl_DOB->setObjectName("displayDetail");
-    mUI->lbl_Name->setObjectName("displayDetail");
-    mUI->lblPatID->setObjectName("displayDetail");
-    mUI->lbl_Sex->setObjectName("displayDetail");
-    mUI->lblAccno->setObjectName("displayDetail");
-    mUI->lblAddDate->setObjectName("displayDetail");
-    connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this,&PatientDetailForm::reloadLanguage);
-    mBtnPlaceWidget->setFixedHeight(120);
-    mUI->verticalLayout_2->setSpacing(50);
+    mLblPatInfTitle->setObjectName("PatInfTitle");
+    mLblDOB->setObjectName("displayDetail");
+    mLblName->setObjectName("displayDetail");
+    mLblPatID->setObjectName("displayDetail");
+    mLblSex->setObjectName("displayDetail");
+    mLblAccno->setObjectName("displayDetail");
+    mLblAddDate->setObjectName("displayDetail");
 
-    mUI->verticalLayout_3->insertWidget(5, mBtnPlaceWidget);
-    mUI->verticalLayout_3->insertWidget(5, mLblMessage);
-    mLblMessage->setVisible(false);
-    QHBoxLayout * layout = new QHBoxLayout(mBtnPlaceWidget);
-    mBtnEdit->setObjectName("btnPatEdit");
-    mBtnDelete->setObjectName("btnPatDelete");
-    mBtnEdit->setText(tr("Edit"));
-    mBtnDelete->setText(tr("Delete"));
-    layout->addWidget(mBtnEdit);
-    layout->addWidget(mBtnDelete);
-    connect(mBtnEdit, &QToolButton::clicked, [=](){
-        emit editClicked();
-    });
-    connect(mBtnDelete, &QToolButton::clicked, [=](){
-        emit deleteClicked();
-    });
-    setBtnEnable(false);
+    auto layout = new QVBoxLayout(this);
+    // mLblPatInfTitle->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    mLblPatInfTitle->setAlignment(Qt::AlignCenter);
+    layout->addWidget(mLblPatInfTitle);
+    mLblPatInfTitle->setText(tr("Patient Detail"));
+    addDetailLabel(layout,tr("Name")+":", mLblName);
+    addDetailLabel(layout,tr("Gender")+":", mLblSex);
+    addDetailLabel(layout,tr("Birth Date")+":", mLblDOB);
+    addDetailLabel(layout,tr("PatientID")+":", mLblPatID);
+    addDetailLabel(layout,tr("AccNo")+":", mLblAccno);
+
+    auto widgetLayout = new QHBoxLayout;
+    layout->addLayout(widgetLayout);
+
+    mLblAddDateTitle = new QLabel(tr("Add Date")+":",this);
+    mLblAddDateTitle->setObjectName("displayTitle");
+    widgetLayout->addWidget(mLblAddDateTitle);
+    widgetLayout->addWidget(mLblAddDate);
+
+    connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this,&PatientDetailForm::reloadLanguage);
+    layout->addSpacerItem(new QSpacerItem(2,2,QSizePolicy::Expanding, QSizePolicy::Expanding));
+}
+
+void PatientDetailForm::addDetailLabel(QVBoxLayout *layout, const QString& aTitleText, QLabel* aLabel)
+{
+    auto widgetLayout = new QHBoxLayout;
+    layout->addLayout(widgetLayout);
+
+    auto lblTitle = new QLabel(aTitleText,this);
+    mBtnList.append(lblTitle);
+    lblTitle->setObjectName("displayTitle");
+    widgetLayout->addWidget(lblTitle);
+    widgetLayout->addWidget(aLabel);
 }
 
 void PatientDetailForm::reloadLanguage() {
-    mUI->retranslateUi(this);
-    mUI->lbl_Sex->setText(mStore.Sex == "F" ? tr("Female") : (mStore.Sex == "M" ? tr("Male") : tr("Other")));
+    mLblSex->setText(mStore.Sex == "F" ? tr("Female") : (mStore.Sex == "M" ? tr("Male") : tr("Other")));
+    QList<std::string> strArray = {"Name","Gender","Birth Date","PatientID","AccNo"};
+    for (size_t i = 0; i < strArray.length(); i++)
+    {
+        mBtnList[i]->setText(tr(strArray[i].data())+":");
+    }
+    mLblAddDateTitle->setText(tr("Add Date")+":");
+    mLblPatInfTitle->setText(tr("Patient Detail"));
+    
 }
 
 PatientDetailForm::~PatientDetailForm()
 {
-	delete mUI;
+
 }
 
 void PatientDetailForm::setPatientInformation(PatientInformation* information) {
 	if (information)
 	{
-		mUI->lblPatID->setText(tr("PatientID:     ")+information->ID);
-		mUI->lbl_DOB->setText(" "+information->BirthDate);
-		mUI->lbl_Name->setText(" "+information->Name);
-        mUI->lbl_Sex->setText(" "+ (information->Sex == "F" ? tr("Female") : (information->Sex == "M" ? tr("Male") : tr("Other"))));
+		mLblPatID->setText(information->ID);
+		mLblDOB->setText(information->BirthDate);
+		mLblName->setText(information->Name);
+        mLblSex->setText((information->Sex == "F" ? tr("Female") : (information->Sex == "M" ? tr("Male") : tr("Other"))));
         mCurrentPatientUID = information->PatientUID;
-        mUI->lblAddDate->setText(tr("Add Date:     ")+ QDateTime::fromString(information->AddDate, Qt::ISODate).toString("yyyy-MM-dd HH:mm:ss"));
-        mUI->lblAccno->setText(tr("AccNo:          ")+information->AccessionNumber);
+        mLblAddDate->setText(QDateTime::fromString(information->AddDate, Qt::ISODate).toString("yyyy-MM-dd HH:mm:ss"));
+        mLblAccno->setText(information->AccessionNumber);
 
         mStore = *information;
-        setBtnEnable(true);
-
 	}
 }
 
 void PatientDetailForm::clearPatientInformation() {
-    mUI->lblPatID->clear();
-	mUI->lbl_DOB->clear();
-	mUI->lbl_Name->clear();
-    mUI->lbl_Sex->clear();
-	mUI->lblAddDate->clear();
-    mUI->lblAccno->clear();
+    mLblPatID->clear();
+	mLblDOB->clear();
+	mLblName->clear();
+    mLblSex->clear();
+	mLblAddDate->clear();
+    mLblAccno->clear();
 }
 
 void PatientDetailForm::confirmModeOn(int protocol)
 {
-    mBtnPlaceWidget->setVisible(false);
-    mLblMessage->setVisible(true);
 
-    mUI->lblPatInfPanel->setText(tr("Scan with this Patient?"));
-    mUI->lblAddDate->setText(tr("Protocol:       ")+(protocol==0?tr("Left"):tr("Right")));
-
-}
-
-void PatientDetailForm::setBtnEnable(bool enable)
-{
-        mBtnDelete->setEnabled(enable);
-        mBtnEdit->setEnabled(enable);
+    mLblPatInfTitle->setText(tr("Scan with this Patient?"));
+    mLblAddDate->setText((protocol==0?tr("Left"):tr("Right")));
+    mLblAddDateTitle->setText(tr("Protocol"));
 }
 
 void PatientDetailForm::storePatientInformation() {

src/forms/select/PatientDetailForm.h

@@ -1,26 +1,26 @@
 #ifndef EDITPATIENTFORM_H
 #define EDITPATIENTFORM_H
-namespace Ui {
-class PatientDetailForm;
-}
+
 #include <QWidget>
 #include "PatientInformation.h"
 class QToolButton;
 class QLabel;
+class QVBoxLayout;
 
 class PatientDetailForm : public QWidget
 {
     Q_OBJECT
 public:
     explicit PatientDetailForm(QWidget *parent = nullptr);
+    void addDetailLabel(QVBoxLayout *layout, const QString& aTitleText, QLabel* aLabel);
     ~PatientDetailForm();
-    void setPatientInformation(PatientInformation * information);
-    PatientInformation * getPatientInformation(){
+    void setPatientInformation(PatientInformation *information);
+    PatientInformation *getPatientInformation()
+    {
         return &mStore;
     }
-    void clearPatientInformation();
     void confirmModeOn(int protocol);
-    void setBtnEnable(bool enable);
+    void clearPatientInformation();
 signals:
     void hideBtnClicked();
     void editClicked();
@@ -29,14 +29,18 @@ signals:
 private:
     void storePatientInformation();
     void reloadLanguage();
-    Ui::PatientDetailForm *mUI;
     QString mCurrentPatientUID;
     QString mAddDate;
     PatientInformation mStore;
-    QWidget * mBtnPlaceWidget;
-    QToolButton *mBtnEdit;
-    QToolButton *mBtnDelete;
-    QLabel* mLblMessage;
+    QLabel* mLblPatInfTitle;
+    QLabel* mLblDOB;
+    QLabel* mLblName;
+    QLabel* mLblPatID;
+    QLabel* mLblSex;
+    QLabel* mLblAccno;
+    QLabel* mLblAddDate;
+    QLabel* mLblAddDateTitle;
+    QList<QLabel*> mBtnList;
 };
 
 #endif // EDITPATIENTFORM_H

src/forms/select/PatientDetailForm.ui

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PatientDetailForm</class>
- <widget class="QWidget" name="PatientDetailForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>466</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="lblPatInfPanel">
-        <property name="text">
-         <string>Patient Information</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_4">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="lblIcon">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>111</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QFrame" name="frame_2">
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QVBoxLayout" name="PatinfLayout">
-            <item>
-             <widget class="QLabel" name="lbl_Name">
-              <property name="text">
-               <string>Name</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="lbl_Sex">
-              <property name="text">
-               <string>Gender</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="lbl_DOB">
-              <property name="text">
-               <string>Date Of Birth</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>200</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="spacing">
-          <number>30</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>10</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="lblPatID">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="lblAccno">
-           <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="lblAddDate">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/forms/select/SelectFormWidget.cpp

@@ -9,6 +9,8 @@
 #include <QScroller>
 #include <QHeaderView>
 #include <QUuid>
+#include <QLabel>
+
 #include <QDate>
 #include <QSqlRecord>
 #include <QDebug>
@@ -25,11 +27,10 @@
 
 SelectFormWidget::SelectFormWidget(QWidget* parent)
 : TabFormWidget(parent)
-, mBtnAccount(new QToolButton(this))
-, mBtnWorklist(new QToolButton(this))
+, mBtnEdit(new QToolButton())
+, mBtnDelete(new QToolButton())
 , mBtnAdd(new QToolButton(this))
 , mBtnSelect(new QToolButton(this))
-, mBtnTurnOff(new QToolButton(this))
 , mPatTable(new SlideTableView(this))
 , mModel(nullptr)
 , patientDetailForm(new PatientDetailForm(this))
@@ -41,18 +42,25 @@ SelectFormWidget::SelectFormWidget(QWidget* parent)
 	//init command bar
     auto layout = new QHBoxLayout();
 	ui->commandWidget->setLayout(layout);
-    initGeneralButtons(layout);
 
     layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
-    addVerticalLine(layout);
     initPatEditButtons(layout);
     initDataModel();
     //Init content widget
-	auto* contentLayout = new QHBoxLayout(this->ui->contentWidget);
+    auto contantContanerLayout =  new QVBoxLayout(this->ui->contentWidget);
+    contantContanerLayout->setMargin(0);
+    auto selectTabTitle = new QLabel(tr("Patient Information Manage"));
+    selectTabTitle->setObjectName("selectTabTitle");
+    contantContanerLayout->addWidget(selectTabTitle);
+	auto contentLayout = new QHBoxLayout;
+    contantContanerLayout->addLayout(contentLayout);
 	contentLayout->setContentsMargins(0, 0, 0, 0);
     initDetailPanel(contentLayout);
     addVerticalLine(contentLayout);
-    initTableView(contentLayout);
+    auto gridBox = new QVBoxLayout;
+    contentLayout->addLayout(gridBox);
+    initTableView(gridBox);
+    gridBox->addWidget(ui->commandWidget);
     //select default row 0
 	if (mModel->rowCount() > 0)
 	{
@@ -84,56 +92,43 @@ void SelectFormWidget::prepareButtons(bool disableALL) {
     bool stateFlag = (mPatTable->currentIndex().row() >= 0);
 
     mBtnAdd->setEnabled(!anonymousMode && !disableALL);
-    mBtnWorklist->setEnabled(!anonymousMode  && !disableALL);
-    patientDetailForm->setBtnEnable(!anonymousMode && stateFlag && !disableALL);
     // if (mBtnAdd)mBtnEdit->setEnabled(!anonymousMode && stateFlag && !disableALL);
     // if (mBtnAdd)mBtnDelete->setEnabled(!anonymousMode&& stateFlag && !disableALL);
     mBtnSelect->setEnabled(stateFlag && !disableALL);
 }
 
-void SelectFormWidget::initGeneralButtons(QHBoxLayout *layout) {
-    mBtnAccount->setObjectName("btnAccount");
-    mBtnAccount->setText(tr("Account"));
-    layout->addWidget(mBtnAccount);
-    mBtnTurnOff->setObjectName("btnShutDown");
-    mBtnTurnOff->setText(tr("ShutDown"));
-    layout->addWidget(mBtnTurnOff);
-    // mBtn account slot
-    connect(mBtnAccount, &QToolButton::clicked, DialogManager::Default(),&DialogManager::requestEditSelfAccount);
-    connect(mBtnTurnOff, &QToolButton::clicked, []()
-    {
-        if(DialogManager::Default()->requestAlertMessage(QString(tr("Shut down now ?")), DialogButtonMode::OkAndCancel,tr("Shut Down")) == QDialog::Accepted)
-        {
-            LOG_USER_OPERATION("Shut Down")
-            EventCenter::Default()->triggerEvent(GUIEvents::RequestShutdown, nullptr, nullptr);
-        }
-    });
-    connect(mBtnWorklist, &QToolButton::clicked, [&]()
-        {
-            DialogManager::Default()->requestGetWorkList();
-        });
-}
-
 void SelectFormWidget::initPatEditButtons(QHBoxLayout *layout) {
     mBtnAdd->setObjectName("btnAdd");
-    mBtnWorklist->setObjectName("btnWorklist");
+    mBtnEdit->setObjectName("btnPatEdit");
+    mBtnDelete->setObjectName("btnPatDelete");
     mBtnSelect->setObjectName("btnSelect");
+
+    mBtnEdit->setText(tr("Edit"));
+    mBtnDelete->setText(tr("Delete"));
     mBtnAdd->setText(tr("Add"));
     mBtnSelect->setText(tr("Select"));
-    mBtnWorklist->setText(tr("Worklist"));
     layout->addWidget(mBtnAdd);
-    layout->addWidget(mBtnWorklist);
+    layout->addWidget(mBtnEdit);
+    layout->addWidget(mBtnDelete);
+    addVerticalLine(layout);
     layout->addWidget(mBtnSelect);
 
     // btn add  slot
     connect(mBtnAdd, &QToolButton::clicked, this, &SelectFormWidget::editPatient);
 
+    // btn edit  slot
+    connect(mBtnEdit, &QToolButton::clicked, this, &SelectFormWidget::editPatient);
+
+    // btn del  slot
+    connect(mBtnDelete, &QToolButton::clicked, this, &SelectFormWidget::delPatient);
+
     // mBtn select slot
     connect(mBtnSelect, &QToolButton::clicked, this, &SelectFormWidget::selectPatient);
 }
 
 void SelectFormWidget::editPatient() {
     bool addFlag = sender() == mBtnAdd;
+    auto index = mPatTable->currentIndex();
     // accept change
     if (DialogManager::Default()->requestEditPatientInfo(addFlag ? nullptr:patientDetailForm->getPatientInformation(),mModel) == QDialog::Accepted) {
         if (addFlag){
@@ -142,7 +137,8 @@ void SelectFormWidget::editPatient() {
             LOG_USER_OPERATION(QString("Add Patient, ID: %1").arg(patientDetailForm->getPatientInformation()->ID))
         }
         else{
-            mPatTable->clicked(mPatTable->currentIndex());
+            mPatTable->selectRow(index.row());
+            mModel->selectRow(index.row());
             setPatientDetail(mPatTable, mModel, patientDetailForm);
             LOG_USER_OPERATION(QString("Edit Patient, ID: %1").arg(patientDetailForm->getPatientInformation()->ID))
         }
@@ -189,21 +185,10 @@ void SelectFormWidget::selectPatient() {
 
 void SelectFormWidget::initDetailPanel(QHBoxLayout *contentLayout) {// prepare edit panel
     patientDetailForm->setObjectName("patientDetailWidget");
-    // patientDetailForm->hide();
     contentLayout->addWidget(patientDetailForm);
-    auto* btnShowEdit = new VerticalTextToolButton(this);
-    btnShowEdit->setObjectName("btnShowPanel");
-    btnShowEdit->setFixedHeight(225);
-    btnShowEdit->setVerticalText("Patient Detail");
-    btnShowEdit->hide();
-    contentLayout->addWidget(btnShowEdit);
-    contentLayout->setAlignment(btnShowEdit, Qt::AlignTop);
-
-    connect(patientDetailForm, &PatientDetailForm::editClicked, this, &SelectFormWidget::editPatient);
-    connect(patientDetailForm, &PatientDetailForm::deleteClicked, this, &SelectFormWidget::delPatient);
 }
 
-void SelectFormWidget::initTableView(QHBoxLayout *contentLayout)
+void SelectFormWidget::initTableView(QLayout *contentLayout)
 {
     // TableView for patient
     mPatTable->setAlternatingRowColors(true);
@@ -212,9 +197,8 @@ void SelectFormWidget::initTableView(QHBoxLayout *contentLayout)
     mPatTable->setSelectionBehavior(QAbstractItemView::SelectRows);
     mPatTable->verticalHeader()->setDefaultSectionSize(38);
     mPatTable->horizontalHeader()->setStretchLastSection(true);
-    //data from SQLITE
-//
-//avoid pan comsumed by tableview!
+
+    //avoid pan comsumed by tableview!
     mPatTable->viewport()->ungrabGesture(Qt::PanGesture);
 
     mPatTable->setSortingEnabled(true); // enable sortingEnabled
@@ -250,7 +234,7 @@ void SelectFormWidget::initTableView(QHBoxLayout *contentLayout)
     mPatTable->setItemDelegateForColumn(6, patientAddDateDelegate);
 }
 
-void SelectFormWidget::initDataModel() {//TODO:单独初始化预防SQL错误
+void SelectFormWidget::initDataModel() {
     mModel = SQLHelper::getTable("Patient");
     WorkListManager::getInstance()->setTableModel(mModel);
     mModel->sort(mModel->record().indexOf("AddDate"), Qt::DescendingOrder);
@@ -302,9 +286,10 @@ void SelectFormWidget::reloadLanguage(){
     mModel->setHeaderData(6, Qt::Horizontal, tr("Add Date"));
     mModel->setHeaderData(7, Qt::Horizontal, tr("Comment"));
 
-    mBtnAccount->setText(tr("Account"));
-    //mBtnWorklist->setText(tr("Worklist"));
+    mBtnEdit->setText(tr("Edit"));
+    mBtnDelete->setText(tr("Delete"));
     mBtnAdd->setText(tr("Add"));
+    mBtnSelect->setText(tr("Select"));
 }
 
 void SelectFormWidget::updateDataByAnonymousMode(){

src/forms/select/SelectFormWidget.h

@@ -29,19 +29,16 @@ private:
 
     void setPatientDetail(const SlideTableView *table, const QSqlTableModel *model, PatientDetailForm *edit_patient) const;
 
-    QToolButton *mBtnAccount;
-    QToolButton *mBtnWorklist;
+    QToolButton *mBtnEdit;
+    QToolButton *mBtnDelete;
     QToolButton *mBtnAdd;
     QToolButton *mBtnSelect;
-    QToolButton *mBtnTurnOff;
     SlideTableView *mPatTable;
     QSqlTableModel *mModel;
     PatientDetailForm *patientDetailForm;
 
     void prepareButtons(bool disableALL);
 
-    void initGeneralButtons(QHBoxLayout *layout);
-
     void initPatEditButtons(QHBoxLayout *layout);
 
     void editPatient();
@@ -54,7 +51,7 @@ private:
 
     void initDetailPanel(QHBoxLayout *contentLayout);
 
-    void initTableView(QHBoxLayout *contentLayout);
+    void initTableView(QLayout *contentLayout);
 
     void reloadLanguage();
 };

src/stylesheet/Dark2.css

@@ -9,8 +9,8 @@
 /* Global buttons */
 QPushButton {
     border: 1px solid #505050;
-    padding-left: 50px;
-    padding-right: 50px;
+    padding-left: 30px;
+    padding-right: 30px;
     border-radius: 5px;
     min-height: 60px;
     max-height: 60px;
@@ -530,8 +530,8 @@ QWidget#commandWidget QToolButton{
 
 /*------SelectformWidget-----------------------------------------------------*/
 QWidget#patientDetailWidget {
-    min-width: 680px;
-    max-width: 680px;
+    min-width: 480px;
+    max-width: 480px;
     /* margin-top: 5; */
 }
 
@@ -567,6 +567,12 @@ QToolButton#btnHidePanel {
     qproperty-icon:url(":/icons/hidearrow.png");
     qproperty-iconSize:30px 30px;
 }
+QLabel#selectTabTitle {
+    min-height: 50px;
+    max-height: 50px;
+    border-bottom: 1px solid #515151;
+    font-size: 32px;
+}
 
 /* PatientDetailForm in  SelectformWidget */
 QWidget#editcmdWidget {
@@ -576,46 +582,48 @@ QWidget#editcmdWidget {
 
 
 QLabel#displayTitle {
-    border-bottom: 1px solid grey;
     color: #fcfcfc;
     min-height: 50px;
     max-height: 50px;
-    font-size: 40px;
+    max-width: 180px;
+    font-size: 26px;
     font-weight: Bold;
     border-bottom: 1px solid #4a88c7;
     font-weight: normal;
 }
 
 QLabel#displayDetail {
-    border-bottom: 1px solid grey;
     color: #fcfcfc;
     min-height: 50px;
     max-height: 50px;
-    font-size: 40px;
+    max-width: 280px;
+    font-size: 26px;
     font-weight: Bold;
-    border-bottom: 1px solid #4a88c7;
+    border-bottom: 1px solid silver;
     font-weight: normal;
 }
 
 QLabel#PatInfTitle {
-    border-bottom: 1px solid grey;
+    /* border-bottom: 1px solid grey; */
+    background: #0078d8;
     color: #fcfcfc;
-    min-height: 80px;
-    max-height: 80px;
-    font-size: 50px;
-    font-weight: Bold;
-    /* margin-top: 20px; */
-    margin-bottom: 30px;
+    min-height: 52px;
+    max-height: 52px;
+    font-size: 26px;
+    border-radius: 5px;
+    margin-top: 5px;
+    margin-left: 5px;
+    margin-bottom: 10px;
 }
 
 QLabel#PatIcon {
-    border: 1px solid grey;
+    /* border: 1px solid grey; */
     qproperty-pixmap:url(":/icons/patient.png");
     color: #fcfcfc;
-    min-height: 200px;
-    max-height: 200px;
-    min-width: 200px;
-    max-width: 200px;
+    min-height: 0px;
+    max-height: 0px;
+    min-width: 0px;
+    max-width: 0px;
     font-size: 40px;
     font-weight: Bold;
 }
@@ -644,14 +652,12 @@ QToolButton#btnDelete {
     qproperty-icon:url(":/icons/close_circle.png");
 }
 QToolButton#btnPatEdit {
-    border:2px solid grey;
     qproperty-toolButtonStyle:ToolButtonTextBesideIcon;
     qproperty-iconSize:120px 120px;
     qproperty-icon:url(":/icons/details.png");
 }
 
 QToolButton#btnPatDelete {
-    border:2px solid grey;
     qproperty-toolButtonStyle:ToolButtonTextBesideIcon;
     qproperty-iconSize:120px 120px;
     qproperty-icon:url(":/icons/close_circle.png");
@@ -865,7 +871,7 @@ GUIFormBaseDialog QToolButton:enabled {
 
 QPushButton#btnOK {
     background: #365880;
-    font-weight: bold
+    font-weight: bold;
 }
 
 /* GUIFormBaseDialog -> AccountFormDialog */

src/translations/zh_CN.ts

@@ -393,34 +393,34 @@
 <context>
     <name>DeviceManager</name>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="327"/>
+        <location filename="../device/DeviceManager.cpp" line="328"/>
         <source>Patient can leave.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="517"/>
+        <location filename="../device/DeviceManager.cpp" line="518"/>
         <source>Initialize Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="829"/>
+        <location filename="../device/DeviceManager.cpp" line="830"/>
         <source>Data is currently being transmitted, please shut down later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="836"/>
+        <location filename="../device/DeviceManager.cpp" line="837"/>
         <source>Shut down failed, please push emergency button to shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="1113"/>
+        <location filename="../device/DeviceManager.cpp" line="1114"/>
         <source>Recon disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="1178"/>
-        <location filename="../device/DeviceManager.cpp" line="1193"/>
+        <location filename="../device/DeviceManager.cpp" line="1179"/>
+        <location filename="../device/DeviceManager.cpp" line="1194"/>
         <source>Open pump failed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -536,6 +536,7 @@
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="47"/>
         <source>ID </source>
+        <source>ID </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -558,6 +559,8 @@
         <location filename="../dialogs/EditPatientDialog.cpp" line="87"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="197"/>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="197"/>
         <source>Female</source>
         <translation type="unfinished">女</translation>
     </message>
@@ -565,12 +568,15 @@
         <location filename="../dialogs/EditPatientDialog.cpp" line="87"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="197"/>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="197"/>
         <source>Male</source>
         <translation type="unfinished">男</translation>
     </message>
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="87"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -582,13 +588,16 @@
     <message>
         <source>Comment</source>
         <translation type="obsolete">备注</translation>
+        <translation type="obsolete">备注</translation>
     </message>
     <message>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <location filename="../dialogs/EditPatientDialog.cpp" line="139"/>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -807,32 +816,39 @@
 <context>
     <name>GetWorkListDialog</name>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="88"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="88"/>
         <source>Accession Nummber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="60"/>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="93"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="60"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="93"/>
         <source>Patient ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="58"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="58"/>
         <source>Accession Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="155"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="155"/>
         <source>Accession Number and Patient Id is Empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="162"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="162"/>
         <source>Unknow Error. code:001001001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dialogs/GetWorkListDialog.cpp" line="273"/>
         <location filename="../dialogs/GetWorkListDialog.cpp" line="273"/>
         <source>DB Error,Patient Write Failed</source>
         <translation type="unfinished"></translation>
@@ -1073,41 +1089,49 @@
 <context>
     <name>LoginDialog</name>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="85"/>
         <location filename="../windows/LoginDialog.cpp" line="85"/>
         <source>New password:%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="86"/>
         <location filename="../windows/LoginDialog.cpp" line="86"/>
         <source>Reset success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="102"/>
         <location filename="../windows/LoginDialog.cpp" line="102"/>
         <source>Shut down now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="102"/>
         <location filename="../windows/LoginDialog.cpp" line="102"/>
         <source>Shut Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="115"/>
         <location filename="../windows/LoginDialog.cpp" line="115"/>
         <source>U S C T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="126"/>
         <location filename="../windows/LoginDialog.cpp" line="126"/>
         <source>Username</source>
         <translation type="unfinished">用户名</translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="131"/>
         <location filename="../windows/LoginDialog.cpp" line="131"/>
         <source>Password</source>
         <translation type="unfinished">密码</translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="141"/>
         <location filename="../windows/LoginDialog.cpp" line="141"/>
         <source>Login</source>
         <translation type="unfinished">登录</translation>
@@ -1127,12 +1151,29 @@
         <source>Login failed, username or password error! Remaining retries: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../windows/LoginDialog.cpp" line="210"/>
+        <location filename="../windows/LoginDialog.cpp" line="166"/>
+        <source>Can&apos;t connect db. Please reboot the device and retry, or call for the service help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/LoginDialog.cpp" line="172"/>
+        <source>Login locked. Please retry after %1 minutes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/LoginDialog.cpp" line="198"/>
+        <source>Login failed, username or password error! Remaining retries: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../windows/LoginDialog.cpp" line="210"/>
         <source>Anonymous Mode active!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/LoginDialog.cpp" line="211"/>
         <location filename="../windows/LoginDialog.cpp" line="211"/>
         <source>System mode Notice</source>
         <translation type="unfinished"></translation>
@@ -1165,25 +1206,25 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="151"/>
-        <location filename="../windows/MainWindow.cpp" line="158"/>
+        <location filename="../windows/MainWindow.cpp" line="159"/>
+        <location filename="../windows/MainWindow.cpp" line="166"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="149"/>
-        <location filename="../windows/MainWindow.cpp" line="159"/>
+        <location filename="../windows/MainWindow.cpp" line="157"/>
+        <location filename="../windows/MainWindow.cpp" line="167"/>
         <source>Scan</source>
         <translation>扫描</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="147"/>
-        <location filename="../windows/MainWindow.cpp" line="160"/>
+        <location filename="../windows/MainWindow.cpp" line="155"/>
+        <location filename="../windows/MainWindow.cpp" line="168"/>
         <source>Recon</source>
         <translation>重建</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="172"/>
+        <location filename="../windows/MainWindow.cpp" line="180"/>
         <source>Shut down failed, please push emergency button to shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1200,8 +1241,8 @@
         <translation type="vanished">管理</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="161"/>
-        <location filename="../windows/MainWindow.cpp" line="315"/>
+        <location filename="../windows/MainWindow.cpp" line="169"/>
+        <location filename="../windows/MainWindow.cpp" line="323"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
@@ -1422,108 +1463,101 @@
 <context>
     <name>PatientDetailForm</name>
     <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="158"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="159"/>
         <source>Patient Information</source>
-        <translation type="unfinished">患者信息</translation>
-    </message>
-    <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="165"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="160"/>
-        <source>111</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">患者信息</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="obsolete">DICOM</translation>
     </message>
     <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="161"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="39"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="163"/>
         <source>Date Of Birth</source>
-        <translation>出生日期</translation>
+        <translation type="vanished">出生日期</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation type="vanished">备注</translation>
     </message>
     <message>
-        <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_PatientDetailForm.h" line="162"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="40"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="42"/>
         <source>Edit</source>
-        <translation type="unfinished">编辑</translation>
+        <translation type="obsolete">编辑</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="43"/>
         <source>Delete</source>
-        <translation type="unfinished">删除</translation>
+        <translation type="obsolete">删除</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="57"/>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="71"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="70"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="92"/>
         <source>Female</source>
         <translation>女</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="57"/>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="71"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="70"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="92"/>
         <source>Male</source>
         <translation>男</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="57"/>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="71"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="70"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="92"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="68"/>
-        <source>PatientID:     </source>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="38"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="77"/>
+        <source>Patient Detail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="73"/>
-        <source>Add Date:     </source>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="41"/>
+        <source>Birth Date</source>
+        <translation type="unfinished">出生日期</translation>
+    </message>
+    <message>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="42"/>
+        <source>PatientID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="74"/>
-        <source>AccNo:          </source>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="43"/>
+        <source>AccNo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="96"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="48"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="76"/>
+        <source>Add Date</source>
+        <translation type="unfinished">添加日期</translation>
+    </message>
+    <message>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="113"/>
         <source>Scan with this Patient?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="97"/>
-        <source>Protocol:       </source>
-        <translation type="unfinished"></translation>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="115"/>
+        <source>Protocol</source>
+        <translation type="unfinished">扫描协议</translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="97"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="114"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/PatientDetailForm.cpp" line="97"/>
+        <location filename="../forms/select/PatientDetailForm.cpp" line="114"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1812,30 +1846,42 @@
 <context>
     <name>ScanFormWidget</name>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="72"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="356"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="72"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="356"/>
         <source>Protocol</source>
         <translation>扫描协议</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="79"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="350"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="79"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="350"/>
         <source>LEFT</source>
         <translation>左侧</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="80"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="351"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="80"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="351"/>
         <source>RIGHT</source>
         <translation>右侧</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="142"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="352"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="142"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="352"/>
         <source>Empty Scan</source>
         <translation type="unfinished">空扫</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="146"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="188"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="236"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="361"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="146"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="188"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="236"/>
@@ -1844,16 +1890,19 @@
         <translation type="unfinished">排水</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="160"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="160"/>
         <source>Please make sure the holder is only contain water!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="160"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="160"/>
         <source>Confirm Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="206"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="206"/>
         <source>No refresh data exists, please do Refresh operation first.</source>
         <translation type="unfinished"></translation>
@@ -1868,6 +1917,19 @@
         <source>Confirm Drainage</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="192"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="228"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="361"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="218"/>
+        <source>Make sure to open the drain valve ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="218"/>
+        <source>Confirm Drainage</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="192"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="228"/>
@@ -1880,30 +1942,42 @@
         <translation type="vanished">空扫</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="143"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="353"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="143"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="353"/>
         <source>Preview</source>
         <translation>预扫</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="144"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="354"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="144"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="354"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="145"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="355"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="145"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="355"/>
         <source>Scan</source>
         <translation>扫描</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="110"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="357"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="110"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="357"/>
         <source>Preview Parameters</source>
         <translation>预览参数</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="115"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="125"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="359"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="360"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="115"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="125"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="359"/>
@@ -1915,6 +1989,8 @@ parameters
         <translation>XXX</translation>
     </message>
     <message>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="120"/>
+        <location filename="../forms/scan/ScanFormWidget.cpp" line="358"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="120"/>
         <location filename="../forms/scan/ScanFormWidget.cpp" line="358"/>
         <source>Scan Parameters</source>
@@ -2008,109 +2084,101 @@ parameters
 <context>
     <name>SelectFormWidget</name>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="96"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="305"/>
         <source>Account</source>
-        <translation>账户</translation>
+        <translation type="vanished">账户</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="123"/>
         <source>Worklist</source>
-        <translation>新增(拉取)</translation>
+        <translation type="vanished">新增(拉取)</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="121"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="307"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="108"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="291"/>
         <source>Add</source>
-        <translation>新增(录入)</translation>
+        <translation>新增</translation>
     </message>
     <message>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="106"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="289"/>
         <source>Edit</source>
         <translation type="vanished">编辑</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">删除</translation>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="52"/>
+        <source>Patient Information Manage</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="122"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="107"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="290"/>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="109"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="292"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="99"/>
-        <source>ShutDown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="105"/>
-        <source>Shut down now ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="105"/>
-        <source>Shut Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="158"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="154"/>
         <source>Can&apos;t delete selected Patient !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="158"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="179"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="154"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="175"/>
         <source>Alert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="163"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="159"/>
         <source>Delete Patient &quot;%1&quot; ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="163"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="159"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="179"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="175"/>
         <source>Can&apos;t delete selected Patient , db submit error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="278"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="298"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="262"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="282"/>
         <source>AccessionNumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="279"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="299"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="263"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="283"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="280"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="300"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="264"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="284"/>
         <source>Birth Date</source>
         <translation>出生日期</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="281"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="301"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="265"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="285"/>
         <source>Gender</source>
         <translation>性别</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="282"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="302"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="266"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="286"/>
         <source>Add Date</source>
         <translation>添加日期</translation>
     </message>
     <message>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="283"/>
-        <location filename="../forms/select/SelectFormWidget.cpp" line="303"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="267"/>
+        <location filename="../forms/select/SelectFormWidget.cpp" line="287"/>
         <source>Comment</source>
         <translation>备注</translation>
     </message>
@@ -2314,12 +2382,12 @@ parameters
 <context>
     <name>TopBarWidget</name>
     <message>
-        <location filename="../forms/TopBarWidget.cpp" line="25"/>
+        <location filename="../forms/TopBarWidget.cpp" line="28"/>
         <source>浙江衡玖医疗科技</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../forms/TopBarWidget.cpp" line="82"/>
+        <location filename="../forms/TopBarWidget.cpp" line="91"/>
         <source>°C</source>
         <translation></translation>
     </message>
@@ -2327,6 +2395,8 @@ parameters
 <context>
     <name>UserOperationLogForm</name>
     <message>
+        <location filename="../UserOperationLogForm.cpp" line="33"/>
+        <location filename="../UserOperationLogForm.cpp" line="81"/>
         <location filename="../UserOperationLogForm.cpp" line="33"/>
         <location filename="../UserOperationLogForm.cpp" line="81"/>
         <source>Log Date:</source>
@@ -2334,41 +2404,31 @@ parameters
     </message>
 </context>
 <context>
-    <name>WorklistSettingsDialog</name>
+    <name>WarningMessageWidget</name>
     <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="24"/>
-        <source>Worklist Settings</source>
-        <translation type="unfinished">Worklist通讯设置</translation>
+        <location filename="../components/WarningMessageWidget.cpp" line="27"/>
+        <source>System is working properly.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="65"/>
-        <source>AE can&apos;t be empty</source>
-        <translation type="unfinished">AE不能为空</translation>
+        <location filename="../components/WarningMessageWidget.cpp" line="28"/>
+        <source>No message.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="71"/>
-        <source>Server AE can&apos;t be empty</source>
-        <translation type="unfinished">服务器AE不能为空</translation>
+        <location filename="../components/WarningMessageWidget.cpp" line="44"/>
+        <source>System Status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="77"/>
-        <source>Server Ip can&apos;t be empty</source>
-        <translation type="unfinished">服务器地址不能为空</translation>
+        <location filename="../components/WarningMessageWidget.cpp" line="72"/>
+        <source>System Notifications</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="83"/>
-        <source>Server Port can&apos;t be empty</source>
-        <translation type="unfinished">服务器端口不能为空</translation>
-    </message>
-    <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="89"/>
-        <source>Ip Address is not valid</source>
-        <translation type="unfinished">服务器地址不符合格式规范</translation>
-    </message>
-    <message>
-        <location filename="../dialogs/WorklistSettingsDialog.cpp" line="95"/>
-        <source>Port is not valid</source>
-        <translation type="unfinished">服务器端口格式必须为小于65535的数字</translation>
+        <location filename="../components/WarningMessageWidget.cpp" line="96"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>