From a34a779ba20b8c778e429a9258ad389bd641027f Mon Sep 17 00:00:00 2001 From: sshane Date: Wed, 28 Jul 2021 20:23:48 -0700 Subject: [PATCH] ui: grey out unsupported networks (#21753) * grey out unsupported networks * show slash icon * add to qrc --- selfdrive/assets/assets.qrc | 1 + selfdrive/assets/img_circled_slash.svg | 4 ++++ selfdrive/ui/qt/offroad/networking.cc | 15 ++++++++++++--- selfdrive/ui/qt/offroad/networking.h | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 selfdrive/assets/img_circled_slash.svg diff --git a/selfdrive/assets/assets.qrc b/selfdrive/assets/assets.qrc index 5d6a8eae1..1fc6d3591 100644 --- a/selfdrive/assets/assets.qrc +++ b/selfdrive/assets/assets.qrc @@ -2,6 +2,7 @@ img_continue_triangle.svg img_circled_check.svg + img_circled_slash.svg img_eye_open.svg img_eye_closed.svg offroad/icon_lock_closed.svg diff --git a/selfdrive/assets/img_circled_slash.svg b/selfdrive/assets/img_circled_slash.svg new file mode 100644 index 000000000..b10a3938d --- /dev/null +++ b/selfdrive/assets/img_circled_slash.svg @@ -0,0 +1,4 @@ + + + + diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index bba6b213b..c8d0489ff 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -176,6 +176,7 @@ WifiUI::WifiUI(QWidget *parent, WifiManager* wifi) : QWidget(parent), wifi(wifi) } lock = QPixmap(ASSET_PATH + "offroad/icon_lock_closed.svg").scaledToWidth(49, Qt::SmoothTransformation); checkmark = QPixmap(ASSET_PATH + "offroad/icon_checkmark.svg").scaledToWidth(49, Qt::SmoothTransformation); + circled_slash = QPixmap(ASSET_PATH + "img_circled_slash.svg").scaledToWidth(49, Qt::SmoothTransformation); QLabel *scanning = new QLabel("Scanning for networks..."); scanning->setStyleSheet("font-size: 65px;"); @@ -219,6 +220,9 @@ WifiUI::WifiUI(QWidget *parent, WifiManager* wifi) : QWidget(parent), wifi(wifi) #ssidLabel[disconnected=false] { font-weight: 500; } + #ssidLabel:disabled { + color: #696969; + } )"); } @@ -245,10 +249,11 @@ void WifiUI::refresh() { // Clickable SSID label QPushButton *ssidLabel = new QPushButton(network.ssid); ssidLabel->setObjectName("ssidLabel"); - ssidLabel->setEnabled(network.connected == ConnectedType::DISCONNECTED && - network.security_type != SecurityType::UNSUPPORTED); + ssidLabel->setEnabled(network.security_type != SecurityType::UNSUPPORTED); ssidLabel->setProperty("disconnected", network.connected == ConnectedType::DISCONNECTED); - QObject::connect(ssidLabel, &QPushButton::clicked, this, [=]() { emit connectToNetwork(network); }); + if (network.connected == ConnectedType::DISCONNECTED) { + QObject::connect(ssidLabel, &QPushButton::clicked, this, [=]() { emit connectToNetwork(network); }); + } hlayout->addWidget(ssidLabel, network.connected == ConnectedType::CONNECTING ? 0 : 1); if (network.connected == ConnectedType::CONNECTING) { @@ -274,6 +279,10 @@ void WifiUI::refresh() { QLabel *connectIcon = new QLabel(); connectIcon->setPixmap(checkmark); hlayout->addWidget(connectIcon, 0, Qt::AlignRight); + } else if (network.security_type == SecurityType::UNSUPPORTED) { + QLabel *unsupportedIcon = new QLabel(); + unsupportedIcon->setPixmap(circled_slash); + hlayout->addWidget(unsupportedIcon, 0, Qt::AlignRight); } else if (network.security_type == SecurityType::WPA) { QLabel *lockIcon = new QLabel(); lockIcon->setPixmap(lock); diff --git a/selfdrive/ui/qt/offroad/networking.h b/selfdrive/ui/qt/offroad/networking.h index 574af10f9..220ebccf8 100644 --- a/selfdrive/ui/qt/offroad/networking.h +++ b/selfdrive/ui/qt/offroad/networking.h @@ -21,6 +21,7 @@ private: QVBoxLayout* main_layout; QPixmap lock; QPixmap checkmark; + QPixmap circled_slash; QVector strengths; signals: