From 9aca0022de64cca887ef8ff4aff92c80371ba9c9 Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Tue, 28 Jul 2026 12:20:57 +0100
Subject: [PATCH] feat: add switch profile entry points

---
 src/SwitchifyPc.App/App.xaml.cs               | 21 +++---
 src/SwitchifyPc.App/IndependentWindowHost.cs  | 39 ++++++++++
 src/SwitchifyPc.App/MainWindow.xaml           |  6 ++
 src/SwitchifyPc.App/MainWindow.xaml.cs        | 10 ++-
 src/SwitchifyPc.App/NativeTrayIcon.cs         | 45 ++++++++----
 .../IndependentWindowHostTests.cs             | 61 ++++++++++++++++
 src/SwitchifyPc.Tests/MainWindowTests.cs      | 29 ++++++++
 src/SwitchifyPc.Tests/NativeTrayIconTests.cs  | 71 +++++++++++++++++++
 8 files changed, 257 insertions(+), 25 deletions(-)
 create mode 100644 src/SwitchifyPc.App/IndependentWindowHost.cs
 create mode 100644 src/SwitchifyPc.Tests/IndependentWindowHostTests.cs
 create mode 100644 src/SwitchifyPc.Tests/NativeTrayIconTests.cs

diff --git a/src/SwitchifyPc.App/App.xaml.cs b/src/SwitchifyPc.App/App.xaml.cs
index 5726dd1..d249532 100644
--- a/src/SwitchifyPc.App/App.xaml.cs
+++ b/src/SwitchifyPc.App/App.xaml.cs
@@ -37,7 +37,7 @@ public partial class App : System.Windows.Application
     private WindowsExistingInstanceSignal? existingInstanceSignal;
     private NativeTrayIcon? trayIcon;
     private SettingsWindow? settingsWindow;
-    private SwitchControlProfileWindow? switchControlProfileWindow;
+    private IndependentWindowHost<SwitchControlProfileWindow>? switchControlProfileWindowHost;
     private SetupGuideWindow? setupGuideWindow;
     private MainWindowViewModel mainWindowViewModel = new();
     private SetupGuideViewModel setupGuideViewModel = new();
