wip
This commit is contained in:
@@ -30,7 +30,7 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
|
||||
sidebar = new Sidebar(this);
|
||||
main_layout->addWidget(sidebar);
|
||||
QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings);
|
||||
QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::openOnroad);
|
||||
QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::showOnroad);
|
||||
|
||||
slayout = new QStackedLayout();
|
||||
main_layout->addLayout(slayout);
|
||||
@@ -61,8 +61,10 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
|
||||
}
|
||||
|
||||
// Debug function to activate onroad UI
|
||||
void HomeWindow::openOnroad() {
|
||||
void HomeWindow::showOnroad() {
|
||||
sidebar->setVisible(false);
|
||||
slayout->setCurrentWidget(onroad);
|
||||
// sidebar->setVisible(params.getBool("Sidebar"));
|
||||
}
|
||||
|
||||
void HomeWindow::showSidebar(bool show) {
|
||||
@@ -125,7 +127,7 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) {
|
||||
|
||||
void HomeWindow::mouseDoubleClickEvent(QMouseEvent* e) {
|
||||
HomeWindow::mousePressEvent(e);
|
||||
const SubMaster &sm = *(uiState()->sm);
|
||||
// const SubMaster &sm = *(uiState()->sm);
|
||||
}
|
||||
|
||||
// OffroadHome: the offroad home page
|
||||
|
||||
@@ -58,6 +58,7 @@ signals:
|
||||
public slots:
|
||||
void offroadTransition(bool offroad);
|
||||
void showDriverView(bool show, bool started=false);
|
||||
void showOnroad();
|
||||
void showSidebar(bool show);
|
||||
void showMapPanel(bool show);
|
||||
|
||||
|
||||
@@ -127,7 +127,9 @@ void Sidebar::mouseReleaseEvent(QMouseEvent *event) {
|
||||
emit openOnroad();
|
||||
|
||||
} else if (settings_btn.contains(event->pos())) {
|
||||
|
||||
emit openSettings();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user