winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

App: Remove IsPrintingReady

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-04 21:43:13 +01:00
parent e9d0eec3bd
commit 77cf47e154
6 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Elwig/App.xaml.cs
View File

@ -60,7 +60,6 @@ namespace Elwig {
public static IList<IEventScale> EventScales => Scales.Where(s => s is IEventScale).Cast<IEventScale>().ToList(); public static IList<IEventScale> EventScales => Scales.Where(s => s is IEventScale).Cast<IEventScale>().ToList();
public static ClientParameters Client { get; set; } public static ClientParameters Client { get; set; }
public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
public static Dispatcher MainDispatcher { get; private set; } public static Dispatcher MainDispatcher { get; private set; }
public App() : base() { public App() : base() {
@ -119,8 +118,8 @@ namespace Elwig {
return Task.CompletedTask; return Task.CompletedTask;
}); });
Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged)); Utils.RunBackground("HTML Initialization", () => Html.Init());
Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged)); Utils.RunBackground("PDF Initialization", () => Pdf.Init());
Utils.RunBackground("JSON Schema Initialization", BillingData.Init); Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
if (Config.UpdateAuto && Config.UpdateUrl != null) { if (Config.UpdateAuto && Config.UpdateUrl != null) {
@ -181,21 +180,6 @@ namespace Elwig {
BranchMobileNr = entry.Item8; BranchMobileNr = entry.Item8;
} }
private void PrintingReadyChanged() {
Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
}
protected void OnPrintingReadyChanged(EventArgs evt) {
foreach (Window w in Windows) {
foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
b.IsEnabled = IsPrintingReady;
}
foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
i.IsEnabled = IsPrintingReady;
}
}
}
public static async Task HintContextChange() { public static async Task HintContextChange() {
foreach (Window w in CurrentApp.Windows) { foreach (Window w in CurrentApp.Windows) {
if (w is not ContextWindow c) continue; if (w is not ContextWindow c) continue;

8
Elwig/Windows/DeliveryAdminWindow.xaml
View File

@ -60,13 +60,13 @@
<MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False" <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
Click="Menu_Print_PrintDeliveryNote_Click"/> Click="Menu_Print_PrintDeliveryNote_Click"/>
<MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal"> <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
<MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen"
Click="Menu_Print_DeliveryJournal_ShowToday_Click"/> Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
<MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken"
Click="Menu_Print_DeliveryJournal_PrintToday_Click"/> Click="Menu_Print_DeliveryJournal_PrintToday_Click"/>
<MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen"
Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/> Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/>
<MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken"
Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/> Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/>
</MenuItem> </MenuItem>
</MenuItem> </MenuItem>

5
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -106,11 +106,6 @@ namespace Elwig.Windows {
} }
private void Window_Loaded(object sender, RoutedEventArgs evt) { 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); OnSecondPassed(null, null);
Timer.Start(); Timer.Start();
LockInputs(); LockInputs();

10
Elwig/Windows/MemberAdminWindow.xaml
View File

@ -52,16 +52,16 @@
<MenuItem Header="Drucken"> <MenuItem Header="Drucken">
<MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken" <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
Click="Menu_Print_Letterhead_Click"/> Click="Menu_Print_Letterhead_Click"/>
<MenuItem x:Name="Menu_Show_MemberDataSheet" Header="Stammdatenblatt anzeigen" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Show_MemberDataSheet" Header="Stammdatenblatt anzeigen" IsEnabled="False"
Click="Menu_Show_MemberDataSheet_Click" InputGestureText="Strg+P"/> Click="Menu_Show_MemberDataSheet_Click" InputGestureText="Strg+P"/>
<MenuItem x:Name="Menu_Print_MemberDataSheet" Header="Stammdatenblatt drucken" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_MemberDataSheet" Header="Stammdatenblatt drucken" IsEnabled="False"
Click="Menu_Print_MemberDataSheet_Click" InputGestureText="Strg+Shift+P"/> Click="Menu_Print_MemberDataSheet_Click" InputGestureText="Strg+Shift+P"/>
<MenuItem Header="Briefköpfe drucken"> <MenuItem Header="Briefköpfe drucken">
<MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert"
Click="Menu_Print_Letterheads_MgNr_Click"/> Click="Menu_Print_Letterheads_MgNr_Click"/>
<MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert"
Click="Menu_Print_Letterheads_Name_Click"/> Click="Menu_Print_Letterheads_Name_Click"/>
<MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert" IsEnabled="False" Tag="Print" <MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert"
Click="Menu_Print_Letterheads_Plz_Click"/> Click="Menu_Print_Letterheads_Plz_Click"/>
</MenuItem> </MenuItem>
</MenuItem> </MenuItem>

6
Elwig/Windows/MemberAdminWindow.xaml.cs
View File

@ -68,12 +68,6 @@ namespace Elwig.Windows {
} }
private void Window_Loaded(object sender, RoutedEventArgs evt) { private void Window_Loaded(object sender, RoutedEventArgs evt) {
Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady;
Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady;
Menu_Print_Letterheads_Plz.IsEnabled = App.IsPrintingReady;
Menu_Show_MemberDataSheet.IsEnabled = App.IsPrintingReady;
Menu_Print_MemberDataSheet.IsEnabled = App.IsPrintingReady;
ActiveMemberInput.IsChecked = true; ActiveMemberInput.IsChecked = true;
UpdateContactInfoVisibility(); UpdateContactInfoVisibility();
LockInputs(); LockInputs();

2
Elwig/Windows/PaymentVariantsWindow.xaml
View File

@ -166,7 +166,7 @@
<Button x:Name="TransactionButton" Content="Buchungsliste" FontSize="14" Width="180" Margin="10,42,10,10" Height="27" IsEnabled="False" <Button x:Name="TransactionButton" Content="Buchungsliste" FontSize="14" Width="180" Margin="10,42,10,10" Height="27" IsEnabled="False"
Click="TransactionButton_Click" Click="TransactionButton_Click"
VerticalAlignment="Top" HorizontalAlignment="Left"/> VerticalAlignment="Top" HorizontalAlignment="Left"/>
<Button x:Name="MailButton" Content="Traubengutschriften" FontSize="14" Width="180" Margin="10,74,10,10" Height="27" Tag="Print" IsEnabled="False" <Button x:Name="MailButton" Content="Traubengutschriften" FontSize="14" Width="180" Margin="10,74,10,10" Height="27" IsEnabled="False"
Click="MailButton_Click" Click="MailButton_Click"
VerticalAlignment="Top" HorizontalAlignment="Left"/> VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid> </Grid>