From 8862d8e83cc7f69a19dbf57fb0fb2653ba2e4c0c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 7 Feb 2023 11:00:31 +0100
Subject: [PATCH] rework main screen Part I

---
 ENI2/ENI2.csproj                      |   5 +++
 ENI2/MainWindow.xaml                  |  45 +++++++++++++++++++----
 ENI2/MainWindow.xaml.cs               |  49 ++++++++++---------------
 ENI2/Properties/Resources.Designer.cs |  50 ++++++++++++++++++++++++++
 ENI2/Properties/Resources.resx        |  15 ++++++++
 ENI2/Resources/about.png              | Bin 0 -> 1331 bytes
 ENI2/Resources/document_exchange.png  | Bin 0 -> 1427 bytes
 ENI2/Resources/document_into.png      | Bin 0 -> 1177 bytes
 ENI2/Resources/document_plain_new.png | Bin 0 -> 1161 bytes
 ENI2/Resources/exit.png               | Bin 0 -> 1320 bytes
 ENI2/SucheControl.xaml                |  33 ++++++++---------
 ENI2/SucheControl.xaml.cs             |  13 +++++++
 12 files changed, 158 insertions(+), 52 deletions(-)
 create mode 100644 ENI2/Resources/about.png
 create mode 100644 ENI2/Resources/document_exchange.png
 create mode 100644 ENI2/Resources/document_into.png
 create mode 100644 ENI2/Resources/document_plain_new.png
 create mode 100644 ENI2/Resources/exit.png

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index d0bb12f2..b5972b73 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -852,6 +852,11 @@
     <Resource Include="Resources\logo_eni.png" />
     <Resource Include="Resources\import1.png" />
     <Resource Include="Resources\import2.png" />
+    <Resource Include="Resources\about.png" />
+    <Resource Include="Resources\document_into.png" />
+    <Resource Include="Resources\document_plain_new.png" />
+    <Resource Include="Resources\exit.png" />
+    <Resource Include="Resources\document_exchange.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index 37d9d068..223488bf 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -59,12 +59,48 @@
             </Grid>
         </xctk:BusyIndicator.BusyContent>
         <DockPanel Name="mainPanel">
-            <Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
+            <Menu DockPanel.Dock="Top" Background="#FFE8F6FF">
+                <Menu.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <DockPanel HorizontalAlignment="Stretch"/>
+                    </ItemsPanelTemplate>
+                </Menu.ItemsPanel>
+                <MenuItem Header="_File">
+                    <MenuItem Header="_Create new Id" Click="buttonNewTransitIdClick">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_plain_new.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="_New with Id" Click="buttonNewWithIdClick">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_into.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Compare _Excel sheets" Click="buttonCompareSheets_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_exchange.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <Separator />
+                    <MenuItem Header="Exit" Click="MenuItem_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/exit.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
+                <MenuItem Header="Help" HorizontalAlignment="Right">
+                    <MenuItem Header="About" Click="buttonAbout_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/about.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
+            </Menu>
+            <Grid DockPanel.Dock="Top" Height="28" Background="#FFE8F6FF">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
                 <Grid Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
@@ -79,14 +115,11 @@
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
                     </Grid.RowDefinitions>
-                    <Button Grid.Column="0" x:Name="buttonNewId" Content="{x:Static p:Resources.textNewVisitTransitId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewTransitIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
-                    <Button Grid.Column="1" x:Name="buttonNewWithId" Content="{x:Static p:Resources.textNewWithId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewWithIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
+                    
                     <RadioButton Grid.Column="2" x:Name="buttonNotifications" Content="{x:Static p:Resources.textNotifications}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" IsChecked="True" Grid.RowSpan="2" />
                     <RadioButton Grid.Column="3" x:Name="buttonStatus" Content="{x:Static p:Resources.textServerStatus}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" Grid.RowSpan="2" />
                     <RadioButton Grid.Column="4" x:Name="buttonUserAdmin" Content="{x:Static p:Resources.textUserAdministration}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2"/>
                     <RadioButton Grid.Column="5" x:Name="buttonPOListe" Content="{x:Static p:Resources.textPOLists}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2" />