@@ -114,6 +114,7 @@ protected override void OnStartup(StartupEventArgs e)
         trayIcon = new NativeTrayIcon(
             ShowMainWindow,
             ShowSettingsWindow,
+            ShowSwitchControlProfiles,
             TrayStatusText,
             CanDisconnectBluetoothDevices,
             DisconnectBluetoothDevices,
@@ -171,7 +172,7 @@ protected override void OnExit(ExitEventArgs e)
         trayIcon?.Dispose();
         trayIcon = null;
         settingsWindow = null;
-        switchControlProfileWindow = null;
+        switchControlProfileWindowHost = null;
         setupGuideWindow = null;
         telemetryReporter?.Dispose();
         telemetryReporter = null;
@@ -201,7 +202,8 @@ private Window CreateMainWindow()
             InstallAvailableUpdateAsync,
             DisconnectBluetoothDevices,
             AcceptPairingApprovalAsync,
-            RejectPairingApproval);
+            RejectPairingApproval,
+            ShowSwitchControlProfiles);
         window.Closing += (_, eventArgs) =>
         {
             if (isQuitting) return;
@@ -296,16 +298,11 @@ private void ShowSwitchControlProfiles()
     {
         switchControlProfileStore ??= new JsonSwitchControlProfileStore(
             Path.Combine(UserDataDirectory(), "switch-control-profiles.json"));
-        if (switchControlProfileWindow is null)
-        {
-            switchControlProfileWindow = new SwitchControlProfileWindow(
+        switchControlProfileWindowHost ??= new IndependentWindowHost<SwitchControlProfileWindow>(
+            () => new SwitchControlProfileWindow(
                 switchControlProfileStore,
-                () => switchControlSessionManager?.ActiveProfileId);
-            switchControlProfileWindow.Closed += (_, _) => switchControlProfileWindow = null;
-        }
-        switchControlProfileWindow.Owner = settingsWindow;
-        switchControlProfileWindow.Show();
-        switchControlProfileWindow.Activate();
+                () => switchControlSessionManager?.ActiveProfileId));
+        switchControlProfileWindowHost.Show();
     }
 
     private static void CenterWindow(Window window)
diff --git a/src/SwitchifyPc.App/IndependentWindowHost.cs b/src/SwitchifyPc.App/IndependentWindowHost.cs
new file mode 100644
index 0000000..bb63b91
--- /dev/null
+++ b/src/SwitchifyPc.App/IndependentWindowHost.cs
@@ -0,0 +1,39 @@
+using System.Windows;
+
+namespace SwitchifyPc.App;
+
+internal sealed class IndependentWindowHost<TWindow>
+    where TWindow : Window
+{
+    private readonly Func<TWindow> createWindow;
+    private TWindow? window;
+
+    public IndependentWindowHost(Func<TWindow> createWindow)
+    {
+        this.createWindow = createWindow;
+    }
+
+    public TWindow Show()
+    {
+        TWindow current = window ?? CreateWindow();
+        current.Owner = null;
+        current.Show();
+        current.WindowState = WindowState.Normal;
+        current.Activate();
+        return current;
+    }
+
+    private TWindow CreateWindow()
+    {
+        TWindow created = createWindow();
+        window = created;
+        created.Closed += (_, _) =>
+        {
+            if (ReferenceEquals(window, created))
+            {
+                window = null;
+            }
+        };
+        return created;
+    }
+}
diff --git a/src/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml
index 63f5be0..7cfe7c2 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml
+++ b/src/SwitchifyPc.App/MainWindow.xaml
@@ -271,6 +271,12 @@
                                        FontWeight="SemiBold"
                                        AutomationProperties.LiveSetting="Polite"
                                        Visibility="{Binding HasActiveSwitchControlProfile, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            <Button Margin="0,14,0,0"
+                                    HorizontalAlignment="Center"
+                                    Padding="16,8"
+                                    Content="Switch control profiles"
+                                    AutomationProperties.Name="Switch control profiles"
+                                    Click="OpenSwitchControlProfiles_Click" />
 
                             <Border Margin="0,14,0,0"
                                     Background="{DynamicResource AccentContainer}"
diff --git a/src/SwitchifyPc.App/MainWindow.xaml.cs b/src/SwitchifyPc.App/MainWindow.xaml.cs
index 49944de..753df48 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml.cs
+++ b/src/SwitchifyPc.App/MainWindow.xaml.cs
@@ -8,6 +8,7 @@ namespace SwitchifyPc.App;
 public partial class MainWindow : Window
 {
     private readonly Action? openSettings;
+    private readonly Action? openSwitchControlProfiles;
     private readonly Action? openSetupGuide;
     private readonly Func<Task<UpdateApplyResult>>? installUpdate;
     private readonly Action? disconnectDevices;
@@ -22,9 +23,11 @@ public MainWindow(
         Func<Task<UpdateApplyResult>>? installUpdate = null,
         Action? disconnectDevices = null,
         Func<string, Task>? acceptPairingApproval = null,
-        Action<string>? rejectPairingApproval = null)
+        Action<string>? rejectPairingApproval = null,
+        Action? openSwitchControlProfiles = null)
     {
         this.openSettings = openSettings;
+        this.openSwitchControlProfiles = openSwitchControlProfiles;
         this.openSetupGuide = openSetupGuide;
         this.installUpdate = installUpdate;
         this.disconnectDevices = disconnectDevices;
@@ -39,6 +42,11 @@ private void OpenSettings_Click(object sender, RoutedEventArgs e)
         openSettings?.Invoke();
     }
 
+    private void OpenSwitchControlProfiles_Click(object sender, RoutedEventArgs e)
+    {
+        openSwitchControlProfiles?.Invoke();
+    }
+
     private void OpenSetupGuide_Click(object sender, RoutedEventArgs e)
     {
         openSetupGuide?.Invoke();
diff --git a/src/SwitchifyPc.App/NativeTrayIcon.cs b/src/SwitchifyPc.App/NativeTrayIcon.cs
index f4494dc..60bf7a0 100644
--- a/src/SwitchifyPc.App/NativeTrayIcon.cs
+++ b/src/SwitchifyPc.App/NativeTrayIcon.cs
@@ -5,12 +5,39 @@ namespace SwitchifyPc.App;
 public sealed class NativeTrayIcon : IDisposable
 {
     private readonly Forms.NotifyIcon notifyIcon;
-    private readonly Forms.ToolStripMenuItem statusItem;
-    private readonly Forms.ToolStripMenuItem disconnectItem;
 
     public NativeTrayIcon(
         Action showMainWindow,
         Action showSettingsWindow,
+        Action showSwitchControlProfiles,
+        Func<string> statusText,
+        Func<bool> canDisconnect,
+        Action disconnectDevices,
+        Action quit)
+    {
+        Forms.ContextMenuStrip menu = CreateMenu(
+            showMainWindow,
+            showSettingsWindow,
+            showSwitchControlProfiles,
+            statusText,
+            canDisconnect,
+            disconnectDevices,
+            quit);
+
+        notifyIcon = new Forms.NotifyIcon
+        {
+            Icon = LoadAppIcon(),
+            Text = "Switchify PC",
+            ContextMenuStrip = menu,
+            Visible = true
+        };
+        notifyIcon.DoubleClick += (_, _) => showMainWindow();
+    }
+
+    internal static Forms.ContextMenuStrip CreateMenu(
+        Action showMainWindow,
+        Action showSettingsWindow,
+        Action showSwitchControlProfiles,
         Func<string> statusText,
         Func<bool> canDisconnect,
         Action disconnectDevices,
@@ -19,12 +46,13 @@ public NativeTrayIcon(
         Forms.ContextMenuStrip menu = new();
         menu.Items.Add("Show Switchify PC", null, (_, _) => showMainWindow());
         menu.Items.Add("Open settings", null, (_, _) => showSettingsWindow());
+        menu.Items.Add("Switch control profiles", null, (_, _) => showSwitchControlProfiles());
         menu.Items.Add(new Forms.ToolStripSeparator());
-        statusItem = new Forms.ToolStripMenuItem("Status unavailable")
+        Forms.ToolStripMenuItem statusItem = new("Status unavailable")
         {
             Enabled = false
         };
-        disconnectItem = new Forms.ToolStripMenuItem("Disconnect devices", null, (_, _) => disconnectDevices());
+        Forms.ToolStripMenuItem disconnectItem = new("Disconnect devices", null, (_, _) => disconnectDevices());
         menu.Items.Add(statusItem);
         menu.Items.Add(disconnectItem);
         menu.Items.Add(new Forms.ToolStripSeparator());
@@ -35,14 +63,7 @@ public NativeTrayIcon(
             disconnectItem.Enabled = canDisconnect();
         };
 
-        notifyIcon = new Forms.NotifyIcon
-        {
-            Icon = LoadAppIcon(),
-            Text = "Switchify PC",
-            ContextMenuStrip = menu,
-            Visible = true
-        };
-        notifyIcon.DoubleClick += (_, _) => showMainWindow();
+        return menu;
     }
 
     public void Dispose()
diff --git a/src/SwitchifyPc.Tests/IndependentWindowHostTests.cs b/src/SwitchifyPc.Tests/IndependentWindowHostTests.cs
new file mode 100644
index 0000000..d9c180a
--- /dev/null
+++ b/src/SwitchifyPc.Tests/IndependentWindowHostTests.cs
@@ -0,0 +1,61 @@
+using System.Threading;
+using System.Windows;
+using SwitchifyPc.App;
+
+namespace SwitchifyPc.Tests;
+
+[Collection(WpfTestCollection.Name)]
+public sealed class IndependentWindowHostTests
+{
+    [Fact]
+    public void ReusesRestoresAndKeepsWindowIndependent()
+    {
+        RunOnSta(() =>
+        {
+            int created = 0;
+            Window owner = new();
+            owner.Show();
+            IndependentWindowHost<Window> host = new(() =>
+            {
+                created++;
+                return new Window { Owner = owner };
+            });
+
+            Window first = host.Show();
+            first.WindowState = WindowState.Minimized;
+            Window second = host.Show();
+
+            Assert.Same(first, second);
+            Assert.Equal(1, created);
+            Assert.Null(second.Owner);
+            Assert.Equal(WindowState.Normal, second.WindowState);
+
+            second.Close();
+            Window third = host.Show();
+            Assert.NotSame(first, third);
+            Assert.Equal(2, created);
+            third.Close();
+            owner.Close();
+        });
+    }
+
+    private static void RunOnSta(Action action)
+    {
+        Exception? error = null;
+        Thread thread = new(() =>
+        {
+            try
+            {
+                action();
+            }
+            catch (Exception exception)
+            {
+                error = exception;
+            }
+        });
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+        if (error is not null) throw error;
+    }
+}
diff --git a/src/SwitchifyPc.Tests/MainWindowTests.cs b/src/SwitchifyPc.Tests/MainWindowTests.cs
index 1ae17f2..5022024 100644
--- a/src/SwitchifyPc.Tests/MainWindowTests.cs
+++ b/src/SwitchifyPc.Tests/MainWindowTests.cs
@@ -78,6 +78,35 @@ public void MainWindowShowsSetupGuideEntryWithoutLegacyDownloadCard()
         });
     }
 
+    [Fact]
+    public void SwitchControlProfilesEntryRunsProfileAction()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            int calls = 0;
+            MainWindow window = new(
+                new MainWindowViewModel(),
+                openSwitchControlProfiles: () => calls++);
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                WpfButton button = Assert.IsType<WpfButton>(ButtonByContent(window, "Switch control profiles"));
+                Assert.Equal("Switch control profiles", AutomationProperties.GetName(button));
+
+                button.RaiseEvent(new RoutedEventArgs(WpfButton.ClickEvent));
+
+                Assert.Equal(1, calls);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     [Fact]
     public void MainWindowUsesCustomChrome()
     {
diff --git a/src/SwitchifyPc.Tests/NativeTrayIconTests.cs b/src/SwitchifyPc.Tests/NativeTrayIconTests.cs
new file mode 100644
index 0000000..0fe1559
--- /dev/null
+++ b/src/SwitchifyPc.Tests/NativeTrayIconTests.cs
@@ -0,0 +1,71 @@
+using System.Threading;
+using SwitchifyPc.App;
+using Forms = System.Windows.Forms;
+
+namespace SwitchifyPc.Tests;
+
+public sealed class NativeTrayIconTests
+{
+    [Fact]
+    public void MenuOffersDirectSwitchControlProfilesEntry()
+    {
+        RunOnSta(() =>
+        {
+            int mainCalls = 0;
+            int settingsCalls = 0;
+            int profileCalls = 0;
+            int disconnectCalls = 0;
+            int quitCalls = 0;
+            using Forms.ContextMenuStrip menu = NativeTrayIcon.CreateMenu(
+                () => mainCalls++,
+                () => settingsCalls++,
+                () => profileCalls++,
+                () => "Status: Bluetooth ready.",
+                () => true,
+                () => disconnectCalls++,
+                () => quitCalls++);
+
+            Assert.Equal(
+                [
+                    "Show Switchify PC",
+                    "Open settings",
+                    "Switch control profiles",
+                    "Status unavailable",
+                    "Disconnect devices",
+                    "Quit"
+                ],
+                menu.Items.OfType<Forms.ToolStripMenuItem>().Select(item => item.Text));
+
+            Forms.ToolStripMenuItem profileItem = menu.Items
+                .OfType<Forms.ToolStripMenuItem>()
+                .Single(item => item.Text == "Switch control profiles");
+            profileItem.PerformClick();
+
+            Assert.Equal(1, profileCalls);
+            Assert.Equal(0, mainCalls);
+            Assert.Equal(0, settingsCalls);
+            Assert.Equal(0, disconnectCalls);
+            Assert.Equal(0, quitCalls);
+        });
+    }
+
+    private static void RunOnSta(Action action)
+    {
+        Exception? error = null;
+        Thread thread = new(() =>
+        {
+            try
+            {
+                action();
+            }
+            catch (Exception exception)
+            {
+                error = exception;
+            }
+        });
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+        if (error is not null) throw error;
+    }
+}