Renamed RoutedEventArgs e to RoutedEventArgs evt

This commit is contained in:
2023-03-11 15:29:35 +01:00
parent e3e30bfc56
commit 8d61fdd35e
6 changed files with 51 additions and 103 deletions

View File

@ -21,22 +21,22 @@ namespace WGneu {
MainDispatcher = Dispatcher; MainDispatcher = Dispatcher;
} }
protected override void OnStartup(StartupEventArgs e) { protected override void OnStartup(StartupEventArgs evt) {
Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged)); Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged)); Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
base.OnStartup(e); base.OnStartup(evt);
} }
protected override void OnExit(ExitEventArgs e) { protected override void OnExit(ExitEventArgs evt) {
Utils.RunBackground("PDF Close", () => Documents.Pdf.Close()); Utils.RunBackground("PDF Close", () => Documents.Pdf.Close());
base.OnExit(e); base.OnExit(evt);
} }
private void PrintingReadyChanged() { private void PrintingReadyChanged() {
Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs()); Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
} }
protected void OnPrintingReadyChanged(EventArgs e) { protected void OnPrintingReadyChanged(EventArgs evt) {
foreach (Window w in Windows) { foreach (Window w in Windows) {
foreach (var b in Utils.FindVisualChilds<Button>(w).Where(b => "Print".Equals(b.Tag))) { foreach (var b in Utils.FindVisualChilds<Button>(w).Where(b => "Print".Equals(b.Tag))) {
b.IsEnabled = IsPrintingReady; b.IsEnabled = IsPrintingReady;

View File

@ -1,17 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WGneu.Helpers; using WGneu.Helpers;
using WGneu.Models; using WGneu.Models;
@ -32,7 +23,7 @@ namespace WGneu.Windows {
ContractList.SelectedIndex = 0; ContractList.SelectedIndex = 0;
} }
private void ContractList_SelectionChanged(object sender, SelectionChangedEventArgs e) { private void ContractList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
RefreshContractList(); RefreshContractList();
} }
} }

View File

@ -1,16 +1,4 @@
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace WGneu.Windows { namespace WGneu.Windows {
public partial class DeliveryReceptionWindow : Window { public partial class DeliveryReceptionWindow : Window {

View File

@ -1,16 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WGneu.Helpers; using WGneu.Helpers;
namespace WGneu.Windows { namespace WGneu.Windows {
@ -28,7 +17,7 @@ namespace WGneu.Windows {
PdfFile = file; PdfFile = file;
} }
public void OnClosed(object sender, EventArgs e) { public void OnClosed(object sender, EventArgs evt) {
PdfFile?.Dispose(); PdfFile?.Dispose();
PdfFile = null; PdfFile = null;
} }

View File

@ -7,45 +7,35 @@ using System.Runtime.Intrinsics.X86;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WGneu.Documents; using WGneu.Documents;
using WGneu.Helpers; using WGneu.Helpers;
using WGneu.Models;
namespace WGneu.Windows { namespace WGneu.Windows {
public partial class MainWindow : Window { public partial class MainWindow : Window {
private readonly WgContext _context = new WgContext(); private readonly WgContext Context = new();
public MainWindow() { public MainWindow() {
InitializeComponent(); InitializeComponent();
} }
private void Window_Loaded(object sender, RoutedEventArgs e) { private void Window_Loaded(object sender, RoutedEventArgs evt) {
_context.Countries.Load(); Context.Countries.Load();
Button4.IsEnabled = App.IsPrintingReady; Button4.IsEnabled = App.IsPrintingReady;
} }
protected override void OnClosing(CancelEventArgs e) { protected override void OnClosing(CancelEventArgs evt) {
_context.Dispose(); Context.Dispose();
base.OnClosing(e); base.OnClosing(evt);
} }
private void Button2_Click(object sender, EventArgs e) { private void Button2_Click(object sender, RoutedEventArgs evt) {
var w = new MemberListWindow(); var w = new MemberListWindow();
w.Show(); w.Show();
} }
private void Button4_Click(object sender, EventArgs e) { private void Button4_Click(object sender, RoutedEventArgs evt) {
Utils.RunBackground("PDF Generation", async () => { Utils.RunBackground("PDF Generation", async () => {
using var letter = new BusinessLetter("Test Dokument", _context.Members.First()); using var letter = new BusinessLetter("Test Dokument", Context.Members.First());
await letter.Generate(); await letter.Generate();
letter.Show(); letter.Show();
}); });

View File

@ -1,21 +1,11 @@
using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics.Metrics;
using System.Linq; using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WGneu.Helpers; using WGneu.Helpers;
using WGneu.Models; using WGneu.Models;
@ -44,15 +34,15 @@ namespace WGneu.Windows {
Valid[tb] = true; Valid[tb] = true;
} }
private void Window_Loaded(object sender, RoutedEventArgs e) { private void Window_Loaded(object sender, RoutedEventArgs evt) {
ActiveMemberInput.IsChecked = true; ActiveMemberInput.IsChecked = true;
BranchInput.ItemsSource = Context.Branches.OrderBy(b => b.Name).ToList(); BranchInput.ItemsSource = Context.Branches.OrderBy(b => b.Name).ToList();
DefaultKgInput.ItemsSource = Context.WbKgs.Select(k => k.Kg).OrderBy(k => k.Name).ToList(); DefaultKgInput.ItemsSource = Context.WbKgs.Select(k => k.Kg).OrderBy(k => k.Name).ToList();
} }
protected override void OnClosing(CancelEventArgs e) { protected override void OnClosing(CancelEventArgs evt) {
Context.Dispose(); Context.Dispose();
base.OnClosing(e); base.OnClosing(evt);
} }
private int CountMatchesInMember(Member m) { private int CountMatchesInMember(Member m) {
@ -122,15 +112,15 @@ namespace WGneu.Windows {
MgNrInput.Text = NextMgNr().ToString(); MgNrInput.Text = NextMgNr().ToString();
} }
private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs e) { private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
RefreshInputs(); RefreshInputs();
} }
private void ActiveMemberInput_Changed(object sender, RoutedEventArgs e) { private void ActiveMemberInput_Changed(object sender, RoutedEventArgs evt) {
RefreshMemberList(); RefreshMemberList();
} }
private void NewMemberButton_Click(object sender, RoutedEventArgs e) { private void NewMemberButton_Click(object sender, RoutedEventArgs evt) {
IsCreating = true; IsCreating = true;
MemberList.IsEnabled = false; MemberList.IsEnabled = false;
InitInputs(); InitInputs();
@ -140,7 +130,7 @@ namespace WGneu.Windows {
LockSearchInputs(); LockSearchInputs();
} }
private void EditMemberButton_Click(object sender, RoutedEventArgs e) { private void EditMemberButton_Click(object sender, RoutedEventArgs evt) {
if (MemberList.SelectedItem == null) if (MemberList.SelectedItem == null)
return; return;
@ -153,7 +143,7 @@ namespace WGneu.Windows {
LockSearchInputs(); LockSearchInputs();
} }
private void DeleteMemberButton_Click(object sender, RoutedEventArgs e) { private void DeleteMemberButton_Click(object sender, RoutedEventArgs evt) {
Member m = (Member)MemberList.SelectedItem; Member m = (Member)MemberList.SelectedItem;
if (m == null) return; if (m == null) return;
@ -167,7 +157,7 @@ namespace WGneu.Windows {
} }
} }
private void SaveButton_Click(object sender, RoutedEventArgs e) { private void SaveButton_Click(object sender, RoutedEventArgs evt) {
Member? m = new(); Member? m = new();
if (IsEditing) if (IsEditing)
m = (Member)MemberList.SelectedItem; m = (Member)MemberList.SelectedItem;
@ -237,7 +227,7 @@ namespace WGneu.Windows {
RefreshMemberList(); RefreshMemberList();
} }
private void ResetButton_Click(object sender, RoutedEventArgs e) { private void ResetButton_Click(object sender, RoutedEventArgs evt) {
if (IsEditing) { if (IsEditing) {
RefreshInputs(); RefreshInputs();
} else if (IsCreating) { } else if (IsCreating) {
@ -246,7 +236,7 @@ namespace WGneu.Windows {
UpdateButtons(); UpdateButtons();
} }
private void CancelButton_Click(object sender, RoutedEventArgs e) { private void CancelButton_Click(object sender, RoutedEventArgs evt) {
IsEditing = false; IsEditing = false;
IsCreating = false; IsCreating = false;
MemberList.IsEnabled = true; MemberList.IsEnabled = true;
@ -257,21 +247,21 @@ namespace WGneu.Windows {
UnlockSearchInputs(); UnlockSearchInputs();
} }
private void ContractButton_Click(object sender, RoutedEventArgs e) { private void ContractButton_Click(object sender, RoutedEventArgs evt) {
var w = new ContractListWindow((Member)MemberList.SelectedItem); var w = new ContractListWindow((Member)MemberList.SelectedItem);
w.Show(); w.Show();
} }
private void SearchInput_TextChanged(object sender, RoutedEventArgs e) { private void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(s => s != ""); TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(s => s != "");
RefreshMemberList(); RefreshMemberList();
} }
private void Menu_Member_SendEmail_Click(object sender, EventArgs e) { private void Menu_Member_SendEmail_Click(object sender, EventArgs evt) {
Utils.MailTo(((Member)MemberList.SelectedItem).Email); Utils.MailTo(((Member)MemberList.SelectedItem).Email);
} }
private void FocusSearchInput(object sender, RoutedEventArgs e) { private void FocusSearchInput(object sender, RoutedEventArgs evt) {
if (!IsEditing && !IsCreating) { if (!IsEditing && !IsCreating) {
SearchInput.Focus(); SearchInput.Focus();
SearchInput.SelectAll(); SearchInput.SelectAll();
@ -497,7 +487,7 @@ namespace WGneu.Windows {
MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning); MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
} }
private void CheckBox_Changed(object sender, RoutedEventArgs e) { private void CheckBox_Changed(object sender, RoutedEventArgs evt) {
var input = (CheckBox)sender; var input = (CheckBox)sender;
if (InputHasChanged(input)) { if (InputHasChanged(input)) {
Utils.SetInputChanged(input); Utils.SetInputChanged(input);
@ -507,7 +497,7 @@ namespace WGneu.Windows {
UpdateButtons(); UpdateButtons();
} }
private void RadioButton_Changed(object sender, RoutedEventArgs e) { private void RadioButton_Changed(object sender, RoutedEventArgs evt) {
var input = (RadioButton)sender; var input = (RadioButton)sender;
if (InputHasChanged(input)) { if (InputHasChanged(input)) {
Utils.SetInputChanged(input); Utils.SetInputChanged(input);
@ -517,7 +507,7 @@ namespace WGneu.Windows {
UpdateButtons(); UpdateButtons();
} }
private void TextBox_TextChanged(object sender, RoutedEventArgs e) { private void TextBox_TextChanged(object sender, RoutedEventArgs evt) {
var input = (TextBox)sender; var input = (TextBox)sender;
if (InputHasChanged(input)) { if (InputHasChanged(input)) {
Utils.SetInputChanged(input); Utils.SetInputChanged(input);
@ -527,7 +517,7 @@ namespace WGneu.Windows {
UpdateButtons(); UpdateButtons();
} }
private void ComboBox_SelectionChanged(object sender, RoutedEventArgs e) { private void ComboBox_SelectionChanged(object sender, RoutedEventArgs evt) {
var input = (ComboBox)sender; var input = (ComboBox)sender;
if (InputHasChanged(input)) { if (InputHasChanged(input)) {
// TODO not working // TODO not working
@ -538,62 +528,62 @@ namespace WGneu.Windows {
UpdateButtons(); UpdateButtons();
} }
private void PlzInput_TextChanged(object sender, RoutedEventArgs e) { private void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, false, Validator.CheckPlz); InputTextChanged((TextBox)sender, false, Validator.CheckPlz);
UpdatePlz((TextBox)sender, OrtInput); UpdatePlz((TextBox)sender, OrtInput);
} }
private void PlzInput_LostFocus(object sender, RoutedEventArgs e) { private void PlzInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckPlz, null); InputLostFocus((TextBox)sender, true, Validator.CheckPlz, null);
UpdatePlz((TextBox)sender, OrtInput); UpdatePlz((TextBox)sender, OrtInput);
} }
private void PhoneNrInput_TextChanged(object sender, RoutedEventArgs e) { private void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckPhoneNumber); InputTextChanged((TextBox)sender, true, Validator.CheckPhoneNumber);
} }
private void PhoneNrInput_LostFocus(object sender, RoutedEventArgs e) { private void PhoneNrInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckPhoneNumber, null); InputLostFocus((TextBox)sender, true, Validator.CheckPhoneNumber, null);
} }
private void EmailInput_TextChanged(object sender, RoutedEventArgs e) { private void EmailInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckEmailAddress); InputTextChanged((TextBox)sender, true, Validator.CheckEmailAddress);
} }
private void EmailInput_LostFocus(object sender, RoutedEventArgs e) { private void EmailInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckEmailAddress, null); InputLostFocus((TextBox)sender, true, Validator.CheckEmailAddress, null);
} }
private void IbanInput_TextChanged(object sender, RoutedEventArgs e) { private void IbanInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckIban); InputTextChanged((TextBox)sender, true, Validator.CheckIban);
} }
private void IbanInput_LostFocus(object sender, RoutedEventArgs e) { private void IbanInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckIban, null); InputLostFocus((TextBox)sender, true, Validator.CheckIban, null);
} }
private void BicInput_TextChanged(object sender, RoutedEventArgs e) { private void BicInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckBic); InputTextChanged((TextBox)sender, true, Validator.CheckBic);
} }
private void BicInput_LostFocus(object sender, RoutedEventArgs e) { private void BicInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckBic, null); InputLostFocus((TextBox)sender, true, Validator.CheckBic, null);
} }
private void LfbisNrInput_TextChanged(object sender, RoutedEventArgs e) { private void LfbisNrInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckLfbisNr); InputTextChanged((TextBox)sender, true, Validator.CheckLfbisNr);
} }
private void LfbisNrInput_LostFocus(object sender, RoutedEventArgs e) { private void LfbisNrInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckLfbisNr, "Betriebsnummer ungültig"); InputLostFocus((TextBox)sender, true, Validator.CheckLfbisNr, "Betriebsnummer ungültig");
} }
private void BillingPlzInput_TextChanged(object sender, RoutedEventArgs e) { private void BillingPlzInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, true, Validator.CheckPlz); InputTextChanged((TextBox)sender, true, Validator.CheckPlz);
UpdatePlz((TextBox)sender, BillingOrtInput); UpdatePlz((TextBox)sender, BillingOrtInput);
} }
private void BillingPlzInput_LostFocus(object sender, RoutedEventArgs e) { private void BillingPlzInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, true, Validator.CheckPlz, null); InputLostFocus((TextBox)sender, true, Validator.CheckPlz, null);
UpdatePlz((TextBox)sender, BillingOrtInput); UpdatePlz((TextBox)sender, BillingOrtInput);
} }