diff --git a/src/forms/TopBarWidget.cpp b/src/forms/TopBarWidget.cpp index 5c83967..3371361 100644 --- a/src/forms/TopBarWidget.cpp +++ b/src/forms/TopBarWidget.cpp @@ -9,12 +9,11 @@ #include #include - #include "components/RollingMessageWidget.h" - #include "event/EventCenter.h" #include "errorhandle/GUIErrorLW.h" #include "json/jsonobject.h" +#include "models/User.h" TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { auto layout = new QHBoxLayout(this); @@ -30,6 +29,16 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, spacerLine0->setFixedWidth(2); spacerLine0->setObjectName("verSpaceLine"); layout->addWidget(spacerLine0); + auto spacerLine1 = new QWidget(this); + spacerLine1->setFixedWidth(2); + spacerLine1->setObjectName("verSpaceLine"); + auto userlogo = new QLabel(this); + userlogo->setObjectName("userlogo"); + layout->addWidget(userlogo); + auto username = new QLabel(this); + username->setObjectName("username"); + layout->addWidget(username); + layout->addWidget(spacerLine1); auto lbl_msglogo = new QLabel(this); lbl_msglogo->setObjectName("msglogo"); layout->addWidget(lbl_msglogo); @@ -68,11 +77,11 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, status_layout->addWidget(hosp); status_layout->addWidget(nowDate); - auto spacerLine = new QWidget(this); - spacerLine->setFixedWidth(2); - spacerLine->setObjectName("verSpaceLine"); - layout->addWidget(spacerLine); + auto spacerLine2 = new QWidget(this); + spacerLine2->setFixedWidth(2); + spacerLine2->setObjectName("verSpaceLine"); + layout->addWidget(spacerLine2); layout->addWidget(linkIcon); layout->addWidget(lockIcon); layout->addWidget(readyIcon); @@ -85,29 +94,12 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, // w->setMessageList(GUIErrorLW::getWARNMessages()); w->setObjectName("borderWidget"); l->addWidget(w); - connect(EventCenter::Default(), &EventCenter::ResponseDeviceTemperature, [=](QObject*, QObject* msg) { - if (!msg) return; - QString* s = (QString*)msg; - lockIcon->setText(QString("%1%2").arg(*s).arg(tr("°C"))); + connect(EventCenter::Default(), &EventCenter::LoginSuccess, [=](QObject*, QObject* msg) { + username->setText(User::Current()->getUserName()); }); connect(w,&RollingMessageWidget::RollingTimerTriggr,[=](){ auto anony = JsonObject::Instance()->getAnonymousMode(); nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")+(anony?" Anonymized":"")); }); - - // connect(EventCenter::Default(), &EventCenter::WarnStateFlagChange, [=](QObject*, QObject* msg) { - // QVariant* var = (QVariant*)msg; - // int v = var->toInt(); - // int f = 0x00000001; - // for (int i = 0; i < 32; ++i) { - // int d = (f<updateMessagePriority(i,1); - // } else{ - // if (w)w->updateMessagePriority(i,-1); - // } - // } - // }); } diff --git a/src/stylesheet/Dark2.css b/src/stylesheet/Dark2.css index c991e87..d97e206 100644 --- a/src/stylesheet/Dark2.css +++ b/src/stylesheet/Dark2.css @@ -428,6 +428,20 @@ QLabel#company { max-width: 150px; } +QLabel#userlogo { + min-width: 30px; + max-width: 30px; + min-height: 30px; + max-height: 30px; + qproperty-pixmap:url(":/icons/patient.png"); + qproperty-scaledContents:true; +} + +QLabel#username { + min-width: 150px; + max-width: 200px; +} + QLabel#systemMsgBar { min-width: 500px; }