prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- add soundplay for no WMP

Browse source 
- fix warning visibility
This commit is contained in:
DB p 2024-05-15 23:30:27 +09:00
parent bd867db99a
commit 5670085275
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Flow.Launcher/MainWindow.xaml.cs
View file

@ -29,6 +29,7 @@ using DataObject = System.Windows.DataObject;
using System.Windows.Media;
using System.Windows.Interop;
using System.Runtime.InteropServices;
using System.IO;
namespace Flow.Launcher
{
@ -46,7 +47,8 @@ namespace Flow.Launcher
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 @@ namespace Flow.Launcher
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 @@ namespace Flow.Launcher
{
if (_settings.UseSound)
{
animationSound.Position = TimeSpan.Zero;
animationSound.Volume = _settings.SoundVolume / 100.0;
animationSound.Play();
SoundPlay();
}
UpdatePosition();
PreviewReset();
@ -503,6 +503,20 @@ namespace Flow.Launcher
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();

2
Flow.Launcher/SettingWindow.xaml
View file

@ -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" />

2
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -73,7 +73,7 @@ namespace Flow.Launcher
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)