diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index fa257587fc..4f27a836f6 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -278,7 +278,7 @@ void WifiUI::refresh() { QPushButton *forgetBtn = new QPushButton("FORGET"); forgetBtn->setObjectName("forgetBtn"); 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); } }); diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 9d7e571966..c26b64f937 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -44,7 +44,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : ListWidget(parent) { this)); addItem(new ParamControl("IsMetric", "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", this)); addItem(new ParamControl("CommunityFeaturesToggle", @@ -55,7 +55,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : ListWidget(parent) { addItem(new ParamControl("UploadRaw", "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", this)); @@ -267,7 +267,7 @@ QWidget * network_panel(QWidget * parent) { ListWidget *list = new ListWidget(); list->setSpacing(30); // 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(); }); list->addItem(wifiBtn); diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc index 0d235e882c..ddf3d4bd8c 100644 --- a/selfdrive/ui/qt/setup/setup.cc +++ b/selfdrive/ui/qt/setup/setup.cc @@ -87,7 +87,7 @@ QWidget * Setup::network_setup() { main_layout->setContentsMargins(55, 50, 55, 50); // title - QLabel *title = new QLabel("Connect to WiFi"); + QLabel *title = new QLabel("Connect to Wi-Fi"); title->setStyleSheet("font-size: 90px; font-weight: 500;"); main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop); @@ -122,7 +122,7 @@ QWidget * Setup::network_setup() { cont->setEnabled(success); if (success) { const bool cell = networking->wifi->currentNetworkType() == NetworkType::CELL; - cont->setText(cell ? "Continue without WiFi" : "Continue"); + cont->setText(cell ? "Continue without Wi-Fi" : "Continue"); } else { cont->setText("Waiting for internet"); } diff --git a/selfdrive/ui/qt/setup/updater.cc b/selfdrive/ui/qt/setup/updater.cc index d39f6d149f..dfa63fca11 100644 --- a/selfdrive/ui/qt/setup/updater.cc +++ b/selfdrive/ui/qt/setup/updater.cc @@ -29,7 +29,7 @@ Updater::Updater(const QString &updater_path, const QString &manifest_path, QWid 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->setStyleSheet("font-size: 65px;"); layout->addWidget(desc); @@ -40,7 +40,7 @@ Updater::Updater(const QString &updater_path, const QString &manifest_path, QWid hlayout->setSpacing(30); layout->addLayout(hlayout); - QPushButton *connect = new QPushButton("Connect to WiFi"); + QPushButton *connect = new QPushButton("Connect to Wi-Fi"); connect->setObjectName("navBtn"); QObject::connect(connect, &QPushButton::clicked, [=]() { #ifndef QCOM diff --git a/selfdrive/ui/qt/sidebar.h b/selfdrive/ui/qt/sidebar.h index f22f1f732a..6cea9bdb6d 100644 --- a/selfdrive/ui/qt/sidebar.h +++ b/selfdrive/ui/qt/sidebar.h @@ -35,7 +35,7 @@ protected: QImage home_img, settings_img; const QMap network_type = { {cereal::DeviceState::NetworkType::NONE, "--"}, - {cereal::DeviceState::NetworkType::WIFI, "WiFi"}, + {cereal::DeviceState::NetworkType::WIFI, "Wi-Fi"}, {cereal::DeviceState::NetworkType::ETHERNET, "ETH"}, {cereal::DeviceState::NetworkType::CELL2_G, "2G"}, {cereal::DeviceState::NetworkType::CELL3_G, "3G"},