accept at end + env variables

pull/20392/head
Comma Device 4 years ago
parent 66231a62a4
commit 8c0d765446
  1. 4
      launch_chffrplus.sh
  2. 4
      selfdrive/ui/qt/offroad/onboarding.cc

@ -9,6 +9,10 @@ source "$BASEDIR/launch_env.sh"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
function two_init { function two_init {
export QT_QPA_EGLFS_PHYSICAL_WIDTH=151
export QT_QPA_EGLFS_PHYSICAL_HEIGHT=74
# Wifi scan # Wifi scan
wpa_cli IFNAME=wlan0 SCAN wpa_cli IFNAME=wlan0 SCAN

@ -75,7 +75,7 @@ QWidget* OnboardingWindow::terms_screen() {
buttons->addWidget(new QPushButton("Decline")); buttons->addWidget(new QPushButton("Decline"));
buttons->addSpacing(50); buttons->addSpacing(50);
QPushButton *accept_btn = new QPushButton("Accept"); QPushButton *accept_btn = new QPushButton("Scroll to accept");
accept_btn->setEnabled(false); accept_btn->setEnabled(false);
buttons->addWidget(accept_btn); buttons->addWidget(accept_btn);
QObject::connect(accept_btn, &QPushButton::released, [=]() { QObject::connect(accept_btn, &QPushButton::released, [=]() {
@ -105,6 +105,8 @@ QWidget* OnboardingWindow::terms_screen() {
#endif #endif
QObject::connect(sb, &QScrollBar::valueChanged, [sb, accept_btn]() { QObject::connect(sb, &QScrollBar::valueChanged, [sb, accept_btn]() {
accept_btn->setEnabled(accept_btn->isEnabled() || (sb->value() == sb->maximum())); accept_btn->setEnabled(accept_btn->isEnabled() || (sb->value() == sb->maximum()));
if (sb->value() == sb->maximum())
accept_btn->setText("Accept");
}); });
QWidget *widget = new QWidget; QWidget *widget = new QWidget;

Loading…
Cancel
Save