From e46ddb9cdc5afb633e182e431b5544a473bc87ee Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 19 Oct 2023 23:50:21 +0200 Subject: [PATCH] DeliveryConfirmationsDialog: move to DeliveryConfirmationsWindow --- .../DeliveryConfirmationsWindow.xaml} | 5 ++--- .../DeliveryConfirmationsWindow.xaml.cs} | 6 ++++-- Elwig/Windows/SeasonFinishWindow.xaml.cs | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) rename Elwig/{Dialogs/DeliveryConfirmationsDialog.xaml => Windows/DeliveryConfirmationsWindow.xaml} (97%) rename Elwig/{Dialogs/DeliveryConfirmationsDialog.xaml.cs => Windows/DeliveryConfirmationsWindow.xaml.cs} (94%) diff --git a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml b/Elwig/Windows/DeliveryConfirmationsWindow.xaml similarity index 97% rename from Elwig/Dialogs/DeliveryConfirmationsDialog.xaml rename to Elwig/Windows/DeliveryConfirmationsWindow.xaml index dbf9a2d..2faf564 100644 --- a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml +++ b/Elwig/Windows/DeliveryConfirmationsWindow.xaml @@ -1,13 +1,12 @@ - + Title="Anlieferungsbestätingungen - Elwig" Height="500" Width="800" MinHeight="400" MinWidth="600"> diff --git a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs similarity index 94% rename from Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs rename to Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs index eceb179..6c5b8fe 100644 --- a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs +++ b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs @@ -10,17 +10,19 @@ using System.Windows; using System.Windows.Input; namespace Elwig.Dialogs { - public partial class DeliveryConfirmationsDialog : ContextWindow { + public partial class DeliveryConfirmationsWindow : ContextWindow { public readonly int Year; - public DeliveryConfirmationsDialog(int year) { + public DeliveryConfirmationsWindow(int year) { InitializeComponent(); Year = year; Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig"; TextElement.Text = App.Client.TextDeliveryConfirmation; if (!App.Config.Debug) { TestButton.Visibility = Visibility.Hidden; + var m = ProgressBar.Margin; + ProgressBar.Margin = new(m.Left, m.Top, m.Right, m.Bottom - 32); } } diff --git a/Elwig/Windows/SeasonFinishWindow.xaml.cs b/Elwig/Windows/SeasonFinishWindow.xaml.cs index d4dbaa1..74441dd 100644 --- a/Elwig/Windows/SeasonFinishWindow.xaml.cs +++ b/Elwig/Windows/SeasonFinishWindow.xaml.cs @@ -51,8 +51,8 @@ namespace Elwig.Windows { private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) { if (SeasonInput.Value is not int year) return; - var d = new DeliveryConfirmationsDialog(year); - d.Show(); + var w = new DeliveryConfirmationsWindow(year); + w.Show(); } private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {