From ea623539d8df59e125c68ea2f61526f7ac78a701 Mon Sep 17 00:00:00 2001 From: Royce551 Date: Tue, 23 Nov 2021 14:35:58 -0600 Subject: [PATCH] More fixes, color scheme changes --- .../FRESHMusicPlayer.Core.dll | Bin 31744 -> 31744 bytes .../Forms/Playlists/PlaylistEntry.xaml.cs | 5 +++-- .../Forms/Playlists/PlaylistManagement.xaml | 2 +- .../IntegrationDisambiguation.xaml | 2 +- .../Integrations/ReleaseIntegrationPage.xaml | 2 +- .../Forms/TagEditor/TagEditor.xaml | 2 +- .../QueueManagement/QueueManagementPage.xaml | 6 ------ .../Pages/Settings/SettingsPage.xaml | 6 +----- .../Resources/DarkTheme.xaml | 9 +++++---- .../Resources/LightTheme.xaml | 13 ++++++------ .../Resources/Styles.xaml | 19 +++++++++--------- 11 files changed, 29 insertions(+), 37 deletions(-) diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/FRESHMusicPlayer.Core.dll b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/FRESHMusicPlayer.Core.dll index c3608f39817a305021b63e3e20bb56915f294a46..3dd2955d83a7ec1df2eee69e3c6e1c173da61af4 100644 GIT binary patch delta 5944 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 H0N39Eus78u delta 5855 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 diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistEntry.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistEntry.xaml.cs index f7bbe57..a536dda 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistEntry.xaml.cs +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistEntry.xaml.cs @@ -3,6 +3,7 @@ using FRESHMusicPlayer.Handlers; using FRESHMusicPlayer.Utilities; using Microsoft.Win32; using System.Collections.Generic; +using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Input; @@ -37,9 +38,9 @@ namespace FRESHMusicPlayer.Forms.Playlists this.path = path; CheckIfPlaylistExists(); } - private void CheckIfPlaylistExists() + private async void CheckIfPlaylistExists() { - foreach (var thing in library.ReadTracksForPlaylist(playlist)) + foreach (var thing in await Task.Run(() => library.ReadTracksForPlaylist(playlist))) { if (thing.Path == path) { diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistManagement.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistManagement.xaml index 6cd01b1..5c72481 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistManagement.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/Playlists/PlaylistManagement.xaml @@ -29,7 +29,7 @@ - + diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/IntegrationDisambiguation.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/IntegrationDisambiguation.xaml index 91f8a87..d1b7342 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/IntegrationDisambiguation.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/IntegrationDisambiguation.xaml @@ -16,7 +16,7 @@ - + diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/ReleaseIntegrationPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/ReleaseIntegrationPage.xaml index eedcdd3..25b9b2c 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/ReleaseIntegrationPage.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/Integrations/ReleaseIntegrationPage.xaml @@ -56,7 +56,7 @@ - + diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/TagEditor.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/TagEditor.xaml index 95bf001..640fee2 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/TagEditor.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Forms/TagEditor/TagEditor.xaml @@ -145,7 +145,7 @@ - + diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueManagementPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueManagementPage.xaml index c2f2c7a..323765c 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueManagementPage.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueManagementPage.xaml @@ -8,12 +8,6 @@ mc:Ignorable="d" d:DesignHeight="372" d:DesignWidth="235" Unloaded="Page_Unloaded" AllowDrop="True" Drop="Page_Drop"> - - - diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml index a9b9286..3e046ee 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml @@ -9,10 +9,6 @@ d:DesignHeight="1072" d:DesignWidth="335" Unloaded="Page_Unloaded"> -