sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring the new dialog manager module and fixed keyboard problem in Linux touch panel.

Browse Source
This commit is contained in:
sunwen
2022-08-10 15:28:59 +08:00
parent 9b96af094b
commit 30df175f22
28 changed files with 485 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/forms/settings/SystemSettingForm.cpp
View File

@@ -5,10 +5,7 @@
#include <QToolButton>
#include <QGridLayout>
#include "dialogs/SelectDialog.h"
#include "network/NetworkCfgDialog.h"
#include "network/DicomCfgDialog.h"
#include "network/GetAdminPsw.h"
#include "dialogs/DialogManager.h"
#include "json/jsonobject.h"
#include "event/EventCenter.h"
#include "device/DeviceManager.h"
@@ -18,8 +15,6 @@
SystemSettingForm::SystemSettingForm(QWidget* parent)
: QWidget(parent)
, mUI(new Ui::SystemSettingForm)
, mProtocalSelectDialog(new SelectDialog(this))
, mFilterSelectDialog(new SelectDialog(this))
, mDiskInfoCaller(nullptr)
, mDiskSize(0)
, mDiskUsedSize(0)
@@ -27,8 +22,6 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
, mDiskUsedSizeFlag(false)
{
mUI->setupUi(this);
mProtocalSelectDialog->setWindowModality(Qt::WindowModal);
mFilterSelectDialog->setWindowModality(Qt::WindowModal);
mUI->lbl_size->setText(tr("Loading..."));
mUI->lbl_used->setText(tr("Loading..."));
@@ -100,31 +93,25 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
JsonObject::Instance()->setCompleteNotify(scanCompleteButton->getChecked());
});
connect(mUI->btnNetwork, &QToolButton::clicked, [=]() {
GetAdminPsw dialog(this);
if (dialog.exec() == QDialog::Accepted)
if (DialogManager::Default()->requestInputAdminPasswd() == QDialog::Accepted)
{
JsonObject::Instance()->setPassword(dialog.getPsw());
NetworkCfgDialog dia(this);
dia.setWindowModality(Qt::WindowModal);
dia.exec();
//JsonObject::Instance()->setPassword(dialog.getPsw());
DialogManager::Default()->requestEditNetworkConfig();
}
});
connect(mUI->btnDICOM, &QToolButton::clicked, [=]() {
DicomCfgDialog dia(this);
dia.setWindowModality(Qt::WindowModal);
dia.exec();
DialogManager::Default()->requestEditDicomConfig();
});
connect(mUI->btnPro, &QPushButton::clicked, [=]()
{
mProtocalSelectDialog->setValues(JsonObject::Instance()->protocals());
mProtocalSelectDialog->setSelectedValue(JsonObject::Instance()->defaultProtocal());
if (mProtocalSelectDialog->exec() == QDialog::Accepted)
DialogResult result = DialogManager::Default()->requestSelectProtocal();
if (result.ResultCode == QDialog::Accepted)
{
QString pro = mProtocalSelectDialog->getSelectedValue();
QString pro = result.ResultData.toString();
//take effect
JsonObject::Instance()->setDefaultProtocal(pro);
mUI->btnPro->setText(JsonObject::Instance()->defaultProtocal());
@@ -133,11 +120,10 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
connect(mUI->btnFlt, &QPushButton::clicked, [=]()
{
mFilterSelectDialog->setValues(JsonObject::Instance()->worklistFilters());
mFilterSelectDialog->setSelectedValue(JsonObject::Instance()->defaultFilter());
if (mFilterSelectDialog->exec() == QDialog::Accepted)
DialogResult result = DialogManager::Default()->requestSelectFilter();
if (result.ResultCode == QDialog::Accepted)
{
QString flt = mFilterSelectDialog->getSelectedValue();
QString flt = result.ResultData.toString();
//take effect
JsonObject::Instance()->setDefaultFilter(flt);
mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());