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

rename showSound to animationSound

Browse source
This commit is contained in:
Jeremy 2021-12-20 20:58:50 +11:00
parent 65106719c7
commit 58317b7d3f
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,6 @@ namespace Flow.Launcher
PluginManager.LoadPlugins(_settings.PluginSettings);
_mainVM = new MainViewModel(_settings);
API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
Http.API = API;
@ -78,7 +77,6 @@ namespace Flow.Launcher
await PluginManager.InitializePlugins(API);
var window = new MainWindow(_settings, _mainVM);
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
Current.MainWindow = window;

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

@ -31,7 +31,7 @@ namespace Flow.Launcher
private NotifyIcon _notifyIcon;
private ContextMenu contextMenu;
private MainViewModel _viewModel;
private readonly MediaPlayer showSound = new();
private readonly MediaPlayer animationSound = new();
private bool _animating;
#endregion
@ -43,7 +43,7 @@ namespace Flow.Launcher
_settings = settings;
InitializeComponent();
InitializePosition();
showSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
}
public MainWindow()
@ -89,8 +89,8 @@ namespace Flow.Launcher
{
if (_settings.UseSound)
{
showSound.Position = TimeSpan.Zero;
showSound.Play();
animationSound.Position = TimeSpan.Zero;
animationSound.Play();
}
UpdatePosition();
@ -108,6 +108,7 @@ namespace Flow.Launcher
_progressBarStoryboard.Begin(ProgressBar, true);
isProgressBarStoryboardPaused = false;
}
if(_settings.UseAnimation)
WindowAnimator();
}

2
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -4,7 +4,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Input;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Core.Resource;
@ -14,7 +13,6 @@ using Flow.Launcher.Infrastructure.Hotkey;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Storage;
using Flow.Launcher.Infrastructure.Logger;
using Microsoft.VisualStudio.Threading;