diff --git a/src/AccountTableForm.cpp b/src/AccountTableForm.cpp index c95b1f6..94bc5ef 100644 --- a/src/AccountTableForm.cpp +++ b/src/AccountTableForm.cpp @@ -15,112 +15,126 @@ #include #include "components/SlideableTableView.h" #include "AccountFormDialog.h" +#include "event/EventCenter.h" +AccountTableForm::AccountTableForm(QWidget* parent) { + layout = new QVBoxLayout(this); + layout->setMargin(0); + QTableView* table = new SlideableTableView(this); + layout->addWidget(table); + // TableView for patient + table->setAlternatingRowColors(true); + table->setSelectionMode(QAbstractItemView::SingleSelection); + table->setEditTriggers(QAbstractItemView::NoEditTriggers); + table->setSelectionBehavior(QAbstractItemView::SelectRows); + table->verticalHeader()->setDefaultSectionSize(38); + table->horizontalHeader()->setStretchLastSection(true); + //data from SQLITE -AccountTableForm::AccountTableForm(QWidget *parent) { - layout = new QVBoxLayout(this); - layout->setMargin(0); - QTableView* table = new SlideableTableView(this); - layout->addWidget(table); - // TableView for patient - table->setAlternatingRowColors(true); - table->setSelectionMode(QAbstractItemView::SingleSelection); - table->setEditTriggers(QAbstractItemView::NoEditTriggers); - table->setSelectionBehavior(QAbstractItemView::SelectRows); - table->verticalHeader()->setDefaultSectionSize(38); - table->horizontalHeader()->setStretchLastSection(true); - //data from SQLITE + auto model = SQLHelper::getTable("Account"); + model->sort(5, Qt::DescendingOrder); + model->select(); + model->setHeaderData(1, Qt::Horizontal, tr("ID")); + model->setHeaderData(2, Qt::Horizontal, tr("Name")); + model->setHeaderData(4, Qt::Horizontal, tr("Role")); + model->setHeaderData(5, Qt::Horizontal, tr("Comment")); + table->setModel((QAbstractItemModel*)model); + table->hideColumn(0); + table->hideColumn(3); + AccountRoleComboDelegate* comboDelegate = new AccountRoleComboDelegate(this); + table->setItemDelegateForColumn(4, comboDelegate); + table->show(); - auto model = SQLHelper::getTable("Account"); - model->sort(5,Qt::DescendingOrder); - model->select(); - model->setHeaderData(1,Qt::Horizontal,"ID"); - model->setHeaderData(2,Qt::Horizontal,"Name"); - model->setHeaderData(4,Qt::Horizontal,"Role"); - model->setHeaderData(5,Qt::Horizontal,"Comment"); - table->setModel((QAbstractItemModel*)model); - table->hideColumn(0); - table->hideColumn(3); - AccountRoleComboDelegate* comboDelegate = new AccountRoleComboDelegate(this); - table->setItemDelegateForColumn(4,comboDelegate); - table->show(); + // table->setSortingEnabled(true); + table->setColumnWidth(1, 250); + table->setColumnWidth(2, 250); + table->setColumnWidth(4, 150); -// table->setSortingEnabled(true); - table->setColumnWidth(1,250); - table->setColumnWidth(2,250); - table->setColumnWidth(4,150); + QWidget* cmdPanel = new QWidget(this); + cmdPanel->setObjectName("commandWidget"); + QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel); + cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); + QWidget* spacerLine = new QWidget(this); + spacerLine->setFixedWidth(2); + spacerLine->setObjectName("verSpaceLine"); + cmdLayout->addWidget(spacerLine); + ADD_TOOL_BTN_TO_LAYOUT(Add, ":/icons/add.png", cmdLayout); + ADD_TOOL_BTN_TO_LAYOUT(Edit, ":/icons/details.png", cmdLayout); + ADD_TOOL_BTN_TO_LAYOUT(Delete, ":/icons/close_circle.png", cmdLayout); + btnAdd->setText(tr("Add")); + btnEdit->setText(tr("Edit")); + btnDelete->setText(tr("Delete")); + layout->addWidget(cmdPanel); + //index change + connect(table, &QTableView::clicked, [=](const QModelIndex& modelIndex) { + if (currentRow != modelIndex.row()) + { + currentRow = modelIndex.row(); + } + }); + //add new account + connect(btnAdd, &QToolButton::clicked, [=]() { + AccountFormDialog dialog(this, New); + dialog.setWindowModality(Qt::WindowModal); + dialog.setReferenceModel(model); + if (dialog.exec() == QDialog::Accepted) + { + table->selectRow(0); + } + }); + connect(btnEdit, &QToolButton::clicked, [=]() { + if (currentRow < 0)return; + QMap map; + auto record = model->record(currentRow); + for (int i = 0; i < model->columnCount(); i++) + { + map[record.fieldName(i)] = record.value(i); + } + auto mode = map["UserID"] == User::Current()->getUserID() ? Self : Admin; + AccountFormDialog dialog(this, mode); + dialog.setWindowModality(Qt::WindowModal); + if (mode == Admin)dialog.setAccountInformation(map); + if (dialog.exec() == QDialog::Accepted) + { + model->select(); + table->selectRow(currentRow); + } + }); + connect(btnDelete, &QToolButton::clicked, [=]() { + if (currentRow < 0)return; + QString id = model->data(model->index(currentRow, 1)).toString(); + if (User::Current()->getUserID() == id) + { + //尝试删除自己 + AlertDialog dialog(this); + dialog.setButtonMode(OkOnly); + dialog.setWindowModality(Qt::WindowModal); + dialog.setAlertMessage(tr("Can't delete current log in account!")); + dialog.exec(); + return; + } + AlertDialog dialog(this); + dialog.setWindowModality(Qt::WindowModal); + + dialog.setAlertMessage(QString(tr("Delete account with ID:\"%1\"!")).arg(id)); + if (dialog.exec() != QDialog::Accepted) return; + model->removeRow(currentRow); + model->select(); + table->selectRow(model->rowCount() > currentRow + 1 ? currentRow : currentRow - 1); + }); + + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { + + //model->setHeaderData(1, Qt::Horizontal, tr("ID")); + model->setHeaderData(2, Qt::Horizontal, tr("Name")); + model->setHeaderData(4, Qt::Horizontal, tr("Role")); + model->setHeaderData(5, Qt::Horizontal, tr("Comment")); + + btnAdd->setText(tr("Add")); + btnEdit->setText(tr("Edit")); + btnDelete->setText(tr("Delete")); + }); - QWidget* cmdPanel = new QWidget(this); - cmdPanel->setObjectName("commandWidget"); - QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel); - cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); - QWidget* spacerLine= new QWidget(this); - spacerLine->setFixedWidth(2); - spacerLine->setObjectName("verSpaceLine"); - cmdLayout->addWidget(spacerLine); - ADD_TOOL_BTN_TO_LAYOUT(Add,":/icons/add.png",cmdLayout); - ADD_TOOL_BTN_TO_LAYOUT(Edit,":/icons/details.png",cmdLayout); - ADD_TOOL_BTN_TO_LAYOUT(Delete,":/icons/close_circle.png",cmdLayout); - btnAdd->setText(tr("Add")); - btnEdit->setText(tr("Edit")); - btnDelete->setText(tr("Delete")); - layout->addWidget(cmdPanel); - //index change - connect(table,&QTableView::clicked,[=](const QModelIndex & modelIndex){ - if (currentRow!=modelIndex.row()) - { - currentRow=modelIndex.row(); - } - }); - //add new account - connect(btnAdd, &QToolButton::clicked,[=](){ - AccountFormDialog dialog(this,New); - dialog.setWindowModality(Qt::WindowModal); - dialog.setReferenceModel(model); - if (dialog.exec() == QDialog::Accepted) - { - table->selectRow(0); - } - }); - connect(btnEdit, &QToolButton::clicked,[=](){ - if (currentRow<0)return; - QMap map; - auto record = model->record(currentRow); - for (int i = 0; i < model->columnCount(); i++) - { - map[record.fieldName(i)] = record.value(i); - } - auto mode = map["UserID"] == User::Current()->getUserID()?Self:Admin; - AccountFormDialog dialog(this,mode); - dialog.setWindowModality(Qt::WindowModal); - if (mode == Admin)dialog.setAccountInformation(map); - if (dialog.exec() == QDialog::Accepted) - { - model->select(); - table->selectRow(currentRow); - } - }); - connect(btnDelete, &QToolButton::clicked,[=](){ - if (currentRow<0)return; - QString id = model->data(model->index(currentRow,1)).toString(); - if (User::Current()->getUserID() == id) - { - //尝试删除自己 - AlertDialog dialog(this); - dialog.setButtonMode(OkOnly); - dialog.setWindowModality(Qt::WindowModal); - dialog.setAlertMessage(tr("Can't delete current log in account!")); - dialog.exec(); - return; - } - AlertDialog dialog(this); - dialog.setWindowModality(Qt::WindowModal); - dialog.setAlertMessage(QString(tr("Delete account with ID:\"%1\"!")).arg(id)); - if(dialog.exec()!=QDialog::Accepted) return; - model->removeRow(currentRow); - model->select(); - table->selectRow(model->rowCount()>currentRow+1?currentRow:currentRow-1); - }); } AccountTableForm::~AccountTableForm() { diff --git a/src/AdminSettingForm.cpp b/src/AdminSettingForm.cpp index e5e1dbb..b426927 100644 --- a/src/AdminSettingForm.cpp +++ b/src/AdminSettingForm.cpp @@ -27,7 +27,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm QListWidget* widget = new QListWidget(this); widget->setFixedWidth(250); QStringList menus; - menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About"); + //menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About"); + menus << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("About"); widget->addItems(menus); widget->setSpacing(3); for (int i = 0; i < menus.count(); ++i) { @@ -61,9 +62,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm Info->setText("info"); stackedWidget->addWidget(Info); - UserOperationLogForm* operationLogForm = new UserOperationLogForm(this); - - stackedWidget->addWidget(operationLogForm); + //UserOperationLogForm* operationLogForm = new UserOperationLogForm(this); + //stackedWidget->addWidget(operationLogForm); QLabel* about = new QLabel(this); about->setText(tr("About")); @@ -74,9 +74,8 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm }); connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { QStringList menus2; - menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("Log") << tr("About"); + menus2 << tr("General") << tr("Account") << tr("System") << tr("Information") << tr("About"); widget->clear(); - widget->addItems(menus2); for (int i = 0; i < menus.count(); ++i) { widget->item(i)->setTextAlignment(Qt::AlignCenter); diff --git a/src/ScanFormWidget.cpp b/src/ScanFormWidget.cpp index ac19f46..ad625bf 100644 --- a/src/ScanFormWidget.cpp +++ b/src/ScanFormWidget.cpp @@ -238,6 +238,20 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) { connect(group, SIGNAL(buttonClicked(int)), this, SLOT(protocolChanged(int))); + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { + btnLeft->setText(tr("LEFT")); + btnRight->setText(tr("RIGHT")); + btnRefresh->setText(tr("Refresh")); + btnPreview->setText(tr("Preview")); + btnStop->setText(tr("Stop")); + btnScan->setText(tr("Scan")); + lbl_Protocol->setText(tr("Protocol")); + lblPreview->setText(tr("Preview Parameters")); + lblParams->setText(tr("Scan Parameters")); + }); + + + previewfunc = [=](bool val)->void { viewer->setVisible(val); btnPreview->setCheckable(val); diff --git a/src/SelectFormWidget.cpp b/src/SelectFormWidget.cpp index b436099..07b6a45 100644 --- a/src/SelectFormWidget.cpp +++ b/src/SelectFormWidget.cpp @@ -95,6 +95,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : model->setHeaderData(3, Qt::Horizontal, tr("Birth Date")); model->setHeaderData(4, Qt::Horizontal, tr("Gender")); model->setHeaderData(5, Qt::Horizontal, tr("Add Date")); + model->setHeaderData(6, Qt::Horizontal, tr("Comment")); table->setModel((QAbstractItemModel*)model); table->hideColumn(0); table->hideColumn(7); @@ -255,8 +256,22 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : btnEdit->setEnabled(true); btnAdd->setEnabled(true); }); + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { + model->setHeaderData(1, Qt::Horizontal, "ID"); + model->setHeaderData(2, Qt::Horizontal, tr("Name")); + model->setHeaderData(3, Qt::Horizontal, tr("Birth Date")); + model->setHeaderData(4, Qt::Horizontal, tr("Gender")); + model->setHeaderData(5, Qt::Horizontal, tr("Add Date")); + model->setHeaderData(6, Qt::Horizontal, tr("Comment")); + btnAccount->setText(tr("Account")); + //btnWorklist->setText(tr("Worklist")); + btnAdd->setText(tr("Add")); + btnEdit->setText(tr("Edit")); + btnDelete->setText(tr("Delete")); + btnSelect->setText(tr("Select")); + }); } diff --git a/src/UserOperationLogForm.cpp b/src/UserOperationLogForm.cpp index a7fb598..e1d3daf 100644 --- a/src/UserOperationLogForm.cpp +++ b/src/UserOperationLogForm.cpp @@ -15,7 +15,7 @@ #include #include "SelectDialog.h" #include "mainwindow.h" - +#include "event/EventCenter.h" QString fileNameToDate(QString fileName) { return fileName.split("log/")[1].replace("-op.log", ""); @@ -29,7 +29,8 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) { layout = new QVBoxLayout(this); QWidget* header = new QWidget(this); QHBoxLayout* headerLayout = new QHBoxLayout(header); - headerLayout->addWidget(new QLabel(tr("Log Date:"))); + QLabel* logdate = new QLabel(tr("Log Date:")); + headerLayout->addWidget(logdate); btn = new QPushButton(header); headerLayout->addWidget(btn, 0, Qt::AlignLeft); headerLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); @@ -60,6 +61,10 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) { } }); + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { + logdate->setText(tr("Log Date:")); + }); + } UserOperationLogForm::~UserOperationLogForm() { diff --git a/src/editpatientform.cpp b/src/editpatientform.cpp index fd1dd9d..c78a314 100644 --- a/src/editpatientform.cpp +++ b/src/editpatientform.cpp @@ -6,137 +6,151 @@ #include #include "guimacros.h" #include -EditPatientForm::EditPatientForm(QWidget *parent) : - QWidget(parent), - ui(new Ui::EditPatientForm) +#include "event/EventCenter.h" + +EditPatientForm::EditPatientForm(QWidget* parent) : + QWidget(parent), + ui(new Ui::EditPatientForm) { - ui->setupUi(this); - ui->lbl_Sex->setText(tr("Gender")); - QHBoxLayout* sexlayout =new QHBoxLayout(ui->sexpanelwidget); - sexlayout->setMargin(6); - ADD_TOOL_SIZE_BTN_TO_LAYOUT(F,":/icons/female_d.png",30, sexlayout); - ADD_TOOL_SIZE_BTN_TO_LAYOUT(M,":/icons/male_d.png", 30,sexlayout); - btnF->setText(tr("Female")); - btnM->setText(tr("Male")); + ui->setupUi(this); + //ui->lbl_Sex->setText(tr("Gender")); + QHBoxLayout* sexlayout = new QHBoxLayout(ui->sexpanelwidget); + sexlayout->setMargin(6); + ADD_TOOL_SIZE_BTN_TO_LAYOUT(F, ":/icons/female_d.png", 30, sexlayout); + ADD_TOOL_SIZE_BTN_TO_LAYOUT(M, ":/icons/male_d.png", 30, sexlayout); + btnF->setText(tr("Female")); + btnM->setText(tr("Male")); + + // btnFemale->setToolButtonStyle(Qt::ToolButtonIconOnly); + // btnMale->setToolButtonStyle(Qt::ToolButtonIconOnly); + + btnF->setObjectName("sexBtn"); + btnM->setObjectName("sexBtn"); + //btnF->setText("Female"); + //btnM->setText("Male"); + ui->sexpanelwidget->setEnabled(editEnable); + btnF->setEnabled(editEnable); + btnM->setEnabled(editEnable); + btnF->setCheckable(true); + btnM->setCheckable(true); + QButtonGroup* group = new QButtonGroup(this); + group->addButton(btnF); + group->addButton(btnM); + btnF->setChecked(true); + btnFemale = btnF; + btnMale = btnM; + QHBoxLayout* layout = new QHBoxLayout(this->ui->editcmdWidget); + + ADD_TOOL_BTN(Cancel, ":/icons/close_circle.png"); + ADD_TOOL_BTN(Accpet, ":/icons/selected.png"); + btnCancel->setText(tr("Cancel")); + btnAccpet->setText(tr("Accept")); + btnCancel->setEnabled(editEnable); + btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly); + btnCancel->setIcon(QIcon(editEnable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png")); + btnAccpet->setEnabled(editEnable); + btnAccpet->setToolButtonStyle(Qt::ToolButtonIconOnly); + btnAccpet->setIcon(QIcon(editEnable ? ":/icons/selected.png" : ":/icons/selected_d.png")); + btnEditAccept = btnAccpet; + btnEditCancel = btnCancel; + connect(btnEditCancel, &QToolButton::clicked, [=]() { + clearPatientInformation(); + this->setEditEnable(false); + restorePatientInformation(); + emit editCancel(); + }); + connect(btnEditAccept, &QToolButton::clicked, [=]() { + if (ui->tbx_ID->text().isEmpty())return; + if (ui->tbx_Name->text().isEmpty())return; + storePatientInformation(); + bool result = true; + emit editAccept(getPatientInformation(), result); + if (result) this->setEditEnable(false); + }); + ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd"); + + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { + + ui->retranslateUi(this); + btnF->setText(tr("Female")); + btnM->setText(tr("Male")); + btnCancel->setText(tr("Cancel")); + btnAccpet->setText(tr("Accept")); + }); + -// btnFemale->setToolButtonStyle(Qt::ToolButtonIconOnly); -// btnMale->setToolButtonStyle(Qt::ToolButtonIconOnly); - btnF->setObjectName("sexBtn"); - btnM->setObjectName("sexBtn"); - btnF->setText("Female"); - btnM->setText("Male"); - ui->sexpanelwidget->setEnabled(editEnable); - btnF->setEnabled(editEnable); - btnM->setEnabled(editEnable); - btnF->setCheckable(true); - btnM->setCheckable(true); - QButtonGroup* group= new QButtonGroup(this); - group->addButton(btnF); - group->addButton(btnM); - btnF->setChecked(true); - btnFemale=btnF; - btnMale=btnM; - QHBoxLayout* layout =new QHBoxLayout(this->ui->editcmdWidget); - - ADD_TOOL_BTN(Cancel,":/icons/close_circle.png"); - ADD_TOOL_BTN(Accpet,":/icons/selected.png"); - btnCancel->setText(tr("Cancel")); - btnAccpet->setText(tr("Accept")); - btnCancel->setEnabled(editEnable); - btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly); - btnCancel->setIcon(QIcon(editEnable?":/icons/close_circle.png":":/icons/close_circle_d.png")); - btnAccpet->setEnabled(editEnable); - btnAccpet->setToolButtonStyle(Qt::ToolButtonIconOnly); - btnAccpet->setIcon(QIcon(editEnable?":/icons/selected.png":":/icons/selected_d.png")); - btnEditAccept = btnAccpet; - btnEditCancel = btnCancel; - connect(btnEditCancel,&QToolButton::clicked,[=](){ - clearPatientInformation(); - this->setEditEnable(false); - restorePatientInformation(); - emit editCancel(); - }); - connect(btnEditAccept,&QToolButton::clicked,[=](){ - if (ui->tbx_ID->text().isEmpty())return; - if (ui->tbx_Name->text().isEmpty())return; - storePatientInformation(); - bool result = true; - emit editAccept(getPatientInformation(), result); - if (result) this->setEditEnable(false); - }); - ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd"); } EditPatientForm::~EditPatientForm() { - delete ui; + delete ui; } -void EditPatientForm::setPatientInformation(PatientInformation *information) { - if (information) - { - ui->tbx_ID->setText(information->ID); - ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate,"yyyy-MM-dd")); - ui->tbx_Name->setText(information->Name); - ui->rtbx_Comment->setText(information->Comment); - btnFemale->setChecked(information->Sex=="F"); - btnMale->setChecked(information->Sex!="F"); - currentPatientUID = information->PatientUID; - AddDate = information->AddDate; - storePatientInformation(); - } +void EditPatientForm::setPatientInformation(PatientInformation* information) { + if (information) + { + ui->tbx_ID->setText(information->ID); + ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate, "yyyy-MM-dd")); + ui->tbx_Name->setText(information->Name); + ui->rtbx_Comment->setText(information->Comment); + btnFemale->setChecked(information->Sex == "F"); + btnMale->setChecked(information->Sex != "F"); + currentPatientUID = information->PatientUID; + AddDate = information->AddDate; + storePatientInformation(); + } } void EditPatientForm::clearPatientInformation() { - ui->tbx_ID->setText(""); - ui->tbx_Dob->setDate(QDate::currentDate()); - ui->tbx_Name->setText(""); - btnFemale->setChecked(true); - btnMale->setChecked(false); - ui->rtbx_Comment->setText(""); - currentPatientUID = ""; - AddDate = ""; + ui->tbx_ID->setText(""); + ui->tbx_Dob->setDate(QDate::currentDate()); + ui->tbx_Name->setText(""); + btnFemale->setChecked(true); + btnMale->setChecked(false); + ui->rtbx_Comment->setText(""); + currentPatientUID = ""; + AddDate = ""; } void EditPatientForm::setEditEnable(bool enable) { - ui->tbx_ID->setEnabled(enable); - ui->tbx_Dob->setEnabled(enable); - ui->tbx_Name->setEnabled(enable); - ui->sexpanelwidget->setEnabled(enable); - btnFemale->setEnabled(enable); - btnFemale->setIcon(QIcon(enable?":/icons/female.png":":/icons/female_d.png")); - btnMale->setEnabled(enable); - btnMale->setIcon(QIcon(enable?":/icons/male.png":":/icons/male_d.png")); - ui->rtbx_Comment->setEnabled(enable); - btnEditAccept->setEnabled(enable); - btnEditCancel->setEnabled(enable); - btnEditCancel->setIcon(QIcon(enable?":/icons/close_circle.png":":/icons/close_circle_d.png")); - btnEditAccept->setIcon(QIcon(enable?":/icons/selected.png":":/icons/selected_d.png")); - editEnable = enable; -// ui->->setEnabled(enable); + ui->tbx_ID->setEnabled(enable); + ui->tbx_Dob->setEnabled(enable); + ui->tbx_Name->setEnabled(enable); + ui->sexpanelwidget->setEnabled(enable); + btnFemale->setEnabled(enable); + btnFemale->setIcon(QIcon(enable ? ":/icons/female.png" : ":/icons/female_d.png")); + btnMale->setEnabled(enable); + btnMale->setIcon(QIcon(enable ? ":/icons/male.png" : ":/icons/male_d.png")); + ui->rtbx_Comment->setEnabled(enable); + btnEditAccept->setEnabled(enable); + btnEditCancel->setEnabled(enable); + btnEditCancel->setIcon(QIcon(enable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png")); + btnEditAccept->setIcon(QIcon(enable ? ":/icons/selected.png" : ":/icons/selected_d.png")); + editEnable = enable; + // ui->->setEnabled(enable); } void EditPatientForm::storePatientInformation() { - store.PatientUID =currentPatientUID; - store.AddDate = AddDate; - store.ID = ui->tbx_ID->text(); - store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd"); - store.Name = ui->tbx_Name->text(); - store.Sex = btnFemale->isChecked()?"F":"M"; - store.Comment = ui->rtbx_Comment->toPlainText(); - qDebug()<tbx_ID->text(); + store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd"); + store.Name = ui->tbx_Name->text(); + store.Sex = btnFemale->isChecked() ? "F" : "M"; + store.Comment = ui->rtbx_Comment->toPlainText(); + qDebug() << store.PatientUID << "," << store.ID << "," << store.BirthDate << "," << store.Name << "," << store.Sex; } void EditPatientForm::restorePatientInformation() { - currentPatientUID = store.PatientUID; - AddDate = store.AddDate; - ui->tbx_ID->setText(store.ID); - ui->tbx_Dob->setDate(QDate::fromString(store.BirthDate,"yyyy-MM-dd")); - ui->tbx_Name->setText(store.Name); - ui->rtbx_Comment->setText(store.Comment); - btnFemale->setChecked(store.Sex=="F"); - btnMale->setChecked(store.Sex!="F"); -// ui->cb_Sex->setCurrentText(store.Sex=="F"?"Female":(store.Name=="M"?"Male":"Other")); + currentPatientUID = store.PatientUID; + AddDate = store.AddDate; + ui->tbx_ID->setText(store.ID); + ui->tbx_Dob->setDate(QDate::fromString(store.BirthDate, "yyyy-MM-dd")); + ui->tbx_Name->setText(store.Name); + ui->rtbx_Comment->setText(store.Comment); + btnFemale->setChecked(store.Sex == "F"); + btnMale->setChecked(store.Sex != "F"); + // ui->cb_Sex->setCurrentText(store.Sex=="F"?"Female":(store.Name=="M"?"Male":"Other")); } diff --git a/src/generalform.cpp b/src/generalform.cpp index bdb154c..4036242 100644 --- a/src/generalform.cpp +++ b/src/generalform.cpp @@ -50,12 +50,15 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent) layout->addWidget(lockHeader); QHBoxLayout* lockHeaderLayout = new QHBoxLayout(lockHeader); - QLabel* lbl_lock = new QLabel(tr("Lock Screen Timeout")); + QLabel* lbl_lock = new QLabel(tr("Lock Screen")); lockHeaderLayout->addWidget(lbl_lock); QLineEdit* lockTime = new QLineEdit(lockHeader); lockTime->setMaximumSize(QSize(300, 32768)); lockHeaderLayout->addWidget(lockTime); + + QLabel* ss = new QLabel(tr("s")); + lockHeaderLayout->addWidget(ss); lockHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); //... @@ -108,6 +111,6 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent) lbl_lan->setText(tr("Language")); lbl_ins->setText(tr("Institution Addr")); lbl_insaddr->setText(tr("Institution Addr")); - lbl_lock->setText(tr("Lock Screen Timeout")); + lbl_lock->setText(tr("Lock Screen")); }); } diff --git a/src/systemsettingform.cpp b/src/systemsettingform.cpp index c8ce749..ff65c63 100644 --- a/src/systemsettingform.cpp +++ b/src/systemsettingform.cpp @@ -105,6 +105,9 @@ systemSettingForm::systemSettingForm(QWidget* parent) : connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() { ui->retranslateUi(this); + + ui->btnPro->setText(JsonObject::Instance()->defaultProtocal()); + ui->btnFlt->setText(JsonObject::Instance()->defaultFilter()); }); } diff --git a/src/systemsettingform.ui b/src/systemsettingform.ui index 1e1fbf1..3ea5de6 100644 --- a/src/systemsettingform.ui +++ b/src/systemsettingform.ui @@ -52,7 +52,7 @@ - PushButton + @@ -88,7 +88,7 @@ - PushButton + @@ -134,7 +134,7 @@ - Configure + diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index 28054c3..dc5e130 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -7,22 +7,10 @@ Account - - User ID - - - - Input User ID - - Name - - Input User name - - Password @@ -87,6 +75,18 @@ Reset Password + + User ID + + + + Input User ID + + + + Input User name + + AccountTableForm @@ -110,6 +110,22 @@ Delete + + ID + + + + Name + + + + Role + + + + Comment + + AdminSettingForm @@ -133,10 +149,6 @@ Information - - Log - - AlertDialog @@ -264,7 +276,11 @@ - Lock Screen Timeout + s + + + + Lock Screen @@ -508,6 +524,10 @@ parameters Add Date + + Comment + + TabFormWidget @@ -627,10 +647,6 @@ parameters Network Setting - - PushButton - - Protocal @@ -643,10 +659,6 @@ parameters Auto Verify - - Configure - - IP diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak index 28054c3..dc5e130 100644 --- a/src/translations/en_US.ts.bak +++ b/src/translations/en_US.ts.bak @@ -7,22 +7,10 @@ Account - - User ID - - - - Input User ID - - Name - - Input User name - - Password @@ -87,6 +75,18 @@ Reset Password + + User ID + + + + Input User ID + + + + Input User name + + AccountTableForm @@ -110,6 +110,22 @@ Delete + + ID + + + + Name + + + + Role + + + + Comment + + AdminSettingForm @@ -133,10 +149,6 @@ Information - - Log - - AlertDialog @@ -264,7 +276,11 @@ - Lock Screen Timeout + s + + + + Lock Screen @@ -508,6 +524,10 @@ parameters Add Date + + Comment + + TabFormWidget @@ -627,10 +647,6 @@ parameters Network Setting - - PushButton - - Protocal @@ -643,10 +659,6 @@ parameters Auto Verify - - Configure - - IP diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm index 03cdfc6..912f9e3 100644 Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 40418aa..2c84b41 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -127,18 +127,44 @@ AccountTableForm + + + ID + + + + + + Name + 姓名 + + + + + Role + 角色 + + + + + Comment + 备注 + + Add 新增 + Edit 编辑 + Delete 删除 @@ -156,34 +182,32 @@ AdminSettingForm - + General 通用 - + Account - 账户 + 用户 - + System 系统 - + Information 信息 - - Log - 日志 + 日志 Account Manage @@ -202,10 +226,10 @@ 操作日志 - + - + About 关于 @@ -276,7 +300,7 @@ ID - 编号 + @@ -295,27 +319,30 @@ - Gender 性别 - + + Female - 女性 + 女 - + + Male - 男性 + 男 - + + Cancel 取消 - + + Accept 接受 @@ -350,7 +377,7 @@ GeneralForm - + Language 语言 @@ -361,17 +388,26 @@ - - + + Institution Addr 机构地址 - - Lock Screen Timeout + + Lock Screen 锁屏时间 + + Lock Screen Timeout + 锁屏时间 + + + + s + + GetAdminPsw @@ -538,7 +574,7 @@ Female - 女性 + 女 @@ -577,41 +613,49 @@ ScanFormWidget + Protocol 扫描协议 + LEFT 左侧 + RIGHT 右侧 + Refresh 空扫 + Preview 预扫 + Stop 停止 + Scan 扫描 + Preview Parameters 预览参数 @@ -626,6 +670,7 @@ parameters + Scan Parameters 扫描参数 @@ -634,6 +679,7 @@ parameters SelectFormWidget + Account 账户 @@ -644,44 +690,58 @@ parameters + Add 新增 + Edit 编辑 + Delete 删除 + Select 选择 + Name 姓名 + Birth Date 出生日期 + Gender 性别 + Add Date 添加日期 + + + + Comment + 备注 + TabFormWidget @@ -708,6 +768,7 @@ parameters UserOperationLogForm + Log Date: 日志时间 @@ -832,12 +893,6 @@ parameters Network Setting 网络配置 - - - - PushButton - - Protocal @@ -854,9 +909,8 @@ parameters 自动验证 - Configure - 配置 + 配置 diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak index 40418aa..2c84b41 100644 --- a/src/translations/zh_CN.ts.bak +++ b/src/translations/zh_CN.ts.bak @@ -127,18 +127,44 @@ AccountTableForm + + + ID + + + + + + Name + 姓名 + + + + + Role + 角色 + + + + + Comment + 备注 + + Add 新增 + Edit 编辑 + Delete 删除 @@ -156,34 +182,32 @@ AdminSettingForm - + General 通用 - + Account - 账户 + 用户 - + System 系统 - + Information 信息 - - Log - 日志 + 日志 Account Manage @@ -202,10 +226,10 @@ 操作日志 - + - + About 关于 @@ -276,7 +300,7 @@ ID - 编号 + @@ -295,27 +319,30 @@ - Gender 性别 - + + Female - 女性 + 女 - + + Male - 男性 + 男 - + + Cancel 取消 - + + Accept 接受 @@ -350,7 +377,7 @@ GeneralForm - + Language 语言 @@ -361,17 +388,26 @@ - - + + Institution Addr 机构地址 - - Lock Screen Timeout + + Lock Screen 锁屏时间 + + Lock Screen Timeout + 锁屏时间 + + + + s + + GetAdminPsw @@ -538,7 +574,7 @@ Female - 女性 + 女 @@ -577,41 +613,49 @@ ScanFormWidget + Protocol 扫描协议 + LEFT 左侧 + RIGHT 右侧 + Refresh 空扫 + Preview 预扫 + Stop 停止 + Scan 扫描 + Preview Parameters 预览参数 @@ -626,6 +670,7 @@ parameters + Scan Parameters 扫描参数 @@ -634,6 +679,7 @@ parameters SelectFormWidget + Account 账户 @@ -644,44 +690,58 @@ parameters + Add 新增 + Edit 编辑 + Delete 删除 + Select 选择 + Name 姓名 + Birth Date 出生日期 + Gender 性别 + Add Date 添加日期 + + + + Comment + 备注 + TabFormWidget @@ -708,6 +768,7 @@ parameters UserOperationLogForm + Log Date: 日志时间 @@ -832,12 +893,6 @@ parameters Network Setting 网络配置 - - - - PushButton - - Protocal @@ -854,9 +909,8 @@ parameters 自动验证 - Configure - 配置 + 配置