From 486efa3cc799754c1012027cada59088c7e62e83 Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Tue, 2 Jun 2026 19:12:46 +0200
Subject: [PATCH 1/7] Convert DevTools SettingsCard into a SettingsExpander
 linearly displaying all the buttons it had as individual SettingsCards

---
 Flow.Launcher/Languages/en.xaml               |  1 +
 .../SettingPages/Views/SettingsPaneAbout.xaml | 95 ++++++++++---------
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index dae6ee81b15..86c9041219f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -486,6 +486,7 @@
     <system:String x:Key="userdatapath">User Data Location</system:String>
     <system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
+    <system:String x:Key="openFolderButton">Open Folder</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
     <system:String x:Key="LogLevelNONE">Silent</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 1c33fd89c85..1831eacd339 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -89,52 +89,59 @@
                 <ui:HyperlinkButton Content="icons8.com" NavigateUri="https://icons8.com/" />
             </ui:SettingsCard>
 
-            <ui:SettingsCard Margin="0 14 0 0" Header="{DynamicResource devtool}">
-                <ui:SettingsCard.HeaderIcon>
+            <ui:SettingsExpander Margin="0 14 0 0" Header="{DynamicResource devtool}">
+                <ui:SettingsExpander.HeaderIcon>
                     <ui:FontIcon Glyph="&#xf12b;" />
-                </ui:SettingsCard.HeaderIcon>
+                </ui:SettingsExpander.HeaderIcon>
 
-                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                    <Button
-                        x:Name="AskClearCacheFolderConfirmationButton"
-                        Command="{Binding AskClearCacheFolderConfirmationCommand}"
-                        Content="{Binding CacheFolderSize, Mode=OneWay}" />
-                    <Button
-                        Height="{Binding ElementName=AskClearCacheFolderConfirmationButton, Path=ActualHeight}"
-                        Command="{Binding AskClearLogFolderConfirmationCommand}"
-                        Content="{Binding LogFolderSize, Mode=OneWay}" />
-                    <Button Height="{Binding ElementName=AskClearCacheFolderConfirmationButton, Path=ActualHeight}">
-                        <ui:FontIcon FontSize="16" Glyph="&#xec7a;" />
-                        <ui:FlyoutService.Flyout>
-                            <ui:MenuFlyout>
-                                <MenuItem Command="{Binding OpenWelcomeWindowCommand}" Header="{DynamicResource welcomewindow}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe939;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-
-                                <MenuItem Command="{Binding OpenSettingsFolderCommand}" Header="{DynamicResource settingfolder}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe8b7;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-
-                                <MenuItem Command="{Binding OpenLogsFolderCommand}" Header="{DynamicResource logfolder}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe8b7;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-
-                                <MenuItem Command="{Binding OpenCacheFolderCommand}" Header="{DynamicResource cachefolder}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe8b7;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                            </ui:MenuFlyout>
-                        </ui:FlyoutService.Flyout>
-                    </Button>
-                </ikw:SimpleStackPanel>
-            </ui:SettingsCard>
+                <ui:SettingsExpander.Items>
+                    <ui:SettingsCard Header="{DynamicResource clearcachefolder}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe74d;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button
+                            Command="{Binding AskClearCacheFolderConfirmationCommand}"
+                            Content="{Binding CacheFolderSize, Mode=OneWay}" />
+                    </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource clearlogfolder}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe74d;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button
+                            Command="{Binding AskClearLogFolderConfirmationCommand}"
+                            Content="{Binding LogFolderSize, Mode=OneWay}" />
+                    </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource settingfolder}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe8b7;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenSettingsFolderCommand}" Content="{DynamicResource openFolderButton}" />
+                    </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource logfolder}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe8b7;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenLogsFolderCommand}" Content="{DynamicResource openFolderButton}" />
+                    </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource cachefolder}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe8b7;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenCacheFolderCommand}" Content="{DynamicResource openFolderButton}" />
+                    </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource welcomewindow}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe939;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenWelcomeWindowCommand}" Content="{DynamicResource welcomewindow}" />
+                    </ui:SettingsCard>
+                </ui:SettingsExpander.Items>
+            </ui:SettingsExpander>
 
             <ui:SettingsExpander Margin="0 4 0 0" Header="{DynamicResource advanced}">
                 <ui:SettingsExpander.HeaderIcon>

From b8b380c8808aa072afd5e6e4f49fb43cd4a30ec1 Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Tue, 2 Jun 2026 20:00:31 +0200
Subject: [PATCH 2/7] Add button to open a test report window to the dev tools

---
 Flow.Launcher/Languages/en.xaml                          | 2 ++
 .../ViewModels/SettingsPaneAboutViewModel.cs             | 9 +++++++++
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml  | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 86c9041219f..62c280d8115 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -487,6 +487,8 @@
     <system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
     <system:String x:Key="openFolderButton">Open Folder</system:String>
