From cb742fb17caf0538f383dd95f7c1f60a8b8b3148 Mon Sep 17 00:00:00 2001 From: puls200 Date: Mon, 18 Sep 2023 14:55:56 +0200 Subject: [PATCH] working on times edit control for terminal --- src/BreCalClient/EditTimesControl.xaml | 36 +----- src/BreCalClient/EditTimesControl.xaml.cs | 25 +---- .../EditTimesTerminalControl.xaml | 76 +++++++++++++ .../EditTimesTerminalControl.xaml.cs | 105 ++++++++++++++++++ src/BreCalClient/IEditTimesControl.cs | 17 +++ src/BreCalClient/MainWindow.xaml.cs | 7 +- .../Resources/Resources.Designer.cs | 9 ++ src/BreCalClient/Resources/Resources.de.resx | 3 + src/BreCalClient/Resources/Resources.resx | 3 + src/BreCalClient/ShipcallExtraControl.xaml | 14 --- src/BreCalClient/ShipcallExtraControl.xaml.cs | 55 --------- 11 files changed, 230 insertions(+), 120 deletions(-) create mode 100644 src/BreCalClient/EditTimesTerminalControl.xaml create mode 100644 src/BreCalClient/EditTimesTerminalControl.xaml.cs create mode 100644 src/BreCalClient/IEditTimesControl.cs delete mode 100644 src/BreCalClient/ShipcallExtraControl.xaml delete mode 100644 src/BreCalClient/ShipcallExtraControl.xaml.cs diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml index 879d663..4bac332 100644 --- a/src/BreCalClient/EditTimesControl.xaml +++ b/src/BreCalClient/EditTimesControl.xaml @@ -8,7 +8,7 @@ xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textEditTimes}" Height="330" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico"> + Title="{x:Static p:Resources.textEditTimes}" Height="280" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico"> @@ -21,8 +21,6 @@ - - @@ -31,9 +29,8 @@ - diff --git a/src/BreCalClient/ShipcallExtraControl.xaml.cs b/src/BreCalClient/ShipcallExtraControl.xaml.cs deleted file mode 100644 index 8f76d6f..0000000 --- a/src/BreCalClient/ShipcallExtraControl.xaml.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2023 schick Informatik -// Description: Extra shipcall info shown in drop down -// - -using System; -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.Navigation; -using System.Windows.Shapes; - -namespace BreCalClient -{ - /// - /// Interaction logic for ShipcallExtraControl.xaml - /// - public partial class ShipcallExtraControl : UserControl - { - public ShipcallExtraControl() - { - InitializeComponent(); - } - - #region events - - public event Action? CloseExtraRequested; - - #endregion - - #region Properties - - /// - /// this is our datasource - /// - public ShipcallControlModel? ShipcallControlModel { get; set; } - - #endregion - - private void buttonCloseDropDown_Click(object sender, RoutedEventArgs e) - { - if (this.CloseExtraRequested != null) - { - this.CloseExtraRequested(this); - } - } - } -}