diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 32bb065..abb960d 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/MonitorUI/MonitorUI.h b/MonitorUI/MonitorUI.h index 3712d17..c939398 100644 --- a/MonitorUI/MonitorUI.h +++ b/MonitorUI/MonitorUI.h @@ -32,6 +32,7 @@ public: QPushButton *failureButton; QPushButton *runButton; QWidget *fillWidget; + QWidget *filterWidget; QList> tagList; @@ -39,6 +40,8 @@ public: { if (MonitorWidget->objectName().isEmpty()) MonitorWidget->setObjectName(QString::fromUtf8("MonitorWidget")); + filterWidget = new QWidget(); + verticalLayout = new QVBoxLayout(MonitorWidget); verticalLayout->setSpacing(0); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); @@ -89,7 +92,6 @@ public: QScrollArea *scrollArea = new QScrollArea(); - fillWidget->setFixedHeight(scrollArea->height()); scrollArea->setWidget(fillWidget); scrollArea->setWidgetResizable(true); @@ -103,38 +105,41 @@ public: filterlLayout = new QHBoxLayout(); filterlLayout->setObjectName(QString::fromUtf8("filterlLayout")); - interruptedButton = new QPushButton(MonitorWidget); + interruptedButton = new QPushButton(filterWidget); interruptedButton->setObjectName(QString::fromUtf8("interruptedButton")); filterlLayout->addWidget(interruptedButton); - normalButton = new QPushButton(MonitorWidget); + normalButton = new QPushButton(filterWidget); normalButton->setObjectName(QString::fromUtf8("normalButton")); filterlLayout->addWidget(normalButton); - standbyButton = new QPushButton(MonitorWidget); + standbyButton = new QPushButton(filterWidget); standbyButton->setObjectName(QString::fromUtf8("standbyButton")); filterlLayout->addWidget(standbyButton); - hutdownButton = new QPushButton(MonitorWidget); + hutdownButton = new QPushButton(filterWidget); hutdownButton->setObjectName(QString::fromUtf8("hutdownButton")); filterlLayout->addWidget(hutdownButton); - failureButton = new QPushButton(MonitorWidget); + failureButton = new QPushButton(filterWidget); failureButton->setObjectName(QString::fromUtf8("failureButton")); filterlLayout->addWidget(failureButton); - runButton = new QPushButton(MonitorWidget); + runButton = new QPushButton(filterWidget); runButton->setObjectName(QString::fromUtf8("runButton")); filterlLayout->addWidget(runButton); - verticalLayout->addLayout(filterlLayout); + filterWidget->setLayout(filterlLayout); + filterWidget->setObjectName(QString::fromUtf8("filterWidget")); + + verticalLayout->addWidget(filterWidget); verticalLayout->setStretch(0, 2); verticalLayout->setStretch(1, 30); diff --git a/Static/DamQSS.Qss b/Static/DamQSS.Qss index 9661219..6067c90 100644 --- a/Static/DamQSS.Qss +++ b/Static/DamQSS.Qss @@ -6,6 +6,15 @@ QWidget#MonitorTag{ border-color: #1E6C92; } +QWidget#filterWidget{ + + background-color: #1B2838; + border-radius: 10px; + border: 3px solid; + border-color: #1C526A; + +} + QLabel#speedLabel{ color: #DDDDE9;