From 0e17aa5408d878a1fa783a705e020f79920bb035 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 28 Sep 2023 20:09:12 +0200 Subject: [PATCH] Windows: Use Cursor.AppStarting instead of Cursor.Wait --- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 24 +++++++++++------------ Elwig/Windows/TestWindow.xaml.cs | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 2faa6f3..e32de38 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -113,7 +113,7 @@ namespace Elwig.Windows { private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) { if (DeliveryList.SelectedItem is not Delivery d) return; - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var doc = new DeliveryNote(d, Context); await doc.Generate(); Mouse.OverrideCursor = null; @@ -122,7 +122,7 @@ namespace Elwig.Windows { private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) { if (DeliveryList.SelectedItem is not Delivery d) return; - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var doc = new DeliveryNote(d, Context); await doc.Generate(); Mouse.OverrideCursor = null; @@ -139,7 +139,7 @@ namespace Elwig.Windows { Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig" }; if (d.ShowDialog() == true) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var file = new Bki(d.FileName); await file.ExportAsync(year); Mouse.OverrideCursor = null; @@ -147,7 +147,7 @@ namespace Elwig.Windows { } private async void Menu_Print_DeliveryJournal_ShowToday_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today)); await doc.Generate(); Mouse.OverrideCursor = null; @@ -155,7 +155,7 @@ namespace Elwig.Windows { } private async void Menu_Print_DeliveryJournal_PrintToday_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today)); await doc.Generate(); Mouse.OverrideCursor = null; @@ -163,7 +163,7 @@ namespace Elwig.Windows { } private async void Menu_Print_DeliveryJournal_ShowFilter_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; var (f, _, d, _) = await GetFilters(); var doc = new DeliveryJournal(string.Join(" / ", f), d); await doc.Generate(); @@ -172,7 +172,7 @@ namespace Elwig.Windows { } private async void Menu_Print_DeliveryJournal_PrintFilter_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; var (f, _, d, _) = await GetFilters(); var doc = new DeliveryJournal(string.Join(" / ", f), d); await doc.Generate(); @@ -883,7 +883,7 @@ namespace Elwig.Windows { await RefreshDeliveryList(); await RefreshDeliveryParts(); if (p?.Delivery != null) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var doc = new DeliveryNote(p.Delivery, Context); await doc.Generate(); Mouse.OverrideCursor = null; @@ -954,7 +954,7 @@ namespace Elwig.Windows { try { if (res == null || res <= 0) return; - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; ClearOriginalValues(); if (res >= p.Weight) { ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, "WEI"); @@ -1036,7 +1036,7 @@ namespace Elwig.Windows { $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?", "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); if (r == MessageBoxResult.Yes) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; Context.Remove(d); await Context.SaveChangesAsync(); await RefreshDeliveryList(); @@ -1123,7 +1123,7 @@ namespace Elwig.Windows { EntityEntry? entry = null; try { Delivery? d = null; - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; if (res == "new") { d = Context.CreateProxy(); d.Date = delivery.Date; @@ -1174,7 +1174,7 @@ namespace Elwig.Windows { $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?", "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); if (r == MessageBoxResult.Yes) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; Context.Remove(p); await Context.SaveChangesAsync(); await RefreshDeliveryParts(); diff --git a/Elwig/Windows/TestWindow.xaml.cs b/Elwig/Windows/TestWindow.xaml.cs index d8f7ed7..6ce4874 100644 --- a/Elwig/Windows/TestWindow.xaml.cs +++ b/Elwig/Windows/TestWindow.xaml.cs @@ -51,7 +51,7 @@ namespace Elwig.Windows { } private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var ctx = new AppDbContext(); using var doc = new DeliveryNote(await ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).LastAsync(), ctx); await doc.Generate(); @@ -60,7 +60,7 @@ namespace Elwig.Windows { } private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) { - Mouse.OverrideCursor = Cursors.Wait; + Mouse.OverrideCursor = Cursors.AppStarting; using var ctx = new AppDbContext(); using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx); await doc.Generate();