From ae1f5e0e8c8adf3bbbf4077ea141c7a2012cecab Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 3 Aug 2021 17:29:01 -0700 Subject: [PATCH] remove wifisetup --- selfdrive/ui/SConscript | 1 - selfdrive/ui/qt/setup/wifi.cc | 70 ----------------------------------- selfdrive/ui/qt/setup/wifi.h | 11 ------ 3 files changed, 82 deletions(-) delete mode 100644 selfdrive/ui/qt/setup/wifi.cc delete mode 100644 selfdrive/ui/qt/setup/wifi.h diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 204f6e26b5..e55b6b8a59 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -63,7 +63,6 @@ if arch != 'aarch64' and GetOption('setup'): asset_obj = qt_env.Object("assets", assets) qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs) - qt_env.Program("qt/setup/wifi", ["qt/setup/wifi.cc"], LIBS=qt_libs + ['common', 'json11']) qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs) qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj], LIBS=qt_libs + ['curl', 'common', 'json11']) diff --git a/selfdrive/ui/qt/setup/wifi.cc b/selfdrive/ui/qt/setup/wifi.cc deleted file mode 100644 index 1d7818770a..0000000000 --- a/selfdrive/ui/qt/setup/wifi.cc +++ /dev/null @@ -1,70 +0,0 @@ -#include "selfdrive/ui/qt/setup/wifi.h" - -#include - -#include -#include - -#include -#include - -#include "selfdrive/ui/qt/offroad/networking.h" -#include "selfdrive/ui/qt/qt_window.h" -#include "selfdrive/ui/qt/widgets/input.h" - -void WifiSetup::finish() { - qApp->exit(); -} - -WifiSetup::WifiSetup(QWidget *parent) : QWidget(parent) { - QHBoxLayout *main_layout = new QHBoxLayout(this); - - QPushButton *finish_btn = new QPushButton("Exit"); - finish_btn->setFixedSize(400, 200); - main_layout->addWidget(finish_btn, 0, Qt::AlignTop | Qt::AlignLeft); - - QObject::connect(finish_btn, &QPushButton::clicked, this, &WifiSetup::finish); - - QWidget* n = new Networking(this, true); - - // Next 5 lines to keep the same stylesheet on the networking widget - QWidget* q = new QWidget(); - QLayout* backgroundLayout = new QVBoxLayout(q); - backgroundLayout->addWidget(n); - q->setStyleSheet(R"( - * { - background-color: #292929; - } - )"); - main_layout->addWidget(q, 1); - - setStyleSheet(R"( - * { - background-color: black; - color: white; - font-size: 50px; - } - QVBoxLayout { - padding: 20px; - } - QFrame { - border-radius: 30px; - background-color: #292929; - } - QPushButton { - margin: 40px; - padding: 5px; - border-width: 0; - border-radius: 30px; - color: #dddddd; - background-color: #444444; - } - )"); -} - -int main(int argc, char *argv[]) { - QApplication a(argc, argv); - WifiSetup setup; - setMainWindow(&setup); - return a.exec(); -} diff --git a/selfdrive/ui/qt/setup/wifi.h b/selfdrive/ui/qt/setup/wifi.h deleted file mode 100644 index cb73b4a9a5..0000000000 --- a/selfdrive/ui/qt/setup/wifi.h +++ /dev/null @@ -1,11 +0,0 @@ -#include - -class WifiSetup : public QWidget { - Q_OBJECT - -public: - explicit WifiSetup(QWidget *parent = 0); - -public slots: - void finish(); -};