From a5d225dc444bc60c5cabfaabfec50f20dbe64b5f Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Thu, 14 Jul 2022 02:46:45 -0600 Subject: [PATCH] Minor refactor --- .../Views/MainWindow/MainWindow.QuickFilters.axaml.cs | 6 +++--- .../Views/MainWindow/MainWindow.RemoveBooks.axaml.cs | 4 ++-- Source/LibationWinForms/Program.cs | 7 ++----- .../Properties/PublishProfiles/FolderProfile.pubxml | 1 + 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs index b0e2483e..ea430683 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs @@ -43,7 +43,7 @@ namespace LibationWinForms.AvaloniaUI.Views Tag = quickFilterTag, Header = $"_{++index}: {filter}" }; - quickFilterMenuItem.Click += (_, __) => performFilter(filter); + quickFilterMenuItem.Click += async (_, __) => await performFilter(filter); allItems.Add(quickFilterMenuItem); } quickFiltersToolStripMenuItem.Items = allItems; @@ -60,10 +60,10 @@ namespace LibationWinForms.AvaloniaUI.Views public void editQuickFiltersToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) => new EditQuickFilters().ShowDialog(); - public void productsDisplay_Initialized(object sender, EventArgs e) + public async void productsDisplay_Initialized(object sender, EventArgs e) { if (QuickFilters.UseDefault) - performFilter(QuickFilters.Filters.FirstOrDefault()); + await performFilter(QuickFilters.Filters.FirstOrDefault()); } } } diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs index 56521f24..b108aaea 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs @@ -20,7 +20,7 @@ namespace LibationWinForms.AvaloniaUI.Views await productsDisplay.RemoveCheckedBooksAsync(); } - public void doneRemovingBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) + public async void doneRemovingBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) { removeBooksBtn.IsVisible = false; doneRemovingBtn.IsVisible = false; @@ -30,7 +30,7 @@ namespace LibationWinForms.AvaloniaUI.Views //Restore the filter filterSearchTb.IsEnabled = true; filterSearchTb.IsVisible = true; - performFilter(filterSearchTb.Text); + await performFilter(filterSearchTb.Text); } public void removeLibraryBooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) diff --git a/Source/LibationWinForms/Program.cs b/Source/LibationWinForms/Program.cs index 35144fb8..0555bd5c 100644 --- a/Source/LibationWinForms/Program.cs +++ b/Source/LibationWinForms/Program.cs @@ -20,8 +20,6 @@ namespace LibationWinForms [return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)] static extern bool AllocConsole(); - static bool UseAvaloniaUI = true; - [STAThread] static async Task Main() { @@ -39,12 +37,11 @@ namespace LibationWinForms if (!startupTask.Result.success) return; - //When RunStartupStuff completes, check if user has opted into beta and run Avalonia UI if they did. //Otherwise we just ignore all the Avalonia app build stuff and continue with winforms. //For debug purposes, always run AvaloniaUI. - if (true) // (startupTask.Result.useBeta) + if (true)// (startupTask.Result.useBeta) { await Task.WhenAll(appBuilderTask, classicLifetimeTask, startupTask); @@ -121,7 +118,7 @@ namespace LibationWinForms // global exception handling (ShowAdminAlert) attempts to use logging. only call it after logging has been init'd postLoggingGlobalExceptionHandling(); - return (true, !useBeta); + return (true, useBeta); } private static void RunInstaller(Configuration config) diff --git a/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml index 806982d7..1ba3b7df 100644 --- a/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml @@ -12,5 +12,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. win-x64 false false + true \ No newline at end of file