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 0000000..c416131 Binary files /dev/null and b/src/BreCalClient/Resources/arrow_down_green.png differ diff --git a/src/BreCalClient/Resources/arrow_up_red.png b/src/BreCalClient/Resources/arrow_up_red.png new file mode 100644 index 0000000..02df9f1 Binary files /dev/null and b/src/BreCalClient/Resources/arrow_up_red.png differ diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 292fa2e..3f9f6d8 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -61,8 +61,9 @@ - - + + + + 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); + } + } + } +}