Skip to content

Commit

Permalink
SetupWidget: remove PrimeAd
Browse files Browse the repository at this point in the history
  • Loading branch information
incognitojam committed May 24, 2023
1 parent 704ee62 commit e08b707
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 8 additions & 5 deletions selfdrive/ui/qt/widgets/prime.cc
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,14 @@ SetupWidget::SetupWidget(QWidget* parent) : QFrame(parent) {
outer_layout->setContentsMargins(0, 0, 0, 0);
outer_layout->addWidget(mainLayout);

primeAd = new PrimeAdWidget;
mainLayout->addWidget(primeAd);

primeUser = new PrimeUserWidget;
mainLayout->addWidget(primeUser);

mainLayout->setCurrentWidget(uiState()->primeType() ? (QWidget*)primeUser : (QWidget*)primeAd);
if (uiState()->primeType()) {
mainLayout->setCurrentWidget((QWidget*)primeUser);
} else {
mainLayout->setVisible(false);
}

setFixedWidth(750);
setStyleSheet(R"(
Expand Down Expand Up @@ -278,13 +279,15 @@ void SetupWidget::replyFinished(const QString &response, bool success) {

if (!json["is_paired"].toBool()) {
mainLayout->setCurrentIndex(0);
mainLayout->setVisible(true);
} else {
popup->reject();

if (prime_type) {
mainLayout->setCurrentWidget(primeUser);
mainLayout->setVisible(true);
} else {
mainLayout->setCurrentWidget(primeAd);
mainLayout->setVisible(false);
}
}
}
1 change: 0 additions & 1 deletion selfdrive/ui/qt/widgets/prime.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class SetupWidget : public QFrame {
private:
PairingPopup *popup;
QStackedWidget *mainLayout;
PrimeAdWidget *primeAd;
PrimeUserWidget *primeUser;

private slots:
Expand Down

0 comments on commit e08b707

Please sign in to comment.