From aadf536d133c2f24df28d5baec2096ab32144372 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 28 Sep 2023 20:04:05 +0200 Subject: [PATCH] Windows: Fix Tag="Print" issue --- Elwig/Windows/DeliveryAdminWindow.xaml | 8 ++++---- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 5 +++++ Elwig/Windows/MemberAdminWindow.xaml | 7 ++++++- Elwig/Windows/MemberAdminWindow.xaml.cs | 3 +++ Elwig/Windows/TestWindow.xaml | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 0a6cbc6..cfc56ba 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -62,13 +62,13 @@ - - - - diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 8c55557..ebf5d59 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -94,6 +94,11 @@ namespace Elwig.Windows { } private void Window_Loaded(object sender, RoutedEventArgs evt) { + Menu_Print_DeliveryJournal_ShowToday.IsEnabled = App.IsPrintingReady; + Menu_Print_DeliveryJournal_PrintToday.IsEnabled = App.IsPrintingReady; + Menu_Print_DeliveryJournal_ShowFilter.IsEnabled = App.IsPrintingReady; + Menu_Print_DeliveryJournal_PrintFilter.IsEnabled = App.IsPrintingReady; + OnSecondPassed(null, null); Timer.Start(); LockInputs(); diff --git a/Elwig/Windows/MemberAdminWindow.xaml b/Elwig/Windows/MemberAdminWindow.xaml index 93e6fac..6e9e756 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml +++ b/Elwig/Windows/MemberAdminWindow.xaml @@ -55,7 +55,12 @@ - + + + + diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index 4e22217..88b4424 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -55,6 +55,9 @@ namespace Elwig.Windows { } private void Window_Loaded(object sender, RoutedEventArgs evt) { + Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady; + Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady; + ActiveMemberInput.IsChecked = true; UpdatePhoneNrInputVisibility(); LockInputs(); diff --git a/Elwig/Windows/TestWindow.xaml b/Elwig/Windows/TestWindow.xaml index c556a4f..0d4442e 100644 --- a/Elwig/Windows/TestWindow.xaml +++ b/Elwig/Windows/TestWindow.xaml @@ -19,9 +19,9 @@