第一阶段初稿+修复部分内容
This commit is contained in:
@ -13,23 +13,29 @@ MainWindowLayout::MainWindowLayout(QWidget *parent) :
|
||||
layout=new QVBoxLayout(this);
|
||||
mainWindowLayout = this;
|
||||
ConfigRequest *configRequest = new ConfigRequest;
|
||||
ConfigResponse *configResponse = new ConfigResponse;
|
||||
configResponse = new ConfigResponse;
|
||||
configRequest->sendRequest(configResponse);
|
||||
navBar=new NavBar(configResponse,this);
|
||||
mainScreen=new MainScreen();
|
||||
|
||||
mainScreen = new MainScreen(this);
|
||||
navBar=new NavBar(configResponse,mainScreen,this);
|
||||
navBar->setAttribute(Qt::WA_DeleteOnClose);
|
||||
delete configRequest;
|
||||
//QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::QSizePolicy::Fixed);
|
||||
//navBar->setSizePolicy(sizePolicy);
|
||||
layout->setMargin(0);
|
||||
layout->addWidget(navBar,1);
|
||||
layout->addWidget(mainScreen,7);
|
||||
setLayout(layout);
|
||||
connect(this, &MainWindowLayout::clickButton1, mainScreen, &MainScreen::clickButton1);
|
||||
connect(this,&MainWindowLayout::clickButton1,mainScreen,&MainScreen::clickButton1);
|
||||
}
|
||||
|
||||
MainWindowLayout::~MainWindowLayout() {
|
||||
|
||||
delete configResponse;
|
||||
layout->removeWidget(mainScreen);
|
||||
layout->removeWidget(navBar);
|
||||
delete mainScreen;
|
||||
//delete[] list[0];
|
||||
delete navBar;
|
||||
//delete layout;
|
||||
delete layout;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user