From 523358608dbae8964eb8a373cd097b89c56c9891 Mon Sep 17 00:00:00 2001 From: He Chengyuan Date: Thu, 11 Nov 2021 17:21:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=9A=84=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/src/tabwidget.cpp | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/plugin/src/tabwidget.cpp b/plugin/src/tabwidget.cpp index 4bffb4d..0200eed 100644 --- a/plugin/src/tabwidget.cpp +++ b/plugin/src/tabwidget.cpp @@ -649,10 +649,19 @@ void TabWid::slotUpdateCacheProgress(int progress, QString status) void TabWid::allComponents() { - mainTabLayout = new QVBoxLayout(); //整个页面的主布局 - scrollArea = new QScrollArea(this); + //mainTabLayout = new QVBoxLayout(); //整个页面的主布局 + //scrollArea = new QScrollArea(this); +// scrollArea->setAttribute(Qt::WA_StyledBackground,true);// 后加的 +// scrollArea->setAttribute(Qt::WA_DeleteOnClose);// 后加的 updateTab = new QWidget(this); //更新页面 +// QPalette pa = updateTab->palette(); +// pa.setColor(QPalette::Window,"red"); +// updateTab->setPalette(pa); +// updateTab->setAttribute(Qt::WA_StyledBackground,true);//后加的 +// updateTab->setAttribute(Qt::WA_DeleteOnClose); //后加的 + //updateTab->setStyleSheet ("background-color: lightgrey");//后加的 + AppMessage = new QVBoxLayout(); AppMessage->setAlignment(Qt::AlignTop); updateTab->setLayout(AppMessage); @@ -673,11 +682,11 @@ void TabWid::allComponents() labUpdate->adjustSize(); labUpdate->setFixedHeight(27); - scrollArea->setWidget(updateTab); - scrollArea->setFrameStyle(0); - // scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); +// scrollArea->setWidget(updateTab); + //scrollArea->setFrameStyle(0); +// // scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);这句本来就是注销的 - scrollArea->setWidgetResizable(true); + //scrollArea->setWidgetResizable(true); systemWidget->resize(560,140); systemWidget->setFixedHeight(160); @@ -887,11 +896,11 @@ void TabWid::allComponents() AppMessage->addStretch(); AppMessage->setContentsMargins(0,0,28,10); - mainTabLayout->setAlignment(Qt::AlignTop); - mainTabLayout->addWidget(scrollArea); - // mainTabLayout->setSpacing(0); - mainTabLayout->setMargin(0); - this->setLayout(mainTabLayout); + //mainTabLayout->setAlignment(Qt::AlignTop); + //mainTabLayout->addWidget(scrollArea); + //// mainTabLayout->setSpacing(0); + //mainTabLayout->setMargin(0); + //this->setLayout(mainTabLayout); getAllDisplayInformation(); } From a1e50e00b44ca9dcf2ea7b500106d8c227126499 Mon Sep 17 00:00:00 2001 From: He Chengyuan Date: Sat, 13 Nov 2021 10:36:15 +0800 Subject: [PATCH 2/2] promote the plugin of control center on upgrade --- plugin/src/tabwidget.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugin/src/tabwidget.cpp b/plugin/src/tabwidget.cpp index 0200eed..28e3298 100644 --- a/plugin/src/tabwidget.cpp +++ b/plugin/src/tabwidget.cpp @@ -651,21 +651,20 @@ void TabWid::allComponents() { //mainTabLayout = new QVBoxLayout(); //整个页面的主布局 //scrollArea = new QScrollArea(this); -// scrollArea->setAttribute(Qt::WA_StyledBackground,true);// 后加的 -// scrollArea->setAttribute(Qt::WA_DeleteOnClose);// 后加的 +// scrollArea->setAttribute(Qt::WA_StyledBackground,true);// 后加的,取消和父部件的继承关系 - updateTab = new QWidget(this); //更新页面 + + // updateTab = new QWidget(this); //更新页面 // QPalette pa = updateTab->palette(); // pa.setColor(QPalette::Window,"red"); // updateTab->setPalette(pa); -// updateTab->setAttribute(Qt::WA_StyledBackground,true);//后加的 -// updateTab->setAttribute(Qt::WA_DeleteOnClose); //后加的 - //updateTab->setStyleSheet ("background-color: lightgrey");//后加的 + AppMessage = new QVBoxLayout(); AppMessage->setAlignment(Qt::AlignTop); - updateTab->setLayout(AppMessage); - systemWidget = new QFrame(updateTab); + this->setLayout(AppMessage); + //updateTab->setLayout(AppMessage); + systemWidget = new QFrame(); systemWidget->setFrameShape(QFrame::Box); systemPortraitLab = new QLabel(systemWidget); @@ -682,7 +681,7 @@ void TabWid::allComponents() labUpdate->adjustSize(); labUpdate->setFixedHeight(27); -// scrollArea->setWidget(updateTab); + //scrollArea->setWidget(updateTab); //scrollArea->setFrameStyle(0); // // scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);这句本来就是注销的 @@ -890,10 +889,11 @@ void TabWid::allComponents() AppMessage->addWidget(labUpdate); AppMessage->addWidget(systemWidget); AppMessage->addWidget(allUpdateWid); - AppMessage->addWidget(historyUpdateLogWid); + //AppMessage->addWidget(historyUpdateLogWid); AppMessage->addSpacing(30); AppMessage->addWidget(updateSettingWidget); - AppMessage->addStretch(); + //AppMessage->addStretch(); + AppMessage->addWidget(historyUpdateLogWid); AppMessage->setContentsMargins(0,0,28,10); //mainTabLayout->setAlignment(Qt::AlignTop);