From 1e64ced75bad7184c8e35bd05d0006b4e5f3a329 Mon Sep 17 00:00:00 2001
From: Mathew-D <mathew_dusome@kprdsb.ca>
Date: Sat, 9 May 2026 12:13:30 -0400
Subject: [PATCH] Added a switch to turn it off and removed hardcoded "VPN"
 string

---
 assets/translations/en.json              |  2 ++
 src/shell/control_center/network_tab.cpp | 28 ++++++++++++++++++++++--
 src/shell/control_center/network_tab.h   |  2 ++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/assets/translations/en.json b/assets/translations/en.json
index ab85f4c66..b46dbbf0f 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -237,7 +237,9 @@
       "wifi": "Wi-Fi",
       "password-prompt": "Enter password",
       "password-prompt-for": "Enter password for {ssid}",
+      "vpn": "VPN",
       "vpns": "VPNs",
+      "wireless": "Wireless",
       "unavailable-title": "NetworkManager unavailable",
       "unavailable-detail": "Install and enable NetworkManager to manage networks from here.",
       "no-networks": "No networks in range"
diff --git a/src/shell/control_center/network_tab.cpp b/src/shell/control_center/network_tab.cpp
index e5aef5fc7..1fbe65e87 100644
--- a/src/shell/control_center/network_tab.cpp
+++ b/src/shell/control_center/network_tab.cpp
@@ -202,7 +202,7 @@ namespace {
       clearBorder();
 
       auto kind = std::make_unique<Label>();
-      kind->setText("VPN");
+      kind->setText(i18n::tr("control-center.network.vpn"));
       kind->setCaptionStyle();
       kind->setFontSize(Style::fontSizeCaption * scale);
       kind->setColor(colorSpecFromRole(ColorRole::OnSurfaceVariant));
@@ -517,6 +517,20 @@ std::unique_ptr<Flex> NetworkTab::createHeaderActions() {
   });
   m_rescanButton = rescan.get();
   row->addChild(std::move(rescan));
+
+  auto vpnLabel = std::make_unique<Label>();
+  vpnLabel->setText(i18n::tr("control-center.network.vpns"));
+  vpnLabel->setFontSize(Style::fontSizeCaption * scale);
+  vpnLabel->setColor(colorSpecFromRole(ColorRole::OnSurfaceVariant));
+  row->addChild(std::move(vpnLabel));
+
+  auto vpnToggle = std::make_unique<Toggle>();
+  vpnToggle->setToggleSize(ToggleSize::Small);
+  vpnToggle->setScale(scale);
+  vpnToggle->setChecked(m_vpnVisible);
+  vpnToggle->setOnChange([this](bool checked) { m_vpnVisible = checked; });
+  m_vpnToggle = vpnToggle.get();
+  row->addChild(std::move(vpnToggle));
   return row;
 }
 
@@ -553,6 +567,7 @@ void NetworkTab::onClose() {
   m_list = nullptr;
   m_rescanButton = nullptr;
   m_wifiToggle = nullptr;
+  m_vpnToggle = nullptr;
   m_disconnectRow = nullptr;
   m_disconnectButton = nullptr;
   m_scanSpinner = nullptr;
@@ -692,7 +707,7 @@ void NetworkTab::rebuildApList(Renderer& renderer) {
     empty->setColor(colorSpecFromRole(ColorRole::OnSurfaceVariant));
     m_list->addChild(std::move(empty));
   } else {
-    if (!vpns.empty()) {
+    if (m_vpnVisible && !vpns.empty()) {
       auto section = std::make_unique<Label>();
       section->setText(i18n::tr("control-center.network.vpns"));
       section->setCaptionStyle();
@@ -719,6 +734,15 @@ void NetworkTab::rebuildApList(Renderer& renderer) {
       }
     }
 
+    if (!aps.empty()) {
+      auto section = std::make_unique<Label>();
+      section->setText(i18n::tr("control-center.network.wireless"));
+      section->setCaptionStyle();
+      section->setFontSize(Style::fontSizeCaption * contentScale());
+      section->setColor(colorSpecFromRole(ColorRole::OnSurfaceVariant));
+      m_list->addChild(std::move(section));
+    }
+
     for (const auto& ap : aps) {
       const bool saved = m_network != nullptr && m_network->hasSavedConnection(ap.ssid);
       auto row = std::make_unique<AccessPointRow>(
diff --git a/src/shell/control_center/network_tab.h b/src/shell/control_center/network_tab.h
index 34a8f2d11..79c7ff7f9 100644
--- a/src/shell/control_center/network_tab.h
+++ b/src/shell/control_center/network_tab.h
@@ -54,9 +54,11 @@ private:
 
   Button* m_rescanButton = nullptr;
   Toggle* m_wifiToggle = nullptr;
+  Toggle* m_vpnToggle = nullptr;
   Flex* m_disconnectRow = nullptr;
   Button* m_disconnectButton = nullptr;
   Spinner* m_scanSpinner = nullptr;
+  bool m_vpnVisible = true;
 
   std::string m_lastListKey;
   float m_lastListWidth = -1.0f;