+    <system:String x:Key="devtoolsReportWindow">Report Window</system:String>
+    <system:String x:Key="devtoolsOpenTestWindow">Open Test Window</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
     <system:String x:Key="LogLevelNONE">Silent</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index dd23de10a06..b9535ac58cc 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -92,6 +92,15 @@ private void OpenWelcomeWindow()
         window.ShowDialog();
     }
 
+    [RelayCommand]
+    private void OpenTestReportWindow()
+    {
+        var reportWindow = new ReportWindow(
+            new Exception("Dev Tools test exception")
+        );
+        reportWindow.Show();
+    }
+
     [RelayCommand]
     private void AskClearLogFolderConfirmation()
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 1831eacd339..1c406c55c70 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -140,6 +140,13 @@
                         </ui:SettingsCard.HeaderIcon>
                         <Button Command="{Binding OpenWelcomeWindowCommand}" Content="{DynamicResource welcomewindow}" />
                     </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource devtoolsReportWindow}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe783;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenTestReportWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
+                    </ui:SettingsCard>
                 </ui:SettingsExpander.Items>
             </ui:SettingsExpander>
 

From 55481957f65e5bd61b2c251bebf58c951be5505e Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Tue, 2 Jun 2026 20:33:52 +0200
Subject: [PATCH 3/7] Add button to open a test progress window to the dev
 tools

---
 Flow.Launcher/Languages/en.xaml               |  1 +
 .../ViewModels/SettingsPaneAboutViewModel.cs  | 33 +++++++++++++++++++
 .../SettingPages/Views/SettingsPaneAbout.xaml |  7 ++++
 3 files changed, 41 insertions(+)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 62c280d8115..4e3a7cd730c 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -488,6 +488,7 @@
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
     <system:String x:Key="openFolderButton">Open Folder</system:String>
     <system:String x:Key="devtoolsReportWindow">Report Window</system:String>
+    <system:String x:Key="devtoolsProgressWindow">Progress Window</system:String>
     <system:String x:Key="devtoolsOpenTestWindow">Open Test Window</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index b9535ac58cc..bf3e89c043c 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
@@ -101,6 +102,38 @@ private void OpenTestReportWindow()
         reportWindow.Show();
     }
 
+    [RelayCommand]
+    private async Task OpenTestProgressWindowAsync()
+    {
+        using var cancellationTokenSource = new CancellationTokenSource();
+
+        await ProgressBoxEx.ShowAsync(
+            Localize.devtoolsProgressWindow(),
+            async reportProgress =>
+            {
+                if (reportProgress == null)
+                    return;
+
+                var duration = TimeSpan.FromMinutes(1);
+                var updateInterval = TimeSpan.FromSeconds(0.5);
+                var totalSteps = (int)(duration.Ticks / updateInterval.Ticks);
+
+                try
+                {
+                    for (var currentStep = 1; currentStep <= totalSteps; currentStep++)
+                    {
+                        await Task.Delay(updateInterval, cancellationTokenSource.Token).ConfigureAwait(false);
+                        reportProgress((double)currentStep / totalSteps * 100);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    // Progress window cancel action triggers this path.
+                }
+            },
+            cancellationTokenSource.Cancel);
+    }
+
     [RelayCommand]
     private void AskClearLogFolderConfirmation()
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 1c406c55c70..f0366ea96a5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -147,6 +147,13 @@
                         </ui:SettingsCard.HeaderIcon>
                         <Button Command="{Binding OpenTestReportWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
                     </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource devtoolsProgressWindow}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xe895;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenTestProgressWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
+                    </ui:SettingsCard>
                 </ui:SettingsExpander.Items>
             </ui:SettingsExpander>
 

From 61bdc7d53a433f3d4b5f3cb05b2431aaa8953c70 Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Tue, 2 Jun 2026 22:52:21 +0200
Subject: [PATCH 4/7] Add button to open a test plugin update window to the dev
 tools

---
 Flow.Launcher/Languages/en.xaml                           | 1 +
 .../SettingPages/ViewModels/SettingsPaneAboutViewModel.cs | 8 ++++++++
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml   | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4e3a7cd730c..9647d2738b7 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -489,6 +489,7 @@
     <system:String x:Key="openFolderButton">Open Folder</system:String>
     <system:String x:Key="devtoolsReportWindow">Report Window</system:String>
     <system:String x:Key="devtoolsProgressWindow">Progress Window</system:String>
+    <system:String x:Key="devtoolsPluginUpdateWindow">Plugin Update Window</system:String>
     <system:String x:Key="devtoolsOpenTestWindow">Open Test Window</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index bf3e89c043c..6ac149b4d06 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
