spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify settings a bit (#2384)

pull/2391/head
Willem Melching 2020-10-22 17:11:52 +02:00 committed by GitHub
parent 0aaeaef79d
commit 118faa71e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
selfdrive/assets/offroad/circled-checkmark-empty.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

48
selfdrive/ui/qt/settings.cc
View File

@ -37,8 +37,10 @@ ParamsToggle::ParamsToggle(QString param, QString title, QString description, QS
QLabel *label = new QLabel(description);
label->setWordWrap(true);
vlayout->addSpacing(50);
vlayout->addWidget(checkbox);
vlayout->addWidget(label);
vlayout->addSpacing(50);
hlayout->addLayout(vlayout);
setLayout(hlayout);
@ -46,7 +48,19 @@ ParamsToggle::ParamsToggle(QString param, QString title, QString description, QS
checkbox->setChecked(Params().read_db_bool(param.toStdString().c_str()));
setStyleSheet(R"(
QCheckBox { font-size: 70px }
QCheckBox {
font-size: 70px;
}
QCheckBox::indicator {
width: 100px;
height: 100px;
}
QCheckBox::indicator:unchecked {
image: url(../assets/offroad/circled-checkmark-empty.png);
}
QCheckBox::indicator:checked {
image: url(../assets/offroad/circled-checkmark.png);
}
QLabel { font-size: 40px }
* {
background-color: #114265;
@ -62,14 +76,15 @@ void ParamsToggle::checkboxClicked(int state){
}
SettingsWindow::SettingsWindow(QWidget *parent) : QWidget(parent) {
QWidget *container = new QWidget(this);
QVBoxLayout *settings_list = new QVBoxLayout();
/*
settings_list->addWidget(new ParamsToggle("OpenpilotEnabledToggle",
"Enable Openpilot",
"Use the openpilot system for adaptive cruise control and lane keep driver assistance. Your attention is required at all times to use this feature. Changing this setting takes effect when the car is powered off.",
"../assets/offroad/icon_openpilot.png"
));
*/
settings_list->addWidget(new ParamsToggle("LaneChangeEnabled",
"Enable Lane Change Assist",
"Perform assisted lane changes with openpilot by checking your surroundings for safety, activating the turn signal and gently nudging the steering wheel towards your desired lane. openpilot is not capable of checking if a lane change is safe. You must continuously observe your surroundings to use this feature.",
@ -80,6 +95,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QWidget(parent) {
"Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line without a turn signal activated while driving over 31mph (50kph).",
"../assets/offroad/icon_warning.png"
));
/*
settings_list->addWidget(new ParamsToggle("RecordFront",
"Record and Upload Driver Camera",
"Upload data from the driver facing camera and help improve the driver monitoring algorithm.",
@ -90,6 +106,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QWidget(parent) {
"Allow openpilot to obey left-hand traffic conventions and perform driver monitoring on right driver seat.",
"../assets/offroad/icon_openpilot_mirrored.png"
));
*/
settings_list->addWidget(new ParamsToggle("IsMetric",
"Use Metric System",
"Display speed in km/h instead of mp/h.",
@ -103,35 +120,28 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QWidget(parent) {
settings_list->setSpacing(25);
QWidget *container = new QWidget(this);
container->setLayout(settings_list);
container->setFixedWidth(1650);
QScrollArea *scrollArea = new QScrollArea;
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea->setWidget(container);
QScrollerProperties sp;
sp.setScrollMetric(QScrollerProperties::DecelerationFactor, 2.0);
QScroller* qs = QScroller::scroller(scrollArea);
qs->setScrollerProperties(sp);
container->setFixedWidth(1900);
QHBoxLayout *main_layout = new QHBoxLayout;
main_layout->addSpacing(50);
main_layout->addWidget(scrollArea);
main_layout->addWidget(container);
QPushButton * button = new QPushButton("Close");
main_layout->addWidget(button);
QVBoxLayout *button_layout = new QVBoxLayout;
QPushButton * button = new QPushButton("X");
button_layout->addWidget(button);
button_layout->addSpacing(900);
main_layout->addLayout(button_layout);
main_layout->addSpacing(20);
setLayout(main_layout);
QScroller::grabGesture(scrollArea, QScroller::LeftMouseButtonGesture);
QObject::connect(button, SIGNAL(clicked()), this, SIGNAL(closeSettings()));
setStyleSheet(R"(
QPushButton { font-size: 40px }
QPushButton { font-size: 100px }
* {
color: white;
background-color: #072339;