-                    <Button Grid.Column="6" x:Name="buttonCompareSheets" Content="{x:Static p:Resources.textCompareExcel}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonCompareSheets_Click" Background="Transparent" Margin="2,2,0,0" />
-                    <Button Grid.Column="7" x:Name="buttonAbout" Content="?" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" Margin="0,2,2,0" Padding="5,0,5,0" Click="buttonAbout_Click" Grid.RowSpan="2"/>
                     <Label Grid.Column="0" Grid.Row="1" x:Name="labelStatusId" Grid.ColumnSpan="3" Margin="2,2,0,0" HorizontalAlignment="Left"/>
                 </Grid>
             </Grid>
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index 3d81c257..d2dac9d7 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -1,28 +1,27 @@
-// Copyright (c) 2017 schick Informatik
+// Copyright (c) 2017-present schick Informatik
 // Description: The main application window
 //
 
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Threading;
-using System.Timers;
+using System.Text;
+
+using log4net;
 
 using bsmd.database;
-using System.Windows.Controls;
+
 using ENI2.Controls;
 using ENI2.EditControls;
 using ENI2.Util;
-
-using log4net;
-using System.ComponentModel;
 using ENI2.Locode;
-using System.Text;
+
 
 namespace ENI2
 {
@@ -39,8 +38,7 @@ namespace ENI2
         private ServerStatusControl statusControl;
         private readonly SucheControl sucheControl;
         private CompareExcelDialog compareExcelDialog;
-
-        private bool efMode = false;
+        
         private bool dbConnected;
         private readonly ScaleTransform _transform = new ScaleTransform(1.0, 1.0);
         private readonly Dictionary<Guid, ClosableTabItem> openTabs = new Dictionary<Guid, ClosableTabItem>();
@@ -245,13 +243,7 @@ namespace ENI2
 
         #endregion
 
-        #region Window control click event handler       
-
-        private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            if(efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
-            else Process.Start("http://www.eureport.de/");            
-        }
+        #region Window control click event handler               
 
         private void buttonAbout_Click(object sender, RoutedEventArgs e)
         {
@@ -262,12 +254,12 @@ namespace ENI2
         private void radioButton_Click(object sender, RoutedEventArgs e)
         {
             this.rootContainer.Children.Clear();
-            bool newButtonsVisible = false;
+            
 
             if(sender == this.buttonNotifications)
             {
                 this.rootContainer.Children.Add(this.mainFrame);
-                newButtonsVisible = true;
+            
             }
             else if(sender == this.buttonUserAdmin)
             {
@@ -295,9 +287,6 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(this.statusControl);
             }
-
-            this.buttonNewId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
-            this.buttonNewWithId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
         }
 
         private void buttonCompareSheets_Click(object sender, RoutedEventArgs ev)
@@ -327,12 +316,7 @@ namespace ENI2
             this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
             labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
             labelVersion.Text = "V. " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-            if (Keyboard.IsKeyDown(Key.LeftShift))
-            {
-                efMode = true; 
-                logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
-            }
+            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;            
             Microsoft.Win32.SystemEvents.SessionEnded += SystemEvents_SessionEnded;
         }
 
@@ -609,6 +593,11 @@ namespace ENI2
             }
         }
 
+        private void MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
         #endregion
 
         #region mouse wheel / zooming events
@@ -717,6 +706,6 @@ namespace ENI2
         }
 
         #endregion
