UI: Fix mph and wi-fi spelling (#22334)

* display WiFi as Wi-Fi

* fix typo in metric setting description
pull/22337/head
cydia2020 4 years ago committed by GitHub
parent 67c09b4caf
commit 70e1c9c40c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      selfdrive/ui/qt/offroad/networking.cc
  2. 6
      selfdrive/ui/qt/offroad/settings.cc
  3. 4
      selfdrive/ui/qt/setup/setup.cc
  4. 4
      selfdrive/ui/qt/setup/updater.cc
  5. 2
      selfdrive/ui/qt/sidebar.h

@ -278,7 +278,7 @@ void WifiUI::refresh() {
QPushButton *forgetBtn = new QPushButton("FORGET"); QPushButton *forgetBtn = new QPushButton("FORGET");
forgetBtn->setObjectName("forgetBtn"); forgetBtn->setObjectName("forgetBtn");
QObject::connect(forgetBtn, &QPushButton::clicked, [=]() { QObject::connect(forgetBtn, &QPushButton::clicked, [=]() {
if (ConfirmationDialog::confirm("Forget WiFi Network \"" + QString::fromUtf8(network.ssid) + "\"?", this)) { if (ConfirmationDialog::confirm("Forget Wi-Fi Network \"" + QString::fromUtf8(network.ssid) + "\"?", this)) {
wifi->forgetConnection(network.ssid); wifi->forgetConnection(network.ssid);
} }
}); });

@ -44,7 +44,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : ListWidget(parent) {
this)); this));
addItem(new ParamControl("IsMetric", addItem(new ParamControl("IsMetric",
"Use Metric System", "Use Metric System",
"Display speed in km/h instead of mp/h.", "Display speed in km/h instead of mph.",
"../assets/offroad/icon_metric.png", "../assets/offroad/icon_metric.png",
this)); this));
addItem(new ParamControl("CommunityFeaturesToggle", addItem(new ParamControl("CommunityFeaturesToggle",
@ -55,7 +55,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : ListWidget(parent) {
addItem(new ParamControl("UploadRaw", addItem(new ParamControl("UploadRaw",
"Upload Raw Logs", "Upload Raw Logs",
"Upload full logs and full resolution video by default while on WiFi. If not enabled, individual logs can be marked for upload at my.comma.ai/useradmin.", "Upload full logs and full resolution video by default while on Wi-Fi. If not enabled, individual logs can be marked for upload at my.comma.ai/useradmin.",
"../assets/offroad/icon_network.png", "../assets/offroad/icon_network.png",
this)); this));
@ -267,7 +267,7 @@ QWidget * network_panel(QWidget * parent) {
ListWidget *list = new ListWidget(); ListWidget *list = new ListWidget();
list->setSpacing(30); list->setSpacing(30);
// wifi + tethering buttons // wifi + tethering buttons
auto wifiBtn = new ButtonControl("WiFi Settings", "OPEN"); auto wifiBtn = new ButtonControl("Wi-Fi Settings", "OPEN");
QObject::connect(wifiBtn, &ButtonControl::clicked, [=]() { HardwareEon::launch_wifi(); }); QObject::connect(wifiBtn, &ButtonControl::clicked, [=]() { HardwareEon::launch_wifi(); });
list->addItem(wifiBtn); list->addItem(wifiBtn);

@ -87,7 +87,7 @@ QWidget * Setup::network_setup() {
main_layout->setContentsMargins(55, 50, 55, 50); main_layout->setContentsMargins(55, 50, 55, 50);
// title // title
QLabel *title = new QLabel("Connect to WiFi"); QLabel *title = new QLabel("Connect to Wi-Fi");
title->setStyleSheet("font-size: 90px; font-weight: 500;"); title->setStyleSheet("font-size: 90px; font-weight: 500;");
main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop); main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop);
@ -122,7 +122,7 @@ QWidget * Setup::network_setup() {
cont->setEnabled(success); cont->setEnabled(success);
if (success) { if (success) {
const bool cell = networking->wifi->currentNetworkType() == NetworkType::CELL; const bool cell = networking->wifi->currentNetworkType() == NetworkType::CELL;
cont->setText(cell ? "Continue without WiFi" : "Continue"); cont->setText(cell ? "Continue without Wi-Fi" : "Continue");
} else { } else {
cont->setText("Waiting for internet"); cont->setText("Waiting for internet");
} }

@ -29,7 +29,7 @@ Updater::Updater(const QString &updater_path, const QString &manifest_path, QWid
layout->addSpacing(75); layout->addSpacing(75);
QLabel *desc = new QLabel("An operating system update is required. Connect your device to WiFi for the fastest update experience. The download size is approximately 1GB."); QLabel *desc = new QLabel("An operating system update is required. Connect your device to Wi-Fi for the fastest update experience. The download size is approximately 1GB.");
desc->setWordWrap(true); desc->setWordWrap(true);
desc->setStyleSheet("font-size: 65px;"); desc->setStyleSheet("font-size: 65px;");
layout->addWidget(desc); layout->addWidget(desc);
@ -40,7 +40,7 @@ Updater::Updater(const QString &updater_path, const QString &manifest_path, QWid
hlayout->setSpacing(30); hlayout->setSpacing(30);
layout->addLayout(hlayout); layout->addLayout(hlayout);
QPushButton *connect = new QPushButton("Connect to WiFi"); QPushButton *connect = new QPushButton("Connect to Wi-Fi");
connect->setObjectName("navBtn"); connect->setObjectName("navBtn");
QObject::connect(connect, &QPushButton::clicked, [=]() { QObject::connect(connect, &QPushButton::clicked, [=]() {
#ifndef QCOM #ifndef QCOM

@ -35,7 +35,7 @@ protected:
QImage home_img, settings_img; QImage home_img, settings_img;
const QMap<cereal::DeviceState::NetworkType, QString> network_type = { const QMap<cereal::DeviceState::NetworkType, QString> network_type = {
{cereal::DeviceState::NetworkType::NONE, "--"}, {cereal::DeviceState::NetworkType::NONE, "--"},
{cereal::DeviceState::NetworkType::WIFI, "WiFi"}, {cereal::DeviceState::NetworkType::WIFI, "Wi-Fi"},
{cereal::DeviceState::NetworkType::ETHERNET, "ETH"}, {cereal::DeviceState::NetworkType::ETHERNET, "ETH"},
{cereal::DeviceState::NetworkType::CELL2_G, "2G"}, {cereal::DeviceState::NetworkType::CELL2_G, "2G"},
{cereal::DeviceState::NetworkType::CELL3_G, "3G"}, {cereal::DeviceState::NetworkType::CELL3_G, "3G"},

Loading…
Cancel
Save