mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-07 19:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: header imports

Browse Source
This commit is contained in:
Jaosn Wen
2024-07-17 23:07:32 -04:00
parent f6ee3d69f4
commit eb0ced8040
4 changed files with 10 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/settings.h
+2 -1
View File
@@ -11,15 +11,16 @@
#include <QTimer>
#include <QWidget>
#include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/util.h"
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
#define ListWidget ListWidgetSP
#define ParamControl ParamControlSP
#define ButtonParamControl ButtonParamControlSP
#else
#include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/widgets/controls.h"
#endif
selfdrive/ui/qt/request_repeater.h
+4
View File
@@ -3,7 +3,11 @@
#include "common/swaglog.h"
#include "common/util.h"
#include "selfdrive/ui/qt/api.h"
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
#else
#include "selfdrive/ui/ui.h"
#endif
class RequestRepeater : public HttpRequest {
selfdrive/ui/qt/widgets/cameraview.h
+4
View File
@@ -24,7 +24,11 @@
#include "msgq/visionipc/visionipc_client.h"
#include "system/camerad/cameras/camera_common.h"
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
#else
#include "selfdrive/ui/ui.h"
#endif
const int FRAME_BUFFER_SIZE = 5;
static_assert(FRAME_BUFFER_SIZE <= YUV_BUFFER_COUNT);
selfdrive/ui/sunnypilot/qt/sp_priv_home.cc
-111
View File
@@ -50,114 +50,3 @@ void HomeWindowSP::mousePressEvent(QMouseEvent* e) {
}
}
}
// OffroadHome: the offroad home page
//
// OffroadHomeSP::OffroadHomePS(QWidget* parent) : QFrame(parent) {
// QVBoxLayout* main_layout = new QVBoxLayout(this);
// main_layout->setContentsMargins(40, 40, 40, 40);
//
// // top header
// QHBoxLayout* header_layout = new QHBoxLayout();
// header_layout->setContentsMargins(0, 0, 0, 0);
// header_layout->setSpacing(16);
//
// update_notif = new QPushButton(tr("UPDATE"));
// update_notif->setVisible(false);
// update_notif->setStyleSheet("background-color: #364DEF;");
// QObject::connect(update_notif, &QPushButton::clicked, [=]() { center_layout->setCurrentIndex(1); });
// header_layout->addWidget(update_notif, 0, Qt::AlignHCenter | Qt::AlignLeft);
//
// alert_notif = new QPushButton();
// alert_notif->setVisible(false);
// alert_notif->setStyleSheet("background-color: #E22C2C;");
// QObject::connect(alert_notif, &QPushButton::clicked, [=] { center_layout->setCurrentIndex(2); });
// header_layout->addWidget(alert_notif, 0, Qt::AlignHCenter | Qt::AlignLeft);
//
// version = new ElidedLabel();
// header_layout->addWidget(version, 0, Qt::AlignHCenter | Qt::AlignRight);
//
// main_layout->addLayout(header_layout);
//
// // main content
// main_layout->addSpacing(25);
// center_layout = new QStackedLayout();
//
// QWidget *home_widget = new QWidget(this);
// {
// QHBoxLayout *home_layout = new QHBoxLayout(home_widget);
// home_layout->setContentsMargins(0, 0, 0, 0);
// home_layout->setSpacing(30);
//
// // left: PrimeAdWidget
// QStackedWidget *left_widget = new QStackedWidget(this);
// QVBoxLayout *left_prime_layout = new QVBoxLayout();
// QWidget *prime_user = new PrimeUserWidget();
// prime_user->setStyleSheet(R"(
// border-radius: 10px;
// background-color: #333333;
// )");
// left_prime_layout->addWidget(prime_user);
// left_prime_layout->addStretch();
// left_widget->addWidget(new LayoutWidget(left_prime_layout));
// left_widget->addWidget(new PrimeAdWidget);
// left_widget->setStyleSheet("border-radius: 10px;");
//
// left_widget->setCurrentIndex(uiState()->hasPrime() ? 0 : 1);
// connect(uiState(), &UIState::primeChanged, [=](bool prime) {
// left_widget->setCurrentIndex(prime ? 0 : 1);
// });
//
// home_layout->addWidget(left_widget, 1);
//
// // right: ExperimentalModeButton, SetupWidget
// QWidget* right_widget = new QWidget(this);
// QVBoxLayout* right_column = new QVBoxLayout(right_widget);
// right_column->setContentsMargins(0, 0, 0, 0);
// right_widget->setFixedWidth(750);
// right_column->setSpacing(30);
//
// ExperimentalModeButton *experimental_mode = new ExperimentalModeButton(this);
// QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings);
// right_column->addWidget(experimental_mode, 1);
//
// SetupWidget *setup_widget = new SetupWidget;
// QObject::connect(setup_widget, &SetupWidget::openSettings, this, &OffroadHome::openSettings);
// right_column->addWidget(setup_widget, 1);
//
// home_layout->addWidget(right_widget, 1);
// }
// center_layout->addWidget(home_widget);
//
// // add update & alerts widgets
// update_widget = new UpdateAlert();
// QObject::connect(update_widget, &UpdateAlert::dismiss, [=]() { center_layout->setCurrentIndex(0); });
// center_layout->addWidget(update_widget);
// alerts_widget = new OffroadAlert();
// QObject::connect(alerts_widget, &OffroadAlert::dismiss, [=]() { center_layout->setCurrentIndex(0); });
// center_layout->addWidget(alerts_widget);
//
// main_layout->addLayout(center_layout, 1);
//
// // set up refresh timer
// timer = new QTimer(this);
// timer->callOnTimeout(this, &OffroadHome::refresh);
//
// setStyleSheet(R"(
// * {
// color: white;
// }
// OffroadHome {
// background-color: black;
// }
// OffroadHome > QPushButton {
// padding: 15px 30px;
// border-radius: 5px;
// font-size: 40px;
// font-weight: 500;
// }
// OffroadHome > QLabel {
// font-size: 55px;
// }
// )");
// }