-        
+       
     }
 }
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 347184fb..a47afa95 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -70,6 +70,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap about {
+            get {
+                object obj = ResourceManager.GetObject("about", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -290,6 +300,26 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_exchange {
+            get {
+                object obj = ResourceManager.GetObject("document_exchange", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_into {
+            get {
+                object obj = ResourceManager.GetObject("document_into", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -310,6 +340,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_plain_new {
+            get {
+                object obj = ResourceManager.GetObject("document_plain_new", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -380,6 +420,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap exit {
+            get {
+                object obj = ResourceManager.GetObject("exit", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 522722e4..f959d19d 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1861,4 +1861,19 @@
   <data name="textSpecialCaseBREBRV" xml:space="preserve">
     <value>At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA hasn't been sent for DEBRE/DEBRV: ({0}) Close anyway?</value>
   </data>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_exchange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_exchange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_into" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_into.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_plain_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_plain_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/Resources/about.png b/ENI2/Resources/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2738bf4672a6ec9c30e9efd8d9b35897f2ed724
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKBJATc%|L}hv)GB7YRATc*OFf=+cHXti7F)%P-HZAS|000McNliru
z(*p((4?7XU-GKlA010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00fIk
zL_t(|+O<_{OdM4dJ~KP)EX(ff0$m=<!dlo=VoVHFDH?2)^bf%h8)NW?iDFC8rlvw{
ztg*qyq-{)VO?)L9V(|w_QLzvywoS~owNTQ=wE<cyNsHmV3&HMlc4p_{xig&ww1isq
zBqw(==kE7?_nhy}0{qWGtyLHpP)!^cs}%&fPLjlGnuao(ma=7822m9Lh{ySx0Mf7|
zQ3HjAGydAzdikCRjvP_x#zxo?3`%d?Y|_S@90nW?2Fzx?uB!T)Oajc$$6#t|0cK``
z6HaIDp^1t9FL&>5Q`RI{SWw;5)6mUvQjOQkfXTEBNc}|$As|WWq6jcLIu4VQzh7{>
zeJ|A2mCgN)AR1MRZ`^<jKA-Y{(@AUZ6h%*l0q|d$hmXD))84<f{b6{jq5vW>Y?7oW
zIpN$~7>0)Yx4hn>t@ZU)Giid65tZS27%VSWsyL3;R1sjZlFY~e$Zz--Lf02H0?#A)
zF!l9zSXk1*Qz?CAS%6?L0)BtrrRwV9Cu?e+mKj~W_;Nu3jo{2Ga1uCEpzt}+@hr4`
z9stHf!O`YQ;FHTIG=xN>0L8@|cs%8gpF0<L5r6)b)(c6JcN7(wR!^VOm8o|?oLLMU
zYpH<7S}%ldC-s`ToCZ-i3{YA57}n#>1V=jo!zh(3OQkoGAcG_7E!du8KTN{ekq|hn
z42ZG{JGYiVsVgge0t1|^@i>6nP1>5dIZZ%Oat7HzRHNTDcMx!+O%HkOFfz--@U18a
zk^(V7)!Md_z(`5Lnr=BZO@NnXNm005@;;edJ%c2k<e7?W2*niW8eGx}VL=x_(f~G|
zGcqVZ!$2gm_#62>t$SKLv$&Yj3WjncWkQAy5y)0+7J$tLl!-~tW+f3(?{WcLzC4Vb
zkh;<Yd3pICjE^tM#E!;oHIl|tQ8@oh7LD$(18{bHX2D9ju!4ZtG$)5bu@VFVKh9dM
z1s|sgwrpVof?zrn2+U|+Cap4Bl!-f<2jb9l7LVuP&`umQ`Qz~FPdu0@9h}U~<3U4M
z08X6fkX$a;EA8#O!f65$+qUJs8wv@Z3=dDJ<mQqjszkJ-HIs$>B0H3NY_Jj2<+g(r
z?IlY(0ne*owF30?oJ99UTU%RO&KS7NvhRs6;Pvz8=YQ_)y>xWbrjp#!(jq{7c>htn
z1DFc=EFfSC*9e*+A}qIuWGHk~peRS@x}WR*{_$*7vWw^AO%@AN>TqOJHk%V2V%7ko
zcxByg?;TSp*ct`bCFt({bl~ve_v-KI|G<de-mB%|aHvWY6J?^9a;8!VDj1x8qM@N>
zGt1^eB9Q=}&x+t(NVw3jZ(r;8>tU`N2M>Ps#;H@ksH3BjdhHsoUc5M=?%n&&(A@;n
z_koWNOBS-M1zV${|3&EQJ07#!xt*l+uL(LjzA(q*$wr^A96!w==<52AcQ`E1x3|A_
z{cii2e@YMx3I|F`9`v3*eG<mT27leKq41^s``^5>*8X*eY(!`0ar5kK;y@yC`#Bu!
pRas8<ppC!Vv!_kEpEmzz@h62SSE&9~bfo|Q002ovPDHLkV1kd5X3PKp

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_exchange.png b/ENI2/Resources/document_exchange.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b580aac5c53238ff25bcfbca601b126f79a35f
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+CI&5*twZCBFaw010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00iqv
zL_t(|+Pzk5Y?D<Oe!jNrz3bKu+?Y(<GFfziDKXr=Y&cMcYza{u5Md;E0}|0qCkF7(
zkPQ<wV<Aq5Iw3e0aW}HLh>0?Y*N6cog!_yRT1LCJU;AB;=X~wDbr=5Wn>=67`FeVu
z_j%vvoD}$vgJX{km5n4bJq5C=f>Q|;Re?%z(>?fiNHCNh*}v&0ZS^)3f=3Nh`V`Rz
zBYJQhZRmn<N0ztt9wie+$MMsobYrb={c9gD9$Acs@CxV7XmSzf9xK6%xP~f9JW1%-
zgD6Cs&^<LMRE0?2B_&#rmY<&}aisJ4Ee-RuMb-EXMp7vb%E+E~7xGG{XX<5LC*HyQ
z$q95^q+T4Sflb*PLWwexESR&Z#3AV9Z`N(Ce^guO!tt<QLXz1Im(7kjOS4P}qIMzz
zLxhElZw_UU6dCup%qX1YLSfbhhx_8?9wOC0_PPG$^UwpyHXA~`fYjtfoN@Kf=XVM&
zs$_7S0@~X#n{%21&tMQIdw)mZ#!c+odl+6XpRl6%;oki-TRlcw0+Os&I2p_oNj4qq
zNSjarCQ!g)d0{>Z7w6HEaY&z<jB{zn&~UZ^@B@w{Gn^(1jGO^xV*+?N41~~tI^3r2
zYQ-ixj`e`V6KKt5U+VR+Sj@0mOqvm@W>+D{l7pv;a<O^UQdrFvO@ZBHLREPQ@@LIh
z03W>g1)q#5kvxWA1S)Mb12cj_XF&6cX7u!4LLekyio=0ais>n-IP_gFoCEpFT6f(?
z_z+UOi=qNlI?xaulTpPRHbROq1+As6c(1bysR<6uuuMU1M+XX~m!qoakRAq8``VZ4
z7sL@LvZVc-d7nX|_~Lpq_Wrp?I}-|tH$t8x4^4%iVb`%Q@n+`{te(0V&&p+JJKPQ!
zO?H3C+x^T7`yP)qSu2H>b!3BvYX?wwp_)2LMYb~+E7MkvGXi^eZblz6OqnR2S_)BA
zP_cdqd_zH;zcOI|s{KR@6U-V~yk*Bh5~c%RSSH)g?jkvD(?|>1Mh=m!#NL!hPI*p~
zH{NZDyGB&n7>UXYQMtUN5?)k^pUNMi@B|gIvEqQ15p^KfL5M=jKu~$&RkU3>h>8`(
zxEgZ9Bl+=q@iIKuQHrcw+Z~O-F3Ol8xRJ(cJ;;9`6Xk8|@MEAIYYG;k|CR?HzaMT2
zJGJQ2McMdZ;BC5zd`BaU5VG&o5rQAYE_jF+x*O@(-S{;Ef&d@SgAa#L*V2vlu09Ot
z`cZv)cbpMqx`(VrE=M+IRnWjF$*7aO`tCI_(Zh1pei7R*mBSn65e|tEi3xsh81K*g
z6spgTvIiGIkknYVngS9r2N`7&GFHKp1#`H9g?U{0iINnbH>mn30aM_m5Q7qO?st{_
z{KrMG<0xy{4uj5zvyR$Xp$#Cc38M*OL2p8SP&oD1KerGN!?+y`f}P2^jdM>jBdF1A
zV*nX79#*B&5~;E4C!T<X4Hdt3Uls;~0a~g6%#H-m3%GzpGn7drYppCaQ&r12GM8v~
zMJh8)p+rxnVI09uoKmXP<!6reH#+aNX4<EjfeT#C>>?+8K>|TgV)w6>Bo}S268&WF
z=?$yX=_Vmyu^ZoF8Se9`{L{WZ{)zM{>5tTWzaw=hJcPbpF-kzd(d-pkI;Mnhkv|M<
h%;`D!ytnbc#J`^M`sN*_Sd{<(002ovPDHLkV1j7QeOLeh

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_into.png b/ENI2/Resources/document_into.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dce3fae52726a94b55fee860e06ee0a30a91e4b
GIT binary patch
literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+L9?DiK?0P>}!t010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Z$!
zL_t(|+Pzj?Xk0}U{^tJdCbk>bl!C>wp{-KXD6tJFX=@^Z`iEkn3I&6TQuU#I5&F=V
zir|wXzSx(lV11~FRG|@)AR42MG`2QLq3T1L+Wff9nsj%Q&F<a3bB|}{-n-pRHfdh;
z?w*}9voq(LbG~n87x<4KQQ3Lr$fuOpv;nU4^f$sIc!K<v2t*zm_f3K8$=T_=W9|Fm
zqk}_hMmzfc*R<BB`}+~v_v(9@m*4ti&uTG^$__~i9MU@tP3>NC7A}8ZWRpB4-cXM_
zTUr`Qg1&v}(1}OZ24Dmg6N29rrX~tKtbMK;hym}4*JJ1Y=VFfG_H`XT-hN8}15}$R
zAwpbj3Z*1nG&R=Y;Vp5rbsdON#O{9a&EsvW0(jm{|G_Vtmw_08DwO>*m&4%MVVpU6
z8h`Zk0FmhW`Fy(fh1WlPta6=IjdwGH>x+}P@6^4xeBk$G87YxH-PwZ9J<TW<B?<)x
znQRV!jwjcjKJ)WeJY_>ofL*P3m;G2|9iHsiitV3oM{oNeu1%#;;=nF5>=HELE(u8P
z8@7qZcPFs9X*2rzFE%dA;I<F!sdcev<H7L`m?wo+%^h|FS~qRO;_f1z7}$j#2AQ1B
z!Z0}?1L;<QaVuB>s=TCXM;?{|G{>4YzTNePopt6BwIVPLo0VeXuiRxklt^f)KKsj~
z7=HeeE{~_Bi@-=1*8dC{S^}_GD2dV8A*2dP*p>~;ve+Vsm=V~nh1M-iSeS9}z^VK3
z-QFSG$T}KGmH`ZGOWdxr@M>jX@@0^BvoOhG&(OP9+jIG4@U@UhEy7KgkSSy_o6h6v
zM8@aA^9eUB6I&B;E|EGjH8PMqwdgp|N0e6*Gg;*A)Wr>WITvStyMlA6B!1`^!PrDP
zsCBjO^gZP<7pRfJ*j&>6tUKe9VOWMDjF;8bTX^lMHk`XKj$czL{Mb2yD=K)Upvxcu
z59%ONjSTX~+*ls-_@?(fJ+pTwOOJ5R#~U#^JcXgu3<f$!F+S-Br+{45@d6ArrmY4C
zRVTTB@RF{Q%3#5DFfjc$e&XO)Ik*byE65L~2=;@M4;p5$<hrQ>kl{pbqtOQRbMP?^
zuE&GmGL$F$TUL+jH5{EeP=G656+}`mE-=x3?ZX(mmiB=wN}~dYnS{X+lt$u~08~Ca
z6Eh1CEI)mGcu)kSQh1(7jr*<=hU5%N(!T{(1VC6<Ue>xJ5l|@nVE#t^mO>RNQ3@8h
zr-h+;Sq(s;XL1C`kyVq*!G&KI5fCcXFP#ipJ!Ww>#>xPx)EwS<_XICm3J@G1{YQX(
r;ptyAMJ%x|0$=?Z$fR%Je|`Q1_Y-MO8IEo{00000NkvXXu0mjf=1d%6

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_plain_new.png b/ENI2/Resources/document_plain_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..66987e896600ead9ee04744b897f7e1e4b4b9ebd
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+CF_ECxK{%r^i4010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00ZGk
zL_t(|+P#)vXdG1-#ea8plg-9WvPl~MB*8YOYAMmyMr~;kt3?#l(n=5n`{G}GP(i_G
z5quKG7xQ8Zq6j`nUeZd9NDD?ES~X3il45B}Y&Geo+x^qH*<|NlzdJj#nN70M7ah2>
zbMMTYbI<wCH!S?ehYC-gd+Ug~y}gm<NRCowLGCIFb#WO97M&=@Xc-0-QOwR<{i9Hf
z9{l2?mrngF0t1l`-X1Ky@yKTA$iV0{#G-P23vB3yo?b}aRC)2(i3yH;K9XxmwmtF5
z`_F$@iy-2ID|XU5)w=c7yJjb#{&$!dh3Q{l>{rb8HcWO2w;@TXz5yJ?Tsp^8DIP0i
zGXp#NpFA;sYWUJx1dey!Mho+@$IAk)euMNyIM50Qx4?^=P^V9#CeGmec>$$0N_J$l
zp(`1uf8an<(J74_dTsE*+5~-@x_Iw}M|<`(iXAc^5a5pUVvCTuGcb7;b?!&hwG^sw
z-7|K{EwQn!ft@``b{~4C$<)^!efE{X-D?w!UySnl;k0vIyx*IInWK;rd*;NZJ8p$u
zS<75S{gp>8EqH~SOV9Je_h%UXbco60$HmrIB45aS{q)NpJ`^U1dgmCLI^4yxV&lSA
zsGIa7ApE6SvFm>L>I!Jb%Z01q@qOFb_dp+ui!KWbMY6eh&P~lEhK5JKl!w}@2{bvW
z^yNY}20sh<{(GTSY|4op=M(VRH*nv>nC>K|p%E=nbs`bs@hEYrd7`<I_8VL2-q_8^
z$+5Q87Kvh9rmx)D2fM_^!{Yz9vRaaO4*evGZpO4)WfId^V>x&BEJUsht?iJx^-g+a
z6@eO)3^i~ebx*$li>S10;#f))bc)8iF?*lFZ0^JD>Jbnnz=Vcb?xfYd>sw@x(_9*V
ztcm>tdoby3kk5<uxY)G|)6t3UyiM%6!L!Hsa204%zP2j#3I!Dc;Wcl@nqbQg+<X=m
zi{&=#N?>Bm7{~E;YpCA+GMVz!shSFWPbF^XmJQx_sA}DU8JmY-$7OIGkjWjRm7MiD
z1loTo&>gZMa5(_i;X3$aw#dq?tDp?7P1Q3i2$pTqf%n1v^=eRlqT~~psx$;iSym7#
ztZ$v&xTgS9o4~D7u%1P}EoND@hpts9wrg7Cdf=|9PIDCjWd_YkHClT09|_9Ev$BJ@
znGi!I`yt@qJqy0%D&O9kH3((80;#;ALNi@4(1ub`GUZQ&Th-ZX5Lou?yrEchs~!qK
zZEIK{<y&sQL$2%pdTUV}$Ei(_N~L+{-H+v^l>~kR*_7C3Qo7tT#&)l0@UQKkfo$d)
b|LgHLc%&PBWG1SG00000NkvXXu0mjfM9C?Q

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/exit.png b/ENI2/Resources/exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e21816019c046462e87b924e7585bd565b35a2e
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000gbVXQnLvm$d
zbZKvHAXI5>WdKBJAT}UMb!;FqFfcSAF)}(cGCDOdAS*C2Fffw?u&)3B00(qQO+^RP
z2L=iw0AUV=;s5{u32;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<VFdsH1c6CJ
zK~#9!wN+hc990zl?w!BvCYyAlX_JZxA!<QXC{$`SNcvQ)C_XfbSdrF<z7%{@q+r2^
zycMLf1{#DAP<+rzC@ZxTt4K(Sfe<iJNt>ok>?WIalb!vWnR{nEclIao!6brSxO->M
z-Z|en-}%m2;D26hrwfThVuW+v=ledVubfWM)}$0X2!imLHdD`1dWP=@(sA635OQ>I
zaPXYI6F@$1ztq=vw0UW13BHslJ0*A?r_CS)$Z3Ee(4lDt-PQ<@A(Po?DHf++CBx1D
z6cN_e()eX|4rR%}G=|<orx1;hJ(DLO0mpG*+a;7rWdiiUc_cj5+7Uof)WY-N@+c0!
z_AUgy*P6|vn9t(&?G(yomx7RpMoly~M=2|xfU;y0`mO*J=fo$N@1aqn?__fvkEko7
zkqiR^ePE1}4RBpxZZ3`G<q4H}SYQ56j*THcTLVy8sM{?j&}?o38-^J=FO@)<fan5D
z(?UfEVta}j4XY>rsq<U!BfVC7b(JCs&}5Ng31k9QSjDxD^>tunC5Lo6N6)q@Fo9NT
zw=F=66=SEL>wEakZ%^UtgO~8@{4KOJ073!K?}UL=DudC{s}%}ELV~(5$fnf+qUVj}
z#+cPgae-?@H@)4+8uUXQ53%A=7cc+NkD;fBLwblU@<W9eL7fJTlof<oAv`N9;B|n<
zVqI<LUVq2PIW{cagvJf9K*M5T76&`K;6Dqz{o`rO^M$Z#EX<%<8&-3^xm89ojHC)s
zEPHGwa|7ve3Wjb#*LB(^OwEKrYJ0M~3;9(CPki|(W?q?~JY`r&&y!))T!FGm;ZX&5
zT@Q5?DOO4%2aP(C(L_+uL-8mDB+;>vE<&z*$dxzf_9{7(VFw>L5J!K1H#$3wFzV_U
zsVQ$$ro^c4Dj|CmjzejdB;1?`i{=*uewzFp-`}~3>n~o!_4x~Myb?8^#J+tTv6zWH
zdngbJMisXPAcWYg!OcHYV&w9MkSqY>j6T64QG>m8{24YmwSdXgJ$$_P0=hqVo@4}k
z@xmMG9>&L)F*S9A<f&1k#jAb6D%~%()S&dCh?QXfO{V)3&Cbm9vN`_8Qt-{=V=VFc
zC)nFzLHbUp8jog8p#Yje?c_|^lq&sj*i|y{w(o;Hz4X<s>3d^6ms=+%CN0i1#N!P_
zrc#aKn+Obx%Bqu;Rcuvtd1~ZtH!6zETN7ve{mEp~Q4w(>E`Fbdcq_HDMo!3)2zjq4
zNu9)dU7j>$wQVyX=MPjQ7r><<qY>vF@is(*7^zMVsZvE%729ks)cZmznPC^xlv2&Q
zuG1XD{WzZeh=v)59%({`0F-i+!`i01^xu)8z32pid45*_l=jG-yNmC0u5FB6xwKj+
z<n0qD&OTM^TIJZbZDg}q8sWKxAh0e*BCVfYyLNRY%xEV7wT6d>`M|(H*rq2>CVGw?
zJ3MdOMUv^y$mMc^XisXI92y&Iy8@i?x4ye8fUWDuk@q6)?M>g&D0q-E7y+!|Wb*9Y
ef9vNzTYmvQE6TC}^o1<|0000<MNUMnLSTY|uU5bS

literal 0
HcmV?d00001

diff --git a/ENI2/SucheControl.xaml b/ENI2/SucheControl.xaml
index ce6e5028..84ae526e 100644
--- a/ENI2/SucheControl.xaml
+++ b/ENI2/SucheControl.xaml
@@ -17,7 +17,8 @@
         <Grid Grid.Row="0">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="75" />
+                <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="2*" />
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="2*" />
@@ -30,19 +31,19 @@
                 <RowDefinition Height="30" />
                 <RowDefinition Height="30" />
             </Grid.RowDefinitions>
-
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
-            <TextBox Grid.Column="1" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
-            <TextBox Grid.Column="1" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
-            <TextBox Grid.Column="1" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
-            <TextBox Grid.Column="3" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
+            <Image Grid.Column="0" Grid.RowSpan="3" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
+            <TextBox Grid.Column="2" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
+            <TextBox Grid.Column="2" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
+            <TextBox Grid.Column="2" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
+            <TextBox Grid.Column="4" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
             
-            <Grid Grid.Column="3" Grid.Row="1" Height="Auto" Margin="2">
+            <Grid Grid.Column="4" Grid.Row="1" Height="Auto" Margin="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="3*" />
@@ -54,9 +55,9 @@
                 <Label Grid.Column="2" Grid.Row="0" Content="To:" HorizontalAlignment="Left" />
                 <DatePicker Grid.Column="3" Grid.Row="0" Name="dateTimePickerETATo" VerticalContentAlignment="Center" SelectedDateChanged="etaValueChanged" ContextMenu="{DynamicResource ClearContextMenu}"/>
             </Grid>
-            <TextBox Grid.Column="3" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
-            <Button Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
-            <Grid Grid.Column="3" Grid.Row="3">
+            <TextBox Grid.Column="4" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
+            <Button Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
+            <Grid Grid.Column="4" Grid.Row="3">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
diff --git a/ENI2/SucheControl.xaml.cs b/ENI2/SucheControl.xaml.cs
index 5d935a60..d3df5625 100644
--- a/ENI2/SucheControl.xaml.cs
+++ b/ENI2/SucheControl.xaml.cs
@@ -13,6 +13,7 @@ using bsmd.database;
 using System.Windows.Data;
 using log4net;
 using System.Windows.Media.Imaging;
+using System.Diagnostics;
 
 namespace ENI2
 {
@@ -24,6 +25,7 @@ namespace ENI2
 
         #region Fields
 
+        private bool efMode = false;
         private List<MessageCore> anmeldungen = new List<MessageCore>();
         private readonly object searchLock = new object();
         private readonly ILog _log = LogManager.GetLogger("SucheControl");
@@ -55,6 +57,12 @@ namespace ENI2
             cancelItem.Click += CancelItem_Click;
             cancelItem.Visibility = Visibility.Collapsed;
             this.dataGrid.ContextMenu.Items.Add(cancelItem);
+
+            if (Keyboard.IsKeyDown(Key.LeftShift))
+            {
+                efMode = true;
+                logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
+            }
         }
 
         
@@ -291,5 +299,10 @@ namespace ENI2
 
         #endregion
 
+        private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
+            else Process.Start("http://www.eureport.de/");
+        }
     }
 }