From 9dc2e8a59acca7de9176f9baa6907a1cb986b7c8 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sat, 20 Jan 2024 15:47:20 +0100 Subject: [PATCH] Windows: Add Ctrl+P and Ctrl+Shift+P for delivery and member --- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 8 ++++++-- Elwig/Windows/MemberAdminWindow.xaml.cs | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 19eab8b..b02eaeb 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -28,7 +28,10 @@ namespace Elwig.Windows { private Member? Member = null; private readonly DispatcherTimer Timer; private List TextFilter = []; - private readonly RoutedCommand CtrlF = new(); + + private readonly RoutedCommand CtrlF = new("CtrlF", typeof(DeliveryAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]); + private readonly RoutedCommand CtrlP = new("CtrlP", typeof(DeliveryAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]); + private readonly RoutedCommand CtrlShiftP = new("CtrlShiftP", typeof(DeliveryAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control | ModifierKeys.Shift)]); private string? LastScaleError = null; private string? ManualWeighingReason = null; @@ -38,8 +41,9 @@ namespace Elwig.Windows { public DeliveryAdminWindow(bool receipt = false) { InitializeComponent(); - CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control)); CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput)); + CommandBindings.Add(new CommandBinding(CtrlP, Menu_Print_ShowDeliveryNote_Click)); + CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_Print_PrintDeliveryNote_Click)); RequiredInputs = [ MgNrInput, MemberInput, LsNrInput, DateInput, BranchInput, diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index 944d57c..435ec19 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -17,15 +17,19 @@ namespace Elwig.Windows { public partial class MemberAdminWindow : AdministrationWindow { private List TextFilter = []; - private readonly RoutedCommand CtrlF = new(); private readonly (ComboBox, TextBox, TextBox)[] PhoneNrInputs; + private readonly RoutedCommand CtrlF = new("CtrlF", typeof(MemberAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]); + private readonly RoutedCommand CtrlP = new("CtrlP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]); + private readonly RoutedCommand CtrlShiftP = new("CtrlShiftP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control | ModifierKeys.Shift)]); + private static ObservableCollection> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes); public MemberAdminWindow() { InitializeComponent(); - CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control)); CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput)); + CommandBindings.Add(new CommandBinding(CtrlP, Menu_Show_MemberDataSheet_Click)); + CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_Print_MemberDataSheet_Click)); ExemptInputs = [ SearchInput, ActiveMemberInput, MemberList, ];