From 5973d3875818000d0eff3d78df7080848600bd71 Mon Sep 17 00:00:00 2001 From: Krad Date: Wed, 12 Jan 2022 17:06:08 +0800 Subject: [PATCH] TopBar layout change. --- src/TopBarWidget.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/TopBarWidget.cpp b/src/TopBarWidget.cpp index e49c42d..2fd7ae9 100644 --- a/src/TopBarWidget.cpp +++ b/src/TopBarWidget.cpp @@ -9,6 +9,7 @@ #include #include "event/EventCenter.h" #include "errorhandle/GUIErrorLW.h" +#include "json/jsonobject.h" TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { QHBoxLayout* layout = new QHBoxLayout(this); @@ -32,13 +33,14 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, layout->addWidget(lbl_msglogo); QWidget* widgetMsg = new QWidget(this); - layout->addWidget(widgetMsg); - widgetMsg->setObjectName("need_border"); - + layout->addWidget(widgetMsg,1); +// widgetMsg->setObjectName("need_border"); + widgetMsg->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + layout->addSpacerItem(new QSpacerItem(10, 10, QSizePolicy::Expanding)); QWidget* statusBarWidget = new QWidget(this); layout->addWidget(statusBarWidget); QLabel* hosp = new QLabel(this); -// hosp->setText(tr("浙江大学医学院附属第二医院")); + hosp->setText(JsonObject::Instance()->institutionName()); QLabel* nowDate = new QLabel(this); nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); QLabel* linkIcon = new QLabel(this); @@ -50,7 +52,7 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, // lockIcon->setPixmap(QPixmap(":/icons/lock.png").scaledToHeight(22,Qt::SmoothTransformation)); QHBoxLayout* status_layout = new QHBoxLayout(statusBarWidget); status_layout->setMargin(0); - status_layout->addSpacerItem(new QSpacerItem(10, 10, QSizePolicy::Expanding)); + status_layout->addWidget(hosp); status_layout->addWidget(nowDate); QWidget* spacerLine = new QWidget(this);