sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

terms & conditions (#21504)

Browse Source 
* looks pretty good

* little closer

* ugh qml

* margin

* scrollbar

* cleanup

* fix line height

* tighter

* little more
old-commit-hash: 53430f87a0
commatwo_master
Adeeb Shihadeh 4 years ago committed by GitHub
parent 691ea8553f
commit 30e5122004
3 changed files with 61 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      selfdrive/assets/offroad/tc.html
  2. 62
      selfdrive/ui/qt/offroad/onboarding.cc
  3. 32
      selfdrive/ui/qt/offroad/text_view.qml

5
selfdrive/assets/offroad/tc.html
Unescape View File

@ -4,14 +4,13 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>openpilot Terms of Service</title> <title>openpilot Terms of Service</title>
<style type="text/css"> <style type="text/css">
body { p {
line-height: 1.7; margin: 45px 0;
} }
</style> </style>
</head> </head>
<body> <body>
<h2 id="openpilot-terms-and-conditions">openpilot Terms and Conditions</h2>
<p>The Terms and Conditions below are effective for all users</p> <p>The Terms and Conditions below are effective for all users</p>
<p>Last Updated on October 18, 2019</p> <p>Last Updated on October 18, 2019</p>
<p>Please read these Terms of Use (“Terms”) carefully before using openpilot which is open-sourced software developed by Comma.ai, Inc., a corporation organized under the laws of Delaware (“comma,” “us,” “we,” or “our”).</p> <p>Please read these Terms of Use (“Terms”) carefully before using openpilot which is open-sourced software developed by Comma.ai, Inc., a corporation organized under the laws of Delaware (“comma,” “us,” “we,” or “our”).</p>

62
selfdrive/ui/qt/offroad/onboarding.cc
Unescape View File

@ -7,6 +7,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include "selfdrive/common/util.h" #include "selfdrive/common/util.h"
#include "selfdrive/ui/qt/util.h"
#include "selfdrive/ui/qt/widgets/input.h" #include "selfdrive/ui/qt/widgets/input.h"
void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
@ -48,43 +49,57 @@ void TermsPage::showEvent(QShowEvent *event) {
} }
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
main_layout->setMargin(40); main_layout->setContentsMargins(45, 35, 45, 45);
main_layout->setSpacing(40); main_layout->setSpacing(0);
QLabel *title = new QLabel("Terms & Conditions");
title->setStyleSheet("font-size: 90px; font-weight: 600;");
main_layout->addWidget(title);
main_layout->addSpacing(30);
QQuickWidget *text = new QQuickWidget(this); QQuickWidget *text = new QQuickWidget(this);
text->setResizeMode(QQuickWidget::SizeRootObjectToView); text->setResizeMode(QQuickWidget::SizeRootObjectToView);
text->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); text->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
text->setAttribute(Qt::WA_AlwaysStackOnTop); text->setAttribute(Qt::WA_AlwaysStackOnTop);
text->setClearColor(Qt::transparent); text->setClearColor(QColor("#1B1B1B"));
QString text_view = util::read_file("../assets/offroad/tc.html").c_str(); QString text_view = util::read_file("../assets/offroad/tc.html").c_str();
text->rootContext()->setContextProperty("text_view", text_view); text->rootContext()->setContextProperty("text_view", text_view);
text->rootContext()->setContextProperty("font_size", 55);
text->setSource(QUrl::fromLocalFile("qt/offroad/text_view.qml")); text->setSource(QUrl::fromLocalFile("qt/offroad/text_view.qml"));
main_layout->addWidget(text); main_layout->addWidget(text, 1);
main_layout->addSpacing(50);
QObject *obj = (QObject*)text->rootObject(); QObject *obj = (QObject*)text->rootObject();
QObject::connect(obj, SIGNAL(qmlSignal()), SLOT(enableAccept())); QObject::connect(obj, SIGNAL(scroll()), SLOT(enableAccept()));
QHBoxLayout* buttons = new QHBoxLayout; QHBoxLayout* buttons = new QHBoxLayout;
buttons->setMargin(0);
buttons->setSpacing(45);
main_layout->addLayout(buttons); main_layout->addLayout(buttons);
QPushButton *decline_btn = new QPushButton("Decline"); QPushButton *decline_btn = new QPushButton("Decline");
buttons->addWidget(decline_btn); buttons->addWidget(decline_btn);
QObject::connect(decline_btn, &QPushButton::released, this, &TermsPage::declinedTerms); QObject::connect(decline_btn, &QPushButton::released, this, &TermsPage::declinedTerms);
buttons->addSpacing(50);
accept_btn = new QPushButton("Scroll to accept"); accept_btn = new QPushButton("Scroll to accept");
accept_btn->setEnabled(false); accept_btn->setEnabled(false);
accept_btn->setStyleSheet(R"(
QPushButton {
background-color: #465BEA;
}
QPushButton:disabled {
background-color: #4F4F4F;
}
)");
buttons->addWidget(accept_btn); buttons->addWidget(accept_btn);
QObject::connect(accept_btn, &QPushButton::released, this, &TermsPage::acceptedTerms); QObject::connect(accept_btn, &QPushButton::released, this, &TermsPage::acceptedTerms);
} }
void TermsPage::enableAccept() { void TermsPage::enableAccept() {
accept_btn->setText("Accept"); accept_btn->setText("Agree");
accept_btn->setEnabled(true); accept_btn->setEnabled(true);
} }
@ -94,31 +109,29 @@ void DeclinePage::showEvent(QShowEvent *event) {
} }
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
main_layout->setMargin(40); main_layout->setMargin(45);
main_layout->setSpacing(40); main_layout->setSpacing(40);
QLabel *text = new QLabel(this); QLabel *text = new QLabel(this);
text->setText("You must accept the Terms and Conditions in order to use openpilot!"); text->setText("You must accept the Terms and Conditions in order to use openpilot.");
text->setStyleSheet(R"(font-size: 50px;)"); text->setStyleSheet(R"(font-size: 80px; font-weight: 300; margin: 200px;)");
text->setWordWrap(true);
main_layout->addWidget(text, 0, Qt::AlignCenter); main_layout->addWidget(text, 0, Qt::AlignCenter);
QHBoxLayout* buttons = new QHBoxLayout; QHBoxLayout* buttons = new QHBoxLayout;
buttons->setSpacing(45);
main_layout->addLayout(buttons); main_layout->addLayout(buttons);
QPushButton *back_btn = new QPushButton("Back"); QPushButton *back_btn = new QPushButton("Back");
buttons->addWidget(back_btn); buttons->addWidget(back_btn);
buttons->addSpacing(50);
QObject::connect(back_btn, &QPushButton::released, this, &DeclinePage::getBack); QObject::connect(back_btn, &QPushButton::released, this, &DeclinePage::getBack);
QPushButton *uninstall_btn = new QPushButton("Decline, uninstall openpilot"); QPushButton *uninstall_btn = new QPushButton("Decline, uninstall " + getBrand());
uninstall_btn->setStyleSheet("background-color: #E22C2C;"); uninstall_btn->setStyleSheet("background-color: #B73D3D");
buttons->addWidget(uninstall_btn); buttons->addWidget(uninstall_btn);
QObject::connect(uninstall_btn, &QPushButton::released, [=]() { QObject::connect(uninstall_btn, &QPushButton::released, [=]() {
if (ConfirmationDialog::confirm("Are you sure you want to uninstall?", this)) { Params().putBool("DoUninstall", true);
Params().putBool("DoUninstall", true);
}
}); });
} }
@ -163,14 +176,11 @@ OnboardingWindow::OnboardingWindow(QWidget *parent) : QStackedWidget(parent) {
background-color: black; background-color: black;
} }
QPushButton { QPushButton {
padding: 50px; height: 160px;
font-size: 50px; font-size: 55px;
font-weight: 400;
border-radius: 10px; border-radius: 10px;
background-color: #292929; background-color: #4F4F4F;
}
QPushButton:disabled {
color: #777777;
background-color: #222222;
} }
)"); )");
} }

