openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'plugin_dev' into 'plugin_dev' 

Plugin dev

See merge request kylin-desktop/update-manager-group/kylin-system-updater!48
This commit is contained in:
He Chengyuan 2021-11-13 02:41:04 +00:00
parent 84e5d1ef9c a1e50e00b4
commit f115b8721b
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugin/src/tabwidget.cpp
View File

@ -689,14 +689,22 @@ 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);// 后加的,取消和父部件的继承关系
// updateTab = new QWidget(this); //更新页面
// QPalette pa = updateTab->palette();
// pa.setColor(QPalette::Window,"red");
// updateTab->setPalette(pa);
updateTab = new QWidget(this); //更新页面
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);
@ -713,11 +721,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);
@ -922,17 +930,18 @@ 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);
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();
}