Herunterklappbares Shipcall Control, angefangen

src/BreCalClient/BreCalClient.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
-    <AssemblyOriginatorKeyFile>C:\git_lager\git_brcal\misc\brecal.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>E:\gitlager\git_brcal\misc\brecal.snk</AssemblyOriginatorKeyFile>
     <AssemblyVersion>0.1.0.0</AssemblyVersion>
     <FileVersion>0.1.0.0</FileVersion>
     <Title>Bremen calling client</Title>
@@ -15,9 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Resources\arrow_down_green.png" />
     <None Remove="Resources\arrow_down_red.png" />
     <None Remove="Resources\arrow_right_blue.png" />
     <None Remove="Resources\arrow_up_green.png" />
+    <None Remove="Resources\arrow_up_red.png" />
     <None Remove="Resources\clipboard.png" />
     <None Remove="Resources\clock.png" />
     <None Remove="Resources\containership.png" />
@@ -52,9 +54,11 @@
       <Generator>OpenApiCodeGenerator</Generator>
       <LastGenOutput>BreCalApi.cs</LastGenOutput>
     </None>
+    <Resource Include="Resources\arrow_down_green.png" />
     <Resource Include="Resources\arrow_down_red.png" />
     <Resource Include="Resources\arrow_right_blue.png" />
     <Resource Include="Resources\arrow_up_green.png" />
+    <Resource Include="Resources\arrow_up_red.png" />
     <Resource Include="Resources\clipboard.png" />
     <Resource Include="Resources\clock.png" />
     <Resource Include="Resources\containership.png" />

src/BreCalClient/Resources/Resources.Designer.cs

@@ -60,6 +60,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_down_green {
+            get {
+                object obj = ResourceManager.GetObject("arrow_down_green", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -90,6 +100,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_up_red {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up_red", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

src/BreCalClient/Resources/Resources.resx

@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrow_down_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>arrow_down_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="arrow_down_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_down_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -127,6 +130,9 @@
   <data name="arrow_up_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="arrow_up_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>arrow_up_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>

src/BreCalClient/ShipcallControl.xaml

@@ -61,8 +61,9 @@
             </Viewbox>
             <Grid Grid.Row="2" Grid.Column="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width=".5*" />
+                    <ColumnDefinition Width=".4*" />
-                    <ColumnDefinition Width=".5*" />
+                    <ColumnDefinition Width=".4*" />
+                    <ColumnDefinition Width=".2*" />
                 </Grid.ColumnDefinitions>
                 <Button x:Name="buttonListTimes" Click="buttonListTimes_Click" Grid.Column="0" Background="Transparent" ToolTip="List times" Margin="1" BorderThickness="0" HorizontalAlignment="Right">
                     <Image Source="./Resources/clock.png" />
@@ -70,6 +71,9 @@
                 <Button x:Name="buttonEditShipcall" Click="buttonEditShipcall_Click" Grid.Column="1" Background="Transparent" ToolTip="Edit shipcall" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
                     <Image Source="./Resources/clipboard.png" />
                 </Button>
+                <Button x:Name="buttonOpenDropDown" Click="buttonOpenDropDown_Click" Grid.Column="2" Background="Transparent" ToolTip="Show extra info" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
+                    <Image Source="./Resources/arrow_down_green.png" />
+                </Button>
             </Grid>
             <Viewbox Grid.Column="2" Grid.Row="3">
                 <TextBlock Text="" />

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<ShipcallControl>? TimesRequested;
 
+        public event Action<ShipcallControl>? OpenExtraRequested;
+
         #endregion
 
         #region Properties
@@ -63,6 +65,14 @@ namespace BreCalClient
             }
         }        
 
+        private void buttonOpenDropDown_Click(object sender, RoutedEventArgs e)
+        {
+            if(this.OpenExtraRequested != null)
+            {
+                this.OpenExtraRequested(this);
+            }
+        }
+
         #endregion
 
     }

src/BreCalClient/ShipcallExtraControl.xaml

@@ -0,0 +1,14 @@
+<UserControl x:Class="BreCalClient.ShipcallExtraControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BreCalClient"
+             mc:Ignorable="d" 
+             d:DesignHeight="100" d:DesignWidth="800">
+    <Grid>
+        <Button x:Name="buttonCloseDropDown" Click="buttonCloseDropDown_Click" Grid.Column="2" Background="Transparent" ToolTip="Close extra info" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
+            <Image Source="./Resources/arrow_up_red.png" />
+        </Button>
+    </Grid>
+</UserControl>

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
+{
+    /// <summary>
+    /// Interaction logic for ShipcallExtraControl.xaml
+    /// </summary>
+    public partial class ShipcallExtraControl : UserControl
+    {
+        public ShipcallExtraControl()
+        {
+            InitializeComponent();
+        }
+
+        #region events
+
+        public event Action<ShipcallExtraControl>? CloseExtraRequested;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// this is our datasource
+        /// </summary>
+        public ShipcallControlModel? ShipcallControlModel { get; set; }
+
+        #endregion
+
+        private void buttonCloseDropDown_Click(object sender, RoutedEventArgs e)
+        {
+            if (this.CloseExtraRequested != null)
+            {
+                this.CloseExtraRequested(this);
+            }
+        }
+    }
+}