From bd867db99aa041b7699e0450287327d0944685f3 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 2 May 2024 07:24:33 +0900
Subject: [PATCH 01/13] Add WMP warning

---
 Flow.Launcher/Languages/en.xaml     |  1 +
 Flow.Launcher/SettingWindow.xaml    | 34 +++++++++++++++++++++++++++++
 Flow.Launcher/SettingWindow.xaml.cs | 14 ++++++++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index bda86e481ec..7aca36e2292 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -158,6 +158,7 @@
     <system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
     <system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
     <system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
+    <system:String x:Key="SoundEffectWarning">Flow Launcher can't play sound because "Windows Media Player" doesn't exist on your system. If you need sound, install WMP.</system:String>
     <system:String x:Key="Animation">Animation</system:String>
     <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
     <system:String x:Key="AnimationSpeed">Animation Speed</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 84b91e312be..fd999585db1 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2561,6 +2561,40 @@
                                                         </TextBlock>
                                                     </ItemsControl>
                                                 </Border>
+                                                <Border
+                                                    Name="WMPWarning"
+                                                    Padding="0,10"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    Background="{DynamicResource InfoBarWarningBG}"
+                                                    BorderBrush="{DynamicResource Color03B}"
+                                                    BorderThickness="0,1,0,0"
+                                                    CornerRadius="0 0 5 5"
+                                                    Visibility="Visible">
+                                                    <Grid VerticalAlignment="Center">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="58" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <ui:FontIcon
+                                                            Grid.Column="0"
+                                                            Margin="20,0,14,0"
+                                                            VerticalAlignment="Center"
+                                                            FontSize="15"
+                                                            Foreground="{DynamicResource InfoBarWarningIcon}"
+                                                            Glyph="&#xf167;" />
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            Margin="0,0,0,2"
+                                                            Padding="0,0,8,0"
+                                                            HorizontalAlignment="Left"
+                                                            FontSize="13"
+                                                            FontWeight="SemiBold"
+                                                            Foreground="{DynamicResource Color05B}"
+                                                            Text="{DynamicResource SoundEffectWarning}"
+                                                            TextWrapping="Wrap" />
+                                                    </Grid>
+                                                </Border>
                                             </StackPanel>
                                         </Border>
 
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 8144c8ff8a3..58ffbb1498c 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -24,6 +24,7 @@
 using MessageBox = System.Windows.MessageBox;
 using TextBox = System.Windows.Controls.TextBox;
 using ThemeManager = ModernWpf.ThemeManager;
+using System.Diagnostics;
 
 namespace Flow.Launcher
 {
@@ -63,9 +64,18 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
             viewModel.PropertyChanged += new PropertyChangedEventHandler(SettingsWindowViewModelChanged);
 
+            CheckMediaPlayer();
             InitializePosition();
         }
 
+        private void CheckMediaPlayer()
+        {
+            
+            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
+            {
+                /* Binding WMPWarning visibility */
+            }
+        }
         private void SettingsWindowViewModelChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(viewModel.ExternalPlugins))
@@ -294,8 +304,8 @@ private void OnExternalPluginUpdateClick(object sender, RoutedEventArgs e)
         }
 
         private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
