From 9a735898bae87c67c533b0225406a799b4b01bb0 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Fri, 4 Aug 2023 08:33:01 +0200 Subject: [PATCH] Herunterklappbares Shipcall Control, angefangen --- src/BreCalClient/BreCalClient.csproj | 6 +- .../Resources/Resources.Designer.cs | 20 +++++++ src/BreCalClient/Resources/Resources.resx | 6 ++ .../Resources/arrow_down_green.png | Bin 0 -> 1333 bytes src/BreCalClient/Resources/arrow_up_red.png | Bin 0 -> 1319 bytes src/BreCalClient/ShipcallControl.xaml | 8 ++- src/BreCalClient/ShipcallControl.xaml.cs | 12 +++- src/BreCalClient/ShipcallExtraControl.xaml | 14 +++++ src/BreCalClient/ShipcallExtraControl.xaml.cs | 55 ++++++++++++++++++ 9 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 src/BreCalClient/Resources/arrow_down_green.png create mode 100644 src/BreCalClient/Resources/arrow_up_red.png create mode 100644 src/BreCalClient/ShipcallExtraControl.xaml create mode 100644 src/BreCalClient/ShipcallExtraControl.xaml.cs diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 8f75d31..f3e0021 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -7,7 +7,7 @@ true True BreCalClient.App - C:\git_lager\git_brcal\misc\brecal.snk + E:\gitlager\git_brcal\misc\brecal.snk 0.1.0.0 0.1.0.0 Bremen calling client @@ -15,9 +15,11 @@ + + @@ -52,9 +54,11 @@ OpenApiCodeGenerator BreCalApi.cs + + diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 26afcfe..e5fb3f8 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] arrow_down_green { + get { + object obj = ResourceManager.GetObject("arrow_down_green", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -90,6 +100,16 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] arrow_up_red { + get { + object obj = ResourceManager.GetObject("arrow_up_red", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index bb55b44..4e8d30e 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + arrow_down_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + arrow_down_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -127,6 +130,9 @@ arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + arrow_up_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/BreCalClient/Resources/arrow_down_green.png b/src/BreCalClient/Resources/arrow_down_green.png new file mode 100644 index 0000000000000000000000000000000000000000..c416131ea93e14c38171ecd9789e07476e4b60e0 GIT binary patch literal 1333 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 dPD4*pQy@oeVn`5 - - + + + + diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 785240f..befab54 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -1,5 +1,5 @@ // Copyright (c) 2023 schick Informatik -// Description: Custom control to display a ship call +// Description: Show general shipcall info // using System; @@ -29,6 +29,8 @@ namespace BreCalClient public event Action? TimesRequested; + public event Action? OpenExtraRequested; + #endregion #region Properties @@ -61,6 +63,14 @@ namespace BreCalClient { this.EditRequested(this); } + } + + private void buttonOpenDropDown_Click(object sender, RoutedEventArgs e) + { + if(this.OpenExtraRequested != null) + { + this.OpenExtraRequested(this); + } } #endregion diff --git a/src/BreCalClient/ShipcallExtraControl.xaml b/src/BreCalClient/ShipcallExtraControl.xaml new file mode 100644 index 0000000..c81f640 --- /dev/null +++ b/src/BreCalClient/ShipcallExtraControl.xaml @@ -0,0 +1,14 @@ + + + + + diff --git a/src/BreCalClient/ShipcallExtraControl.xaml.cs b/src/BreCalClient/ShipcallExtraControl.xaml.cs new file mode 100644 index 0000000..8f76d6f --- /dev/null +++ b/src/BreCalClient/ShipcallExtraControl.xaml.cs @@ -0,0 +1,55 @@ +// 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); + } + } + } +}