reset improvements (#21603)

* reset design

* clean up
old-commit-hash: deb67ff870
commatwo_master
Adeeb Shihadeh 4 years ago committed by GitHub
parent b5f5ce739b
commit f03b70a33b
  1. 38
      selfdrive/ui/qt/setup/reset.cc

@ -47,33 +47,39 @@ void Reset::confirm() {
Reset::Reset(bool recover, QWidget *parent) : QWidget(parent) { Reset::Reset(bool recover, QWidget *parent) : QWidget(parent) {
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
main_layout->setContentsMargins(100, 100, 100, 100); main_layout->setContentsMargins(45, 220, 45, 45);
main_layout->setSpacing(0);
QLabel *title = new QLabel("System Reset"); QLabel *title = new QLabel("System Reset");
title->setStyleSheet(R"(font-weight: 500; font-size: 100px;)"); title->setStyleSheet("font-size: 90px; font-weight: 600;");
main_layout->addWidget(title, 0, Qt::AlignTop); main_layout->addWidget(title, 0, Qt::AlignTop | Qt::AlignLeft);
main_layout->addSpacing(60);
body = new QLabel("System reset triggered. Press confirm to erase all content and settings. Press cancel to resume boot."); body = new QLabel("System reset triggered. Press confirm to erase all content and settings. Press cancel to resume boot.");
body->setWordWrap(true); body->setWordWrap(true);
body->setAlignment(Qt::AlignCenter); body->setStyleSheet("font-size: 80px; font-weight: light;");
body->setStyleSheet("font-size: 80px;"); main_layout->addWidget(body, 1, Qt::AlignTop | Qt::AlignLeft);
main_layout->addWidget(body, 1, Qt::AlignCenter);
QHBoxLayout *blayout = new QHBoxLayout(); QHBoxLayout *blayout = new QHBoxLayout();
main_layout->addLayout(blayout); main_layout->addLayout(blayout);
blayout->setSpacing(50);
rejectBtn = new QPushButton("Cancel"); rejectBtn = new QPushButton("Cancel");
blayout->addWidget(rejectBtn, 0, Qt::AlignLeft); blayout->addWidget(rejectBtn);
QObject::connect(rejectBtn, &QPushButton::released, QCoreApplication::instance(), &QCoreApplication::quit); QObject::connect(rejectBtn, &QPushButton::released, QCoreApplication::instance(), &QCoreApplication::quit);
rebootBtn = new QPushButton("Reboot"); rebootBtn = new QPushButton("Reboot");
blayout->addWidget(rebootBtn, 0, Qt::AlignLeft); blayout->addWidget(rebootBtn);
#ifdef __aarch64__
QObject::connect(rebootBtn, &QPushButton::released, [=]{ QObject::connect(rebootBtn, &QPushButton::released, [=]{
std::system("sudo reboot"); std::system("sudo reboot");
}); });
#endif
confirmBtn = new QPushButton("Confirm"); confirmBtn = new QPushButton("Confirm");
blayout->addWidget(confirmBtn, 0, Qt::AlignRight); confirmBtn->setStyleSheet("background-color: #465BEA;");
blayout->addWidget(confirmBtn);
QObject::connect(confirmBtn, &QPushButton::released, this, &Reset::confirm); QObject::connect(confirmBtn, &QPushButton::released, this, &Reset::confirm);
rejectBtn->setVisible(!recover); rejectBtn->setVisible(!recover);
@ -88,13 +94,15 @@ Reset::Reset(bool recover, QWidget *parent) : QWidget(parent) {
color: white; color: white;
background-color: black; background-color: black;
} }
QLabel {
margin-left: 140;
}
QPushButton { QPushButton {
padding: 50px; height: 160;
padding-right: 100px; font-size: 55px;
padding-left: 100px; font-weight: 400;
border: 7px solid white; border-radius: 10px;
border-radius: 20px; background-color: #333333;
font-size: 50px;
} }
)"); )");
} }

Loading…
Cancel
Save