From f78628f9198c38c1f7188372909623311577205e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 17 Feb 2024 13:39:07 -0600 Subject: [PATCH] wip --- selfdrive/ui/qt/window.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 1c25e95..bbb9d28 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -13,14 +13,14 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { QObject::connect(homeWindow, &HomeWindow::openSettings, this, &MainWindow::openSettings); QObject::connect(homeWindow, &HomeWindow::closeSettings, this, &MainWindow::closeSettings); - OscarSettingsWindow = new OscarSettingsWindow(this); - main_layout->addWidget(OscarSettingsWindow); - QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::closeSettings, this, &MainWindow::closeSettings); - QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::reviewTrainingGuide, [=]() { + oscarSettingsWindow = new OscarSettingsWindow(this); + main_layout->addWidget(oscarSettingsWindow); + QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::closeSettings, this, &MainWindow::closeSettings); + QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::reviewTrainingGuide, [=]() { onboardingWindow->showTrainingGuide(); main_layout->setCurrentWidget(onboardingWindow); }); - QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::showDriverView, [=] { + QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::showDriverView, [=] { homeWindow->showDriverView(true); }); @@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { } }); // QObject::connect(device(), &Device::interactiveTimeout, [=]() { - // if (main_layout->currentWidget() == OscarSettingsWindow) { + // if (main_layout->currentWidget() == oscarSettingsWindow) { // closeSettings(); // } // }); @@ -66,8 +66,8 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { } void MainWindow::openSettings(int index, const QString ¶m) { - main_layout->setCurrentWidget(OscarSettingsWindow); - OscarSettingsWindow->setCurrentPanel(index, param); + main_layout->setCurrentWidget(oscarSettingsWindow); + oscarSettingsWindow->setCurrentPanel(index, param); } void MainWindow::closeSettings() { @@ -93,7 +93,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { case QEvent::MouseMove: { // ignore events when device is awakened by resetInteractiveTimeout ignore = !device()->isAwake(); - // if (main_layout->currentWidget() == OscarSettingsWindow) { + // if (main_layout->currentWidget() == oscarSettingsWindow) { // Not working... // device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window // } else {