mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-06-29 18:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

update qt setup

Browse Source 
old-commit-hash: 204d878c6f538891f36073cf364f14c6561126d9
This commit is contained in:
Comma Device
2021-04-01 22:12:33 -07:00
parent df17f65c61
commit c671dca363
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/networking.cc
+3 -2
View File
@@ -4,6 +4,7 @@
#include <QPixmap>
#include "networking.hpp"
#include "widgets/scrollview.hpp"
void clearLayout(QLayout* layout) {
while (QLayoutItem* item = layout->takeAt(0)) {
@@ -57,9 +58,9 @@ void Networking::attemptInitialization(){
vlayout->addSpacing(10);
}
wifiWidget = new WifiUI(0, wifi);
wifiWidget = new WifiUI(this, wifi);
connect(wifiWidget, SIGNAL(connectToNetwork(Network)), this, SLOT(connectToNetwork(Network)));
vlayout->addWidget(wifiWidget, 1);
vlayout->addWidget(new ScrollView(wifiWidget, this), 1);
QWidget* wifiScreen = new QWidget(this);
wifiScreen->setLayout(vlayout);
selfdrive/ui/qt/setup/setup.cc
+10 -8
View File
@@ -60,15 +60,17 @@ QWidget * Setup::build_page(QString title, QWidget *content, bool next, bool pre
QHBoxLayout *nav_layout = new QHBoxLayout();
QPushButton *back_btn = new QPushButton("Back");
nav_layout->addWidget(back_btn, 0, Qt::AlignBottom | Qt::AlignLeft);
QObject::connect(back_btn, SIGNAL(released()), this, SLOT(prevPage()));
back_btn->setVisible(prev);
if (prev) {
QPushButton *back_btn = new QPushButton("Back");
nav_layout->addWidget(back_btn, 1, Qt::AlignBottom | Qt::AlignLeft);
QObject::connect(back_btn, SIGNAL(released()), this, SLOT(prevPage()));
}
QPushButton *continue_btn = new QPushButton("Continue");
nav_layout->addWidget(continue_btn, 0, Qt::AlignBottom | Qt::AlignRight);
QObject::connect(continue_btn, SIGNAL(released()), this, SLOT(nextPage()));
continue_btn->setVisible(next);
if (next) {
QPushButton *continue_btn = new QPushButton("Continue");
nav_layout->addWidget(continue_btn, 0, Qt::AlignBottom | Qt::AlignRight);
QObject::connect(continue_btn, SIGNAL(released()), this, SLOT(nextPage()));
}
main_layout->addLayout(nav_layout, 0);
selfdrive/ui/qt/widgets/scrollview.cc
+1 -1
View File
@@ -5,7 +5,7 @@ ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent){
setWidgetResizable(true);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setStyleSheet("background-color:transparent;");
setStyleSheet("ScrollView { background-color:transparent; }");
QScroller *scroller = QScroller::scroller(this->viewport());
QScrollerProperties sp = scroller->scrollerProperties();