阶段性完成,还差独立浏览器和几个别的需求。
This commit is contained in:
@ -56,16 +56,13 @@ NavBar::NavBar(MainScreen *mainScreen,QWidget *parent) :
|
||||
config_request.sendRequest(&config_response);
|
||||
SQLiteHelper sqlite_helper;
|
||||
sqlite_helper.get_software(&buttonStructs, &config_response);
|
||||
background_color = config_response.basic.backgroud_color;
|
||||
text_color = config_response.basic.title_color;
|
||||
text_cover_color = config_response.basic.title_cover_color;
|
||||
if(!config_response.succeed)
|
||||
{
|
||||
qColor.setNamedColor(buttonStructs[0].background_color);
|
||||
qColor.setNamedColor(background_color);
|
||||
|
||||
}else
|
||||
{
|
||||
qColor.setNamedColor(config_response.basic.backgroud_color);
|
||||
qColor.setNamedColor(background_color);
|
||||
}
|
||||
layout2 = new QHBoxLayout;
|
||||
layout_right = new QHBoxLayout;
|
||||
@ -89,7 +86,7 @@ NavBar::NavBar(MainScreen *mainScreen,QWidget *parent) :
|
||||
MyButton *myButton = new MyButton(buttonStruct, height(), height(), &buttons,this);
|
||||
myButton->setMaximumHeight(parent->height() / 8);
|
||||
layout_right->addWidget(myButton);
|
||||
//myButton->show();
|
||||
myButton->show();
|
||||
connect(myButton, &MyButton::clicked1, mainWindowLayout, &MainWindowLayout::clickButton);
|
||||
buttons << myButton;
|
||||
}
|
||||
|
Reference in New Issue
Block a user