32
selfdrive/ui/qt/offroad/text_view.qml
Unescape View File

@ -2,32 +2,46 @@ import QtQuick 2.0
Item { Item {
id: root id: root
signal qmlSignal() signal scroll()
Flickable { Flickable {
id: flickArea id: flickArea
objectName: "flickArea" objectName: "flickArea"
anchors.fill: parent anchors.fill: parent
contentHeight: helpText.height contentHeight: helpText.height
contentWidth: helpText.width contentWidth: width - (leftMargin + rightMargin)
bottomMargin: 50
topMargin: 50
rightMargin: 50
leftMargin: 50
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
flickDeceleration: 7500.0 flickDeceleration: 7500.0
maximumFlickVelocity: 10000.0 maximumFlickVelocity: 10000.0
pixelAligned: true pixelAligned: true
onAtYEndChanged: root.qmlSignal() onAtYEndChanged: root.scroll()
Text { Text {
id: helpText id: helpText
width: flickArea.width width: flickArea.contentWidth
font.pixelSize: font_size font.family: "Inter"
font.weight: "Light"
font.pixelSize: 50
textFormat: Text.RichText textFormat: Text.RichText
color: "white" color: "#C9C9C9"
wrapMode: Text.Wrap wrapMode: Text.Wrap
text: text_view text: text_view
} }
} }
}
Rectangle {
id: scrollbar
anchors.right: flickArea.right
anchors.rightMargin: 20
y: flickArea.topMargin + flickArea.visibleArea.yPosition * (flickArea.height - flickArea.bottomMargin - flickArea.topMargin)
width: 12
radius: 6
height: flickArea.visibleArea.heightRatio * (flickArea.height - flickArea.bottomMargin - flickArea.topMargin)
color: "#808080"
}
}

Write Preview
Loading…
Cancel
Save