From 38dcd38e02594910853dae62d297dcf08e7018e1 Mon Sep 17 00:00:00 2001 From: Krad Date: Mon, 11 Oct 2021 09:22:31 +0800 Subject: [PATCH] New theme --- src/ScanFormWidget.cpp | 28 +++++++++++++++++++++------ src/SelectFormWidget.cpp | 41 ++++++++++++++++++++++------------------ src/mainwindow.cpp | 4 ++-- src/tabformwidget.cpp | 27 ++++++++++++++++++++++++-- 4 files changed, 72 insertions(+), 28 deletions(-) diff --git a/src/ScanFormWidget.cpp b/src/ScanFormWidget.cpp index cf5a67b..3753dc0 100644 --- a/src/ScanFormWidget.cpp +++ b/src/ScanFormWidget.cpp @@ -19,7 +19,8 @@ ScanFormWidget::ScanFormWidget(QWidget *parent) : TabFormWidget(parent) { "QWidget#broadcast_widget{border:2px solid #515151; border-radius: 20px}" "QLabel#lbl_protocol{font-size:32px; margin:0; color:silver}" "QLabel#lbl_title,QLabel#lbl_ptitle{font-size:20px;margin:0; border-bottom:1px solid silver}" - "QLabel#lbl_end{font-size:32px;margin:0; border-top:1px solid #0078d8}" + "QLabel#lbl_end{font-size:20px;margin:0; border-top:1px solid #0078d8}" + "QLabel#lbl_e{font-size:20px;}" ""; this->setStyleSheet(this->styleSheet().append(style)); QHBoxLayout* layout =new QHBoxLayout(); @@ -37,13 +38,8 @@ ScanFormWidget::ScanFormWidget(QWidget *parent) : TabFormWidget(parent) { ADD_TOOL_BTN(Left,":/icons/left.png"); ADD_TOOL_BTN(Right,":/icons/right.png"); QButtonGroup* group = new QButtonGroup(this); - -// btnLeft->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); -// btnLeft->setText("Left"); btnLeft->setCheckable(true); btnLeft->setChecked(true); -// btnRight->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); -// btnRight->setText("Right"); btnRight->setCheckable(true); group->addButton(btnRight); group->addButton(btnLeft); @@ -74,10 +70,30 @@ ScanFormWidget::ScanFormWidget(QWidget *parent) : TabFormWidget(parent) { contentLayout->addWidget(broadcast_widget); param_widget->setObjectName("param_widget"); QVBoxLayout* paramLayout =new QVBoxLayout(param_widget); + QLabel* lblPreview = new QLabel(this); + lblPreview->setText("Preview Parameters"); + lblPreview->setObjectName("lbl_title"); + paramLayout->addWidget(lblPreview); + QLabel* lbl_e = new QLabel(this); + lbl_e->setWordWrap(true); + lbl_e->setObjectName("lbl_e"); + lbl_e->setText("some settings\n\nparameters\n"); + paramLayout->addWidget(lbl_e); + QLabel* lbl_end = new QLabel(this); + lbl_end->setObjectName("lbl_end"); + paramLayout->addWidget(lbl_end); QLabel* lblParams = new QLabel(this); lblParams->setText("Scan Parameters"); lblParams->setObjectName("lbl_title"); paramLayout->addWidget(lblParams); + QLabel* lbl_e2 = new QLabel(this); + lbl_e2->setWordWrap(true); + lbl_e2->setObjectName("lbl_e"); + lbl_e2->setText("some settings\n\nparameters\n"); + paramLayout->addWidget(lbl_e2); + QLabel* lbl_end2 = new QLabel(this); + lbl_end2->setObjectName("lbl_end"); + paramLayout->addWidget(lbl_end2); paramLayout->addSpacerItem(new QSpacerItem(20,20,QSizePolicy::Minimum,QSizePolicy::Expanding)); contentLayout->addWidget(param_widget); diff --git a/src/SelectFormWidget.cpp b/src/SelectFormWidget.cpp index 4feb70d..1c6ddf0 100644 --- a/src/SelectFormWidget.cpp +++ b/src/SelectFormWidget.cpp @@ -10,6 +10,10 @@ #include "editpatientform.h" #include "guimacros.h" +#define ADD_CENTER_ITEM(row,col,text)\ + item = new QTableWidgetItem(text);\ + item->setTextAlignment(Qt::AlignmentFlag::AlignCenter);\ + table->setItem(row,col,item); SelectFormWidget::SelectFormWidget(QWidget *parent) : TabFormWidget(parent) @@ -52,24 +56,25 @@ SelectFormWidget::SelectFormWidget(QWidget *parent) : table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); table->setHorizontalHeaderLabels(header); table->setRowCount(3); - table->setItem(0,0,new QTableWidgetItem("Pat010012313")); - table->setItem(0,1,new QTableWidgetItem("XXX")); - table->setItem(0,2,new QTableWidgetItem("Female")); - table->setItem(0,3,new QTableWidgetItem("1978/09/06")); - table->setItem(0,4,new QTableWidgetItem("Added")); - table->setItem(0,5,new QTableWidgetItem("")); - table->setItem(1,0,new QTableWidgetItem("Pat0222222")); - table->setItem(1,1,new QTableWidgetItem("XXX2")); - table->setItem(1,2,new QTableWidgetItem("Female")); - table->setItem(1,3,new QTableWidgetItem("1993/08/16")); - table->setItem(1,4,new QTableWidgetItem("Scanned")); - table->setItem(1,5,new QTableWidgetItem("")); - table->setItem(2,0,new QTableWidgetItem("Pat3")); - table->setItem(2,1,new QTableWidgetItem("XX3")); - table->setItem(2,2,new QTableWidgetItem("Female")); - table->setItem(2,3,new QTableWidgetItem("1999/08/16")); - table->setItem(2,4,new QTableWidgetItem("Scanned")); - table->setItem(2,5,new QTableWidgetItem("")); + QTableWidgetItem* item ; + ADD_CENTER_ITEM(0,0,"Pat010012313"); + ADD_CENTER_ITEM(0,1,"XXX"); + ADD_CENTER_ITEM(0,2,"Female"); + ADD_CENTER_ITEM(0,3,"1978/09/06"); + ADD_CENTER_ITEM(0,4,"Added"); + ADD_CENTER_ITEM(0,5,""); + ADD_CENTER_ITEM(1,0,"Pat0222222"); + ADD_CENTER_ITEM(1,1,"XXX2"); + ADD_CENTER_ITEM(1,2,"Female"); + ADD_CENTER_ITEM(1,3,"1993/08/16"); + ADD_CENTER_ITEM(1,4,"Scanned"); + ADD_CENTER_ITEM(1,5,""); + ADD_CENTER_ITEM(2,0,"Pat3"); + ADD_CENTER_ITEM(2,1,"XX3"); + ADD_CENTER_ITEM(2,2,"Female"); + ADD_CENTER_ITEM(2,3,"1999/08/16"); + ADD_CENTER_ITEM(2,4,"Scanned"); + ADD_CENTER_ITEM(2,5,""); contentLayout->addWidget(table); QWidget* spacerLine2= new QWidget(this); spacerLine2->setFixedWidth(2); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8417da2..6d3e607 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -40,10 +40,10 @@ MainWindow::MainWindow(QWidget *parent) : "QLabel{color:white; font-weight:bold; font-size:16px;}\n" "QWidget#topbarWidget{min-height:36px;max-height:36px;}\n" "QWidget#contentWidget{border-top:1px solid #515151;}\n" - "QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #323232; border-bottom:1px solid #323232;}\n" + "QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #515151; border-bottom:1px solid #323232;}\n" "QLabel#logo{min-width:30px;max-width:30px}\n" "QLabel#company{min-width:150px;max-width:150px}\n" - "QWidget QWidget#statusBarWidget{min-width:300px;max-width:300px}\n" + "QWidget QWidget#statusBarWidget{min-width:300px;}\n" "QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}\n" "QWidget QToolButton:hover{background:#505050;}\n" "QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}" diff --git a/src/tabformwidget.cpp b/src/tabformwidget.cpp index 4770426..9d77771 100644 --- a/src/tabformwidget.cpp +++ b/src/tabformwidget.cpp @@ -1,6 +1,6 @@ #include "tabformwidget.h" #include "ui_tabformwidget.h" - +#include TabFormWidget::TabFormWidget(QWidget *parent) : QWidget(parent), ui(new Ui::TabFormWidget) @@ -8,7 +8,30 @@ TabFormWidget::TabFormWidget(QWidget *parent) : ui->setupUi(this); QPixmap img(":/icons/logo.png"); ui->logo->setPixmap(img.scaledToHeight(33,Qt::SmoothTransformation)); - ui->company->setText(QString("浙江衡玖医疗科技")); + ui->company->setText(QString::fromLocal8Bit("Õã½­ºâ¾ÁÒ½ÁƿƼ¼")); + QLabel* hosp = new QLabel(this); + hosp->setText(QString::fromLocal8Bit("Õã½­´óѧҽѧԺ¸½ÊôµÚ¶þÒ½Ôº ")); + QLabel* nowDate = new QLabel(this); + nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); + QLabel* linkIcon = new QLabel(this); + linkIcon->setPixmap(QPixmap(":/icons/link_g.png").scaledToHeight(20,Qt::SmoothTransformation)); + QLabel* readyIcon = new QLabel(this); + readyIcon->setPixmap(QPixmap(":/icons/ready.png").scaledToHeight(20,Qt::SmoothTransformation)); + QLabel* lockIcon = new QLabel(this); + lockIcon->setPixmap(QPixmap(":/icons/lock.png").scaledToHeight(20,Qt::SmoothTransformation)); + QHBoxLayout* layout= new QHBoxLayout(ui->statusBarWidget); + + layout->addSpacerItem(new QSpacerItem(10,10,QSizePolicy::Expanding)); + layout->addWidget(hosp); + layout->addWidget(nowDate); + QWidget* spacerLine= new QWidget(this); + spacerLine->setFixedWidth(2); + spacerLine->setObjectName("verSpaceLine"); + + layout->addWidget(spacerLine); + layout->addWidget(linkIcon); + layout->addWidget(readyIcon); + layout->addWidget(lockIcon); } TabFormWidget::~TabFormWidget()