+using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -134,6 +135,13 @@ await ProgressBoxEx.ShowAsync(
             cancellationTokenSource.Cancel);
     }
 
+    [RelayCommand]
+    private void OpenTestPluginUpdateWindow()
+    {
+        var window = new PluginUpdateWindow(new List<PluginUpdateInfo>());
+        window.ShowDialog();
+    }
+
     [RelayCommand]
     private void AskClearLogFolderConfirmation()
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index f0366ea96a5..7d397d5122e 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -154,6 +154,13 @@
                         </ui:SettingsCard.HeaderIcon>
                         <Button Command="{Binding OpenTestProgressWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
                     </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource devtoolsPluginUpdateWindow}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xecc5;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenTestPluginUpdateWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
+                    </ui:SettingsCard>
                 </ui:SettingsExpander.Items>
             </ui:SettingsExpander>
 

From 15c0e8127e4b0133873a9149e7f27e9813f14ff5 Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Wed, 3 Jun 2026 09:51:51 +0200
Subject: [PATCH 5/7] Add button to open a test message box window to the dev
 tools

---
 Flow.Launcher/Languages/en.xaml                            | 1 +
 .../SettingPages/ViewModels/SettingsPaneAboutViewModel.cs  | 6 ++++++
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml    | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9647d2738b7..5a0957ec665 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -490,6 +490,7 @@
     <system:String x:Key="devtoolsReportWindow">Report Window</system:String>
     <system:String x:Key="devtoolsProgressWindow">Progress Window</system:String>
     <system:String x:Key="devtoolsPluginUpdateWindow">Plugin Update Window</system:String>
+    <system:String x:Key="devtoolsMessageBoxWindow">Message Box Window</system:String>
     <system:String x:Key="devtoolsOpenTestWindow">Open Test Window</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index 6ac149b4d06..426fbe6091a 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -142,6 +142,12 @@ private void OpenTestPluginUpdateWindow()
         window.ShowDialog();
     }
 
+    [RelayCommand]
+    private void OpenTestMessageBoxWindow()
+    {
+        MessageBoxEx.Show("Dev Tools test message", "Dev Tools Test", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+    }
+
     [RelayCommand]
     private void AskClearLogFolderConfirmation()
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 7d397d5122e..39aeb0fbc2c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -161,6 +161,13 @@
                         </ui:SettingsCard.HeaderIcon>
                         <Button Command="{Binding OpenTestPluginUpdateWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
                     </ui:SettingsCard>
+
+                    <ui:SettingsCard Header="{DynamicResource devtoolsMessageBoxWindow}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Glyph="&#xE8BD;" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <Button Command="{Binding OpenTestMessageBoxWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
+                    </ui:SettingsCard>
                 </ui:SettingsExpander.Items>
             </ui:SettingsExpander>
 

From 4bec9364915bf239f66e8ebcf3e01fa58018d895 Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Fri, 3 Jul 2026 09:14:05 +0200
Subject: [PATCH 6/7] Expand message box dev tool with flyout of button type
 variants and send result as notification

---
 Flow.Launcher/Languages/en.xaml               |  5 +++
 .../ViewModels/SettingsPaneAboutViewModel.cs  | 38 ++++++++++++++++++-
 .../SettingPages/Views/SettingsPaneAbout.xaml | 14 ++++++-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 5a0957ec665..0b7c5c122c1 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -491,6 +491,11 @@
     <system:String x:Key="devtoolsProgressWindow">Progress Window</system:String>
     <system:String x:Key="devtoolsPluginUpdateWindow">Plugin Update Window</system:String>
     <system:String x:Key="devtoolsMessageBoxWindow">Message Box Window</system:String>
+    <system:String x:Key="devtoolsMessageBoxOkLabel">OK</system:String>
+    <system:String x:Key="devtoolsMessageBoxOkCancelLabel">OK / Cancel</system:String>
+    <system:String x:Key="devtoolsMessageBoxYesNoLabel">Yes / No</system:String>
+    <system:String x:Key="devtoolsMessageBoxYesNoCancelLabel">Yes / No / Cancel</system:String>
+    <system:String x:Key="devtoolsMessageBoxTestMessage">This is a test message box.</system:String>
     <system:String x:Key="devtoolsOpenTestWindow">Open Test Window</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index 426fbe6091a..b731b89df60 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -143,9 +143,43 @@ private void OpenTestPluginUpdateWindow()
     }
 
     [RelayCommand]
