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

Css fix and rolling message event, time text fix.

Browse Source
This commit is contained in:
kradchen
2023-09-08 13:54:11 +08:00
parent bf0367b3e4
commit fd01be0fe9
7 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/forms/TopBarWidget.cpp
View File

@@ -77,11 +77,14 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
w->setObjectName("borderWidget");
l->addWidget(w);
connect(EventCenter::Default(), &EventCenter::ResponseDeviceTemperature, [=](QObject*, QObject* msg) {
nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
if (!msg) return;
QString* s = (QString*)msg;
lockIcon->setText(QString("%1%2").arg(*s).arg(tr("°C")));
});
connect(w,&RollingMessageWidget::RollingTimerTriggr,[=](){
nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
});
// connect(EventCenter::Default(), &EventCenter::WarnStateFlagChange, [=](QObject*, QObject* msg) {
// QVariant* var = (QVariant*)msg;
// int v = var->toInt();

4
src/forms/select/PatientDetailForm.cpp
View File

@@ -40,8 +40,8 @@ mUI(new Ui::PatientDetailForm)
mUI->verticalLayout_3->insertWidget(5, widget);
QHBoxLayout * layout = new QHBoxLayout(widget);
mBtnEdit->setObjectName("btnEdit");
mBtnDelete->setObjectName("btnDelete");
mBtnEdit->setObjectName("btnPatEdit");
mBtnDelete->setObjectName("btnPatDelete");
mBtnEdit->setText(tr("Edit"));
mBtnDelete->setText(tr("Delete"));
layout->addWidget(mBtnEdit);

14
src/forms/select/SelectFormWidget.cpp
View File

@@ -25,8 +25,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent)
, mBtnAccount(new QToolButton(this))
, mBtnWorklist(new QToolButton(this))
, mBtnAdd(new QToolButton(this))
// , mBtnEdit(new QToolButton(this))
// , mBtnDelete(new QToolButton(this))
, mBtnTurnOff(new QToolButton(this))
, mBtnSelect(new QToolButton(this))
, mPatTable(new SlideTableView(this))
, mModel(nullptr)
@@ -79,8 +78,19 @@ 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(mModel, mPatTable);

1
src/forms/select/SelectFormWidget.h
View File

@@ -34,6 +34,7 @@ private:
QToolButton *mBtnEdit;
QToolButton *mBtnDelete;
QToolButton *mBtnSelect;
QToolButton *mBtnTurnOff;
SlideTableView *mPatTable;
QSqlTableModel *mModel;
PatientDetailForm *patientDetailForm;