-        {
-            if (Keyboard.FocusedElement is not TextBox textBox)
+                {
+                    if (Keyboard.FocusedElement is not TextBox textBox)
             {
                 return;
             }

From a4f7a47fbb8dff0cec8a7db8ea5bfcffd991277e Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 3 May 2024 06:53:14 +0900
Subject: [PATCH 02/13] Update Flow.Launcher/Languages/en.xaml

Co-authored-by: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 7aca36e2292..9962646c6d2 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -158,7 +158,7 @@
     <system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
     <system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
     <system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
-    <system:String x:Key="SoundEffectWarning">Flow Launcher can't play sound because "Windows Media Player" doesn't exist on your system. If you need sound, install WMP.</system:String>
+    <system:String x:Key="SoundEffectWarning">Sound effect is unavailable because Windows Media Player is missing. Please install it if you need sound effect.</system:String>
     <system:String x:Key="Animation">Animation</system:String>
     <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
     <system:String x:Key="AnimationSpeed">Animation Speed</system:String>

From 5670085275c5bb936d6a824f109adb010d330e0d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 15 May 2024 23:30:27 +0900
Subject: [PATCH 03/13] - add soundplay for no WMP - fix warning visibility

---
 Flow.Launcher/MainWindow.xaml.cs    | 24 +++++++++++++++++++-----
 Flow.Launcher/SettingWindow.xaml    |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 76e587cdca5..2678d7c27c4 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -29,6 +29,7 @@
 using System.Windows.Media;
 using System.Windows.Interop;
 using System.Runtime.InteropServices;
+using System.IO;
 
 namespace Flow.Launcher
 {
@@ -46,7 +47,8 @@ public partial class MainWindow
         private ContextMenu contextMenu = new ContextMenu();
         private MainViewModel _viewModel;
         private bool _animating;
-        MediaPlayer animationSound = new MediaPlayer();
+        MediaPlayer animationSoundWMP = new MediaPlayer();
+        SoundPlayer animationSoundWPF = new SoundPlayer(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav");
 
         #endregion
 
@@ -59,7 +61,7 @@ public MainWindow(Settings settings, MainViewModel mainVM)
             InitializeComponent();
             InitializePosition();
 
-            animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+            animationSoundWMP.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
 
             DataObject.AddPastingHandler(QueryTextBox, OnPaste);
         }
@@ -137,9 +139,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                             {
                                 if (_settings.UseSound)
                                 {
-                                    animationSound.Position = TimeSpan.Zero;
-                                    animationSound.Volume = _settings.SoundVolume / 100.0;
-                                    animationSound.Play();
+                                    SoundPlay();
                                 }
                                 UpdatePosition();
                                 PreviewReset();
@@ -503,6 +503,20 @@ public void WindowAnimator()
             windowsb.Begin(FlowMainWindow);
         }
 
+        private void SoundPlay()
+        {
+
+            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
+            {
+                animationSoundWPF.Play();
+            }
+            else
+            {
+                animationSoundWMP.Position = TimeSpan.Zero;
+                animationSoundWMP.Volume = _settings.SoundVolume / 100.0;
+                animationSoundWMP.Play();
+            }
+        }
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ChangedButton == MouseButton.Left) DragMove();
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index fd999585db1..daacd76d531 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2570,7 +2570,7 @@
                                                     BorderBrush="{DynamicResource Color03B}"
                                                     BorderThickness="0,1,0,0"
                                                     CornerRadius="0 0 5 5"
-                                                    Visibility="Visible">
+                                                    Visibility="Collapsed">
                                                     <Grid VerticalAlignment="Center">
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="58" />
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 58ffbb1498c..292559b2f63 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -73,7 +73,7 @@ private void CheckMediaPlayer()
             
             if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
             {
-                /* Binding WMPWarning visibility */
+                WMPWarning.Visibility = Visibility.Visible;
             }
         }
         private void SettingsWindowViewModelChanged(object sender, PropertyChangedEventArgs e)

From a64f10e3123949e71ff27881ec729b62233a3772 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 15 May 2024 23:36:33 +0900
Subject: [PATCH 04/13] - Adjust Warning String

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9962646c6d2..418efe1e22a 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -158,7 +158,7 @@
     <system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
     <system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
     <system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
-    <system:String x:Key="SoundEffectWarning">Sound effect is unavailable because Windows Media Player is missing. Please install it if you need sound effect.</system:String>
+    <system:String x:Key="SoundEffectWarning">Windows Media Player is unavailable and is required for volume adjust. Please check your WMP installation</system:String>
     <system:String x:Key="Animation">Animation</system:String>
     <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
     <system:String x:Key="AnimationSpeed">Animation Speed</system:String>

From 2e9d6966dd27f5547d66058a99e8804bb5caca48 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 16 May 2024 17:48:00 +0900
Subject: [PATCH 05/13] disable volume control

---
 Flow.Launcher/SettingWindow.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 292559b2f63..35562c01827 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -71,9 +71,10 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         private void CheckMediaPlayer()
         {
             
-            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
+            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer2.exe")))
             {
                 WMPWarning.Visibility = Visibility.Visible;
+                SoundEffectValue.IsEnabled = false;
             }
         }
         private void SettingsWindowViewModelChanged(object sender, PropertyChangedEventArgs e)

From 94023cf5cdad7e5ff60b50adc57d0fb1d8a2f3ca Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 16 May 2024 17:50:24 +0900
Subject: [PATCH 06/13] Fix Testing Code

---
 Flow.Launcher/SettingWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 35562c01827..50209465646 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -71,7 +71,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         private void CheckMediaPlayer()
         {
             
-            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer2.exe")))
+            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
             {
                 WMPWarning.Visibility = Visibility.Visible;
                 SoundEffectValue.IsEnabled = false;

From 77831df7821d23eb28665449fbfc58134af0d5f2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 17 May 2024 15:29:16 +0900
Subject: [PATCH 07/13] Adjust Control Disabled design.

---
 Flow.Launcher/SettingWindow.xaml    | 2 +-
 Flow.Launcher/SettingWindow.xaml.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 263657eb71b..bc423beaddf 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2519,7 +2519,7 @@
                                                     Width="Auto"
                                                     BorderThickness="1"
                                                     Style="{StaticResource SettingSeparatorStyle}" />
-                                                <Border Margin="0" BorderThickness="0">
+                                                <Border Margin="0" BorderThickness="0" Name="VolumeAdjustCard">
                                                     <Border.Style>
                                                         <Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
                                                             <Setter Property="Visibility" Value="Collapsed" />
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 50209465646..2fd62330076 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -71,10 +71,10 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         private void CheckMediaPlayer()
         {
             
-            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
+            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer2.exe")))
             {
                 WMPWarning.Visibility = Visibility.Visible;
-                SoundEffectValue.IsEnabled = false;
+                VolumeAdjustCard.Visibility = Visibility.Collapsed;
             }
         }
         private void SettingsWindowViewModelChanged(object sender, PropertyChangedEventArgs e)

From 5f6806618197913ae51e5fd556a4d984c970bc07 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 19 May 2024 16:35:50 +0800
Subject: [PATCH 08/13] Fix indent

---
 Flow.Launcher/SettingWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 2fd62330076..963f20e1caa 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -305,8 +305,8 @@ private void OnExternalPluginUpdateClick(object sender, RoutedEventArgs e)
         }
 
         private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
-                {
-                    if (Keyboard.FocusedElement is not TextBox textBox)
+        {
+            if (Keyboard.FocusedElement is not TextBox textBox)
             {
                 return;
             }

From 490bf59024a019292760483ae5ee05e36e3c5f57 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 19 May 2024 20:13:37 +0800
Subject: [PATCH 09/13] Only check WMP installation on load

---
 .../Helper/WindowsMediaPlayerHelper.cs        | 11 ++++++
 Flow.Launcher/Languages/en.xaml               |  2 +-
 Flow.Launcher/MainWindow.xaml.cs              | 34 +++++++++++++------
 Flow.Launcher/SettingWindow.xaml.cs           |  7 ++--
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs

diff --git a/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs b/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs
new file mode 100644
index 00000000000..2eec6c89b08
--- /dev/null
+++ b/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs
@@ -0,0 +1,11 @@
+using Microsoft.Win32;
+
+namespace Flow.Launcher.Helper;
+internal static class WindowsMediaPlayerHelper
+{
+    internal static bool IsWindowsMediaPlayerInstalled()
+    {
+        using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MediaPlayer");
+        return key.GetValue("Installation Directory") != null;
+    }
+}
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index c05227d9a7f..7fc7a6325d8 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -158,7 +158,7 @@
     <system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
     <system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
     <system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
-    <system:String x:Key="SoundEffectWarning">Windows Media Player is unavailable and is required for volume adjust. Please check your WMP installation</system:String>
+    <system:String x:Key="SoundEffectWarning">Windows Media Player is unavailable and is required for Flow's volume adjustment. Please check your installation if you need to adjust volume.</system:String>
     <system:String x:Key="Animation">Animation</system:String>
     <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
     <system:String x:Key="AnimationSpeed">Animation Speed</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index bfc89998841..2733413e776 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -12,7 +12,6 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
 using Screen = System.Windows.Forms.Screen;
-using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
 using DragEventArgs = System.Windows.DragEventArgs;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using NotifyIcon = System.Windows.Forms.NotifyIcon;
@@ -24,12 +23,10 @@
 using ModernWpf.Controls;
 using Key = System.Windows.Input.Key;
 using System.Media;
-using static Flow.Launcher.ViewModel.SettingWindowViewModel;
 using DataObject = System.Windows.DataObject;
 using System.Windows.Media;
 using System.Windows.Interop;
 using System.Runtime.InteropServices;
-using System.IO;
 
 namespace Flow.Launcher
 {
@@ -47,10 +44,12 @@ public partial class MainWindow
         private ContextMenu contextMenu = new ContextMenu();
         private MainViewModel _viewModel;
         private bool _animating;
-        MediaPlayer animationSoundWMP = new MediaPlayer();
-        SoundPlayer animationSoundWPF = new SoundPlayer(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav");
         private bool isArrowKeyPressed = false;
 
+        private bool isWMPInstalled = true;
+        private MediaPlayer animationSoundWMP;
+        private SoundPlayer animationSoundWPF;
+
         #endregion
 
         public MainWindow(Settings settings, MainViewModel mainVM)
@@ -62,7 +61,7 @@ public MainWindow(Settings settings, MainViewModel mainVM)
             InitializeComponent();
             InitializePosition();
 
-            animationSoundWMP.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+            InitSoundEffects();
 
             DataObject.AddPastingHandler(QueryTextBox, OnPaste);
         }
@@ -508,20 +507,35 @@ public void WindowAnimator()
             windowsb.Begin(FlowMainWindow);
         }
 
-        private void SoundPlay()
+        private void InitSoundEffects()
         {
-
-            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer.exe")))
+            isWMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+            if (isWMPInstalled)
             {
-                animationSoundWPF.Play();
+                animationSoundWMP = new MediaPlayer();
+                animationSoundWMP.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
             }
             else
+            {
+                animationSoundWPF = new SoundPlayer(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav");
+            }
+        }
+
+        private void SoundPlay()
+        {
+
+            if (isWMPInstalled)
             {
                 animationSoundWMP.Position = TimeSpan.Zero;
                 animationSoundWMP.Volume = _settings.SoundVolume / 100.0;
                 animationSoundWMP.Play();
             }
+            else
+            {
+                animationSoundWPF.Play();
+            }
         }
+
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ChangedButton == MouseButton.Left) DragMove();
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 963f20e1caa..7f1ee0078d2 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -2,7 +2,6 @@
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
@@ -24,7 +23,6 @@
 using MessageBox = System.Windows.MessageBox;
 using TextBox = System.Windows.Controls.TextBox;
 using ThemeManager = ModernWpf.ThemeManager;
-using System.Diagnostics;
 
 namespace Flow.Launcher
 {
@@ -42,7 +40,6 @@ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
             API = api;
             InitializePosition();
             InitializeComponent();
-
         }
 
         #region General
@@ -70,13 +67,13 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
         private void CheckMediaPlayer()
         {
-            
-            if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Windows Media Player", "wmplayer2.exe")))
+            if (!WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled())
             {
                 WMPWarning.Visibility = Visibility.Visible;
                 VolumeAdjustCard.Visibility = Visibility.Collapsed;
             }
         }
+
         private void SettingsWindowViewModelChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(viewModel.ExternalPlugins))

From 2c3e1bfefa270260a12fc3383dcfa8e703f37fee Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 20 May 2024 22:36:24 +0800
Subject: [PATCH 10/13] Move WMP check to app startup

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 3 +++
 Flow.Launcher/App.xaml.cs                             | 1 +
 Flow.Launcher/MainWindow.xaml.cs                      | 7 ++-----
 Flow.Launcher/SettingWindow.xaml.cs                   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 7bb8fe2009c..18abd4adfc8 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -271,6 +271,9 @@ public bool HideNotifyIcon
         public AnimationSpeeds AnimationSpeed { get; set; } = AnimationSpeeds.Medium;
         public int CustomAnimationLength { get; set; } = 360;
 
+        [JsonIgnore]
+        public bool WMPInstalled { get; set; } = true;
+
 
         // This needs to be loaded last by staying at the bottom
         public PluginsSettings PluginSettings { get; set; } = new PluginsSettings();
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index f4a17761f00..9fa5af7e310 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -62,6 +62,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 _settingsVM = new SettingWindowViewModel(_updater, _portable);
                 _settings = _settingsVM.Settings;
+                _settings.WMPInstalled =  WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
 
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 2733413e776..0f96b88de4c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -46,7 +46,6 @@ public partial class MainWindow
         private bool _animating;
         private bool isArrowKeyPressed = false;
 
-        private bool isWMPInstalled = true;
         private MediaPlayer animationSoundWMP;
         private SoundPlayer animationSoundWPF;
 
@@ -509,8 +508,7 @@ public void WindowAnimator()
 
         private void InitSoundEffects()
         {
-            isWMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
-            if (isWMPInstalled)
+            if (_settings.WMPInstalled)
             {
                 animationSoundWMP = new MediaPlayer();
                 animationSoundWMP.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
@@ -523,8 +521,7 @@ private void InitSoundEffects()
 
         private void SoundPlay()
         {
-
-            if (isWMPInstalled)
+            if (_settings.WMPInstalled)
             {
                 animationSoundWMP.Position = TimeSpan.Zero;
                 animationSoundWMP.Volume = _settings.SoundVolume / 100.0;
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 7f1ee0078d2..48491564e70 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -67,7 +67,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
         private void CheckMediaPlayer()
         {
-            if (!WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled())
+            if (settings.WMPInstalled)
             {
                 WMPWarning.Visibility = Visibility.Visible;
                 VolumeAdjustCard.Visibility = Visibility.Collapsed;

From 82ca8c317541519a8bf28614b0d5b52817958aa3 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 23 May 2024 22:51:24 +0900
Subject: [PATCH 11/13] Adjust UI for Splitted Setting Window

---
 .../ViewModels/SettingsPaneThemeViewModel.cs  |  14 +-
 .../SettingPages/Views/SettingsPaneTheme.xaml | 183 +++++++++++-------
 2 files changed, 123 insertions(+), 74 deletions(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 89f4fe15c5d..5e8669450a6 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Security.Policy;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -181,12 +182,23 @@ public List<AnimationSpeed> AnimationSpeeds
             return speeds;
         }
     }
-
     public bool UseSound
     {
         get => Settings.UseSound;
         set => Settings.UseSound = value;
     }
+    public bool CheckMediaPlayer
+    {
+        get
+        {
+            if (Settings.WMPInstalled)
+            {
+                return true;
+            }
+            else { return false; }
+        }
+        set { }
+    }
 
     public double SoundEffectVolume
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 3b581767c10..c93d1328c95 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -4,12 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
-    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     Title="Theme"
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneThemeViewModel}"
     d:DesignHeight="450"
@@ -25,22 +25,22 @@
         </ResourceDictionary>
     </ui:Page.Resources>
     <ScrollViewer
-        Padding="6 0 24 0"
+        Padding="6,0,24,0"
         CanContentScroll="True"
         FontSize="14"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
         <StackPanel>
-            <!-- Page title -->
+            <!--  Page title  -->
             <TextBlock
-                Margin="5 23 0 5"
+                Margin="5,23,0,5"
                 FontSize="30"
                 Style="{StaticResource PageTitle}"
                 Text="{DynamicResource appearance}"
                 TextAlignment="left"
                 Visibility="Collapsed" />
 
-            <!-- Theme preview -->
+            <!--  Theme preview  -->
             <StackPanel
                 Height="350"
                 Margin="0"
@@ -71,25 +71,25 @@
                                     <RowDefinition />
                                     <RowDefinition />
                                 </Grid.RowDefinitions>
-                                <!-- Query TextBox -->
+                                <!--  Query TextBox  -->
                                 <TextBox
                                     x:Name="QueryTextBox"
                                     Grid.Row="0"
                                     IsReadOnly="True"
                                     Style="{DynamicResource QueryBoxStyle}"
                                     Text="{DynamicResource hiThere}" />
-                                <!-- Clock panel -->
+                                <!--  Clock panel  -->
                                 <StackPanel
                                     Grid.Row="0"
                                     Style="{DynamicResource ClockPanel}"
                                     Visibility="Visible">
-                                    <!-- Clock TextBox -->
+                                    <!--  Clock TextBox  -->
                                     <TextBlock
                                         x:Name="ClockBox"
                                         Style="{DynamicResource ClockBox}"
                                         Text="{Binding ClockText}"
                                         Visibility="{Binding Settings.UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                    <!-- Date TextBox -->
+                                    <!--  Date TextBox  -->
                                     <TextBlock
                                         x:Name="DateBox"
                                         Style="{DynamicResource DateBox}"
@@ -122,19 +122,19 @@
                 </StackPanel>
             </StackPanel>
 
-            <!-- Drop shadow effect -->
+            <!--  Drop shadow effect  -->
             <cc:Card
-                Icon="&#xeb91;"
                 Title="{DynamicResource queryWindowShadowEffect}"
-                Sub="{DynamicResource shadowEffectCPUUsage}"
-                Margin="0 4 0 0">
+                Margin="0,4,0,0"
+                Icon="&#xeb91;"
+                Sub="{DynamicResource shadowEffectCPUUsage}">
                 <ui:ToggleSwitch
                     IsOn="{Binding DropShadowEffect}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <!-- Window width size -->
+            <!--  Window width size  -->
             <cc:Card
                 Title="{DynamicResource windowWidthSize}"
                 Icon="&#xe740;"
@@ -142,7 +142,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         Width="Auto"
-                        Margin="0 0 8 2"
+                        Margin="0,0,8,2"
                         VerticalAlignment="Center"
                         Foreground="{DynamicResource Color05B}"
                         Text="{Binding WindowWidthSize}"
@@ -159,10 +159,10 @@
                 </StackPanel>
             </cc:Card>
 
-            <!-- Theme -->
+            <!--  Theme  -->
             <Border
                 Height="64"
-                Margin="0 8 0 0"
+                Margin="0,8,0,0"
                 CornerRadius="5 5 0 0"
                 Style="{DynamicResource SettingGroupBox}">
                 <ItemsControl Style="{StaticResource SettingGrid}">
@@ -179,7 +179,7 @@
                 Margin="0"
                 Padding="0"
                 HorizontalAlignment="Stretch"
-                BorderThickness="1 0 1 1"
+                BorderThickness="1,0,1,1"
                 CornerRadius="0 0 5 5"
                 Style="{DynamicResource SettingGroupBox}">
                 <ListBox
@@ -195,10 +195,8 @@
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
                             <Setter Property="Background" Value="Transparent" />
-                            <Setter Property="HorizontalContentAlignment"
-                                    Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-                            <Setter Property="VerticalContentAlignment"
-                                    Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+                            <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+                            <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
                             <Setter Property="Padding" Value="0" />
                             <Setter Property="Margin" Value="4" />
                             <Setter Property="Template">
@@ -209,13 +207,13 @@
                                             Padding="{TemplateBinding Padding}"
                                             Background="{DynamicResource Color12B}"
                                             BorderBrush="{DynamicResource Color03B}"
-                                            BorderThickness="1 1 1 0"
+                                            BorderThickness="1,1,1,0"
                                             CornerRadius="4"
                                             SnapsToDevicePixels="true">
                                             <Border
                                                 x:Name="Bd2"
                                                 BorderBrush="{DynamicResource Color14B}"
-                                                BorderThickness="0 0 0 2"
+                                                BorderThickness="0,0,0,2"
                                                 CornerRadius="4">
                                                 <ContentPresenter
                                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -225,15 +223,12 @@
                                         </Border>
                                         <ControlTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="true">
-                                                <Setter TargetName="Bd" Property="Background"
-                                                        Value="{DynamicResource ThemeHoverButton}" />
+                                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
                                             </Trigger>
                                             <Trigger Property="IsSelected" Value="true">
-                                                <Setter TargetName="Bd" Property="Background"
-                                                        Value="{DynamicResource ToggleSwitchFillOn}" />
+                                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
                                                 <Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
-                                                <Setter TargetName="Bd2" Property="TextElement.Foreground"
-                                                        Value="{DynamicResource Color02B}" />
+                                                <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
                                             </Trigger>
                                         </ControlTemplate.Triggers>
                                     </ControlTemplate>
@@ -256,7 +251,7 @@
                                 <TextBlock
                                     x:Name="ThemeName"
                                     Margin="0"
-                                    Padding="14 12"
+                                    Padding="14,12"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Focusable="True"
@@ -278,21 +273,23 @@
             <cc:HyperLink
                 Margin="10"
                 HorizontalAlignment="Right"
-                Uri="{Binding LinkThemeGallery}"
-                Text="{DynamicResource browserMoreThemes}" />
+                Text="{DynamicResource browserMoreThemes}"
+                Uri="{Binding LinkThemeGallery}" />
 
 
-            <!-- Fonts and icons -->
-            <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card Icon="&#xf6b8;" Title="{DynamicResource useGlyphUI}"
-                         Sub="{DynamicResource useGlyphUIEffect}">
+            <!--  Fonts and icons  -->
+            <cc:CardGroup Margin="0,30,0,0">
+                <cc:Card
+                    Title="{DynamicResource useGlyphUI}"
+                    Icon="&#xf6b8;"
+                    Sub="{DynamicResource useGlyphUIEffect}">
                     <ui:ToggleSwitch
                         IsOn="{Binding UseGlyphIcons}"
                         OffContent="{DynamicResource disable}"
                         OnContent="{DynamicResource enable}" />
                 </cc:Card>
 
-                <cc:Card Icon="&#xe990;" Title="{DynamicResource queryBoxFont}">
+                <cc:Card Title="{DynamicResource queryBoxFont}" Icon="&#xe990;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             Width="180"
@@ -301,7 +298,7 @@
                             SelectedItem="{Binding SelectedQueryBoxFont}" />
                         <ComboBox
                             Width="130"
-                            Margin="10 0 0 0"
+                            Margin="10,0,0,0"
                             ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
                             SelectedItem="{Binding SelectedQueryBoxFontFaces}">
                             <ComboBox.ItemTemplate>
@@ -319,7 +316,7 @@
                     </StackPanel>
                 </cc:Card>
 
-                <cc:Card Icon="&#xe8fd;" Title="{DynamicResource resultItemFont}">
+                <cc:Card Title="{DynamicResource resultItemFont}" Icon="&#xe8fd;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             Width="180"
@@ -328,7 +325,7 @@
                             SelectedItem="{Binding SelectedResultFont}" />
                         <ComboBox
                             Width="130"
-                            Margin="10 0 0 0"
+                            Margin="10,0,0,0"
                             ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
                             SelectedItem="{Binding SelectedResultFontFaces}">
                             <ComboBox.ItemTemplate>
@@ -347,9 +344,9 @@
                 </cc:Card>
             </cc:CardGroup>
 
-            <!-- Time and date -->
-            <cc:CardGroup Margin="0 24 0 0">
-                <cc:Card Icon="&#xec92;" Title="{DynamicResource Clock}">
+            <!--  Time and date  -->
+            <cc:CardGroup Margin="0,24,0,0">
+                <cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
@@ -358,7 +355,7 @@
                             Text="{Binding ClockText}" />
                         <ComboBox
                             MinWidth="180"
-                            Margin="10 0 18 0"
+                            Margin="10,0,18,0"
                             VerticalAlignment="Center"
                             FontSize="14"
                             ItemsSource="{Binding TimeFormatList}"
@@ -370,7 +367,7 @@
                     </StackPanel>
                 </cc:Card>
 
-                <cc:Card Icon="&#xe787;" Title="{DynamicResource Date}">
+                <cc:Card Title="{DynamicResource Date}" Icon="&#xe787;">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
@@ -379,7 +376,7 @@
                             Text="{Binding DateText}" />
                         <ComboBox
                             MinWidth="180"
-                            Margin="10 0 18 0"
+                            Margin="10,0,18,0"
                             VerticalAlignment="Center"
                             FontSize="14"
                             ItemsSource="{Binding DateFormatList}"
@@ -392,11 +389,11 @@
                 </cc:Card>
             </cc:CardGroup>
 
-            <!-- Animation -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <!--  Animation  -->
+            <cc:CardGroup Margin="0,11,0,0">
                 <cc:Card
-                    Icon="&#xedb5;"
                     Title="{DynamicResource Animation}"
+                    Icon="&#xedb5;"
                     Sub="{DynamicResource AnimationTip}">
                     <ui:ToggleSwitch
                         IsOn="{Binding UseAnimation}"
@@ -404,8 +401,8 @@
                         OnContent="{DynamicResource enable}" />
                 </cc:Card>
                 <cc:Card
-                    Icon="&#xe916;"
                     Title="{DynamicResource AnimationSpeed}"
+                    Icon="&#xe916;"
                     Sub="{DynamicResource AnimationSpeedTip}"
                     Visibility="{Binding UseAnimation, Converter={StaticResource BoolToVisibilityConverter}}">
                     <StackPanel Orientation="Horizontal">
@@ -419,35 +416,38 @@
                             SelectedValuePath="Value" />
 
                         <TextBox
-                            Margin="18 0 0 0"
                             MinWidth="80"
+                            Margin="18,0,0,0"
                             Text="{Binding Settings.CustomAnimationLength}"
                             TextWrapping="NoWrap"
-                            Visibility="{ext:VisibleWhen
-                                         {Binding Settings.AnimationSpeed},
-                                         IsEqualTo={x:Static userSettings:AnimationSpeeds.Custom}}" />
+                            Visibility="{ext:VisibleWhen {Binding Settings.AnimationSpeed},
+                                                         IsEqualTo={x:Static userSettings:AnimationSpeeds.Custom}}" />
                     </StackPanel>
                 </cc:Card>
             </cc:CardGroup>
 
-            <!-- SFX -->
-            <cc:CardGroup Margin="0 11 0 0">
-                <cc:Card Icon="&#xe7f5;" Title="{DynamicResource SoundEffect}"
-                         Sub="{DynamicResource SoundEffectTip}">
+            <!--  SFX  -->
+            <cc:CardGroup Margin="0,11,0,0">
+                <cc:Card
+                    Title="{DynamicResource SoundEffect}"
+                    Icon="&#xe7f5;"
+                    Sub="{DynamicResource SoundEffectTip}">
                     <ui:ToggleSwitch
                         IsOn="{Binding UseSound}"
                         OffContent="{DynamicResource disable}"
                         OnContent="{DynamicResource enable}" />
                 </cc:Card>
-                <cc:Card Icon="&#xe994;" Title="{DynamicResource SoundEffectVolume}"
-                         Sub="{DynamicResource SoundEffectVolumeTip}"
-                         Visibility="{Binding UseSound, Converter={StaticResource BoolToVisibilityConverter}}">
+                <cc:Card
+                    Title="{DynamicResource SoundEffectVolume}"
+                    Icon="&#xe994;"
+                    IsEnabled="{Binding CheckMediaPlayer}"
+                    Sub="{DynamicResource SoundEffectVolumeTip}"
+                    Visibility="{Binding UseSound, Converter={StaticResource BoolToVisibilityConverter}}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Margin="0 0 8 0"
+                            Margin="0,0,8,0"
                             VerticalAlignment="Center"
                             Text="{Binding SoundEffectVolume}" />
-
                         <Slider
                             Width="250"
                             VerticalAlignment="Center"
@@ -460,9 +460,46 @@
                     </StackPanel>
                 </cc:Card>
             </cc:CardGroup>
+            <Border
+                Name="WMPWarning"
+                Padding="0,10"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                Background="{DynamicResource InfoBarWarningBG}"
+                BorderBrush="{DynamicResource Color03B}"
+                BorderThickness="0,1,0,0"
+                CornerRadius="5 5 5 5"
+                Visibility="{Binding CheckMediaPlayer, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}">
+                <Grid VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="58" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <ui:FontIcon
+                        Grid.Column="0"
+                        Margin="20,0,14,0"
+                        VerticalAlignment="Center"
+                        FontSize="15"
+                        Foreground="{DynamicResource InfoBarWarningIcon}"
+                        Glyph="&#xf167;" />
+                    <TextBlock
+                        Grid.Column="1"
+                        Margin="0,0,0,2"
+                        Padding="0,0,8,0"
+                        HorizontalAlignment="Left"
+                        FontSize="13"
+                        FontWeight="SemiBold"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource SoundEffectWarning}"
+                        TextWrapping="Wrap" />
+                </Grid>
+            </Border>
 
-            <!-- Settings color scheme -->
-            <cc:Card Icon="&#xe793;" Title="{DynamicResource ColorScheme}" Margin="0 11 0 0">
+            <!--  Settings color scheme  -->
+            <cc:Card
+                Title="{DynamicResource ColorScheme}"
+                Margin="0,11,0,0"
+                Icon="&#xe793;">
                 <ComboBox
                     MinWidth="180"
                     DisplayMemberPath="Display"
@@ -470,23 +507,23 @@
                     ItemsSource="{Binding ColorSchemes}"
                     SelectedValue="{Binding Settings.ColorScheme}"
                     SelectedValuePath="Value"
-                    SelectionChanged="Selector_OnSelectionChanged"/>
+                    SelectionChanged="Selector_OnSelectionChanged" />
             </cc:Card>
 
-            <!-- Theme folder -->
-            <cc:Card Icon="&#xe838;" Title="{DynamicResource ThemeFolder}">
+            <!--  Theme folder  -->
+            <cc:Card Title="{DynamicResource ThemeFolder}" Icon="&#xe838;">
                 <Button
                     MinWidth="180"
                     Command="{Binding OpenThemesFolderCommand}"
                     Content="{DynamicResource OpenThemeFolder}" />
             </cc:Card>
 
-            <!-- How to create theme link -->
+            <!--  How to create theme link  -->
             <cc:HyperLink
-                Margin="10 10 10 28"
+                Margin="10,10,10,28"
                 HorizontalAlignment="Right"
-                Uri="{Binding LinkHowToCreateTheme}"
-                Text="{DynamicResource howToCreateTheme}" />
+                Text="{DynamicResource howToCreateTheme}"
+                Uri="{Binding LinkHowToCreateTheme}" />
         </StackPanel>
     </ScrollViewer>
 </ui:Page>

From d4b3f1667c93c88965c4ad112df22168dd78c898 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Thu, 23 May 2024 22:34:17 +0800
Subject: [PATCH 12/13] Revert show warning logic

---
 .../ViewModels/SettingsPaneThemeViewModel.cs  | 19 ++++++++-----------
 .../SettingPages/Views/SettingsPaneTheme.xaml |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 5e8669450a6..deb0632795c 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Security.Policy;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -187,17 +186,15 @@ public bool UseSound
         get => Settings.UseSound;
         set => Settings.UseSound = value;
     }
-    public bool CheckMediaPlayer
+
+    public bool ShowWMPWarning
     {
-        get
-        {
-            if (Settings.WMPInstalled)
-            {
-                return true;
-            }
-            else { return false; }
-        }
-        set { }
+        get => !Settings.WMPInstalled;
+    }
+
+    public bool EnableVolumeAdjustment
+    {
+        get => Settings.WMPInstalled;
     }
 
     public double SoundEffectVolume
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index c93d1328c95..c864d5e7dd1 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -440,7 +440,7 @@
                 <cc:Card
                     Title="{DynamicResource SoundEffectVolume}"
                     Icon="&#xe994;"
-                    IsEnabled="{Binding CheckMediaPlayer}"
+                    IsEnabled="{Binding EnableVolumeAdjustment}"
                     Sub="{DynamicResource SoundEffectVolumeTip}"
                     Visibility="{Binding UseSound, Converter={StaticResource BoolToVisibilityConverter}}">
                     <StackPanel Orientation="Horizontal">
@@ -469,7 +469,7 @@
                 BorderBrush="{DynamicResource Color03B}"
                 BorderThickness="0,1,0,0"
                 CornerRadius="5 5 5 5"
-                Visibility="{Binding CheckMediaPlayer, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}">
+                Visibility="{Binding ShowWMPWarning, Converter={StaticResource BoolToVisibilityConverter}}">
                 <Grid VerticalAlignment="Center">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="58" />

From ac0f68066f0e010f24e506fa384caffffb011b00 Mon Sep 17 00:00:00 2001
From: Yusyuriv <Yusyuriv@users.noreply.github.com>
Date: Thu, 23 May 2024 20:47:42 +0600
Subject: [PATCH 13/13] Only show WMP warning when sound is enabled

---
 .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index deb0632795c..bcdd94e1ca9 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -189,7 +189,7 @@ public bool UseSound
 
     public bool ShowWMPWarning
     {
-        get => !Settings.WMPInstalled;
+        get => !Settings.WMPInstalled && UseSound;
     }
 
     public bool EnableVolumeAdjustment