-    private void OpenTestMessageBoxWindow()
+    private void OpenTestMessageBox(string buttonType)
     {
-        MessageBoxEx.Show("Dev Tools test message", "Dev Tools Test", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+        MessageBoxButton button;
+        string caption;
+        MessageBoxImage icon;
+
+        switch (buttonType)
+        {
+            case "OK":
+                button = MessageBoxButton.OK;
+                caption = Localize.devtoolsMessageBoxOkLabel();
+                icon = MessageBoxImage.Information;
+                break;
+            case "OKCancel":
+                button = MessageBoxButton.OKCancel;
+                caption = Localize.devtoolsMessageBoxOkCancelLabel();
+                icon = MessageBoxImage.Question;
+                break;
+            case "YesNo":
+                button = MessageBoxButton.YesNo;
+                caption = Localize.devtoolsMessageBoxYesNoLabel();
+                icon = MessageBoxImage.Question;
+                break;
+            case "YesNoCancel":
+                button = MessageBoxButton.YesNoCancel;
+                caption = Localize.devtoolsMessageBoxYesNoCancelLabel();
+                icon = MessageBoxImage.Question;
+                break;
+            default:
+                var ex = new ArgumentException($"Invalid button type: {buttonType}", nameof(buttonType));
+                App.API.LogException(ClassName, "Invalid button type passed for Test MessageBox", ex);
+                App.API.ShowMsg($"Invalid button type: {buttonType}");
+                return;
+        }
+
+        var result = MessageBoxEx.Show(Localize.devtoolsMessageBoxTestMessage(), caption, button, icon);
+        App.API.ShowMsg($"{buttonType} result: {result}");
     }
 
     [RelayCommand]
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 39aeb0fbc2c..72a36c9ca5f 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -166,7 +166,19 @@
                         <ui:SettingsCard.HeaderIcon>
                             <ui:FontIcon Glyph="&#xE8BD;" />
                         </ui:SettingsCard.HeaderIcon>
-                        <Button Command="{Binding OpenTestMessageBoxWindowCommand}" Content="{DynamicResource devtoolsOpenTestWindow}" />
+                        <Button>
+                            <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="6">
+                                <TextBlock VerticalAlignment="Center" Text="{DynamicResource devtoolsOpenTestWindow}" />
+                            </ikw:SimpleStackPanel>
+                            <ui:FlyoutService.Flyout>
+                                <ui:MenuFlyout>
+                                    <MenuItem Command="{Binding OpenTestMessageBoxCommand}" CommandParameter="OK" Header="{DynamicResource devtoolsMessageBoxOkLabel}" />
+                                    <MenuItem Command="{Binding OpenTestMessageBoxCommand}" CommandParameter="OKCancel" Header="{DynamicResource devtoolsMessageBoxOkCancelLabel}" />
+                                    <MenuItem Command="{Binding OpenTestMessageBoxCommand}" CommandParameter="YesNo" Header="{DynamicResource devtoolsMessageBoxYesNoLabel}" />
+                                    <MenuItem Command="{Binding OpenTestMessageBoxCommand}" CommandParameter="YesNoCancel" Header="{DynamicResource devtoolsMessageBoxYesNoCancelLabel}" />
+                                </ui:MenuFlyout>
+                            </ui:FlyoutService.Flyout>
+                        </Button>
                     </ui:SettingsCard>
                 </ui:SettingsExpander.Items>
             </ui:SettingsExpander>

From b39d2105285b16600fb1db06767723a6bbff2b5e Mon Sep 17 00:00:00 2001
From: David Brett <davidbrett2002@gmail.com>
Date: Fri, 3 Jul 2026 09:16:37 +0200
Subject: [PATCH 7/7] Update welcome window button string to "Open Welcome
 Window" in dev tools

The old Wizard name is still left as the setting card header
---
 Flow.Launcher/Languages/en.xaml                         | 1 +
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 0b7c5c122c1..cf67bffeafa 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -483,6 +483,7 @@
     <system:String x:Key="clearcachefolderMessage">Are you sure you want to delete all caches?</system:String>
     <system:String x:Key="clearfolderfailMessage">Failed to clear part of folders and files. Please see log file for more information</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
+    <system:String x:Key="openWelcomeWindow">Open Welcome Window</system:String>
     <system:String x:Key="userdatapath">User Data Location</system:String>
     <system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 72a36c9ca5f..c3c2f57717f 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -138,7 +138,7 @@
                         <ui:SettingsCard.HeaderIcon>
                             <ui:FontIcon Glyph="&#xe939;" />
                         </ui:SettingsCard.HeaderIcon>
-                        <Button Command="{Binding OpenWelcomeWindowCommand}" Content="{DynamicResource welcomewindow}" />
+                        <Button Command="{Binding OpenWelcomeWindowCommand}" Content="{DynamicResource openWelcomeWindow}" />
                     </ui:SettingsCard>
 
                     <ui:SettingsCard Header="{DynamicResource devtoolsReportWindow}">