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 @@
+
+
+
+
+
Always
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 @@
-
+
+
-
@@ -79,14 +115,11 @@
-
-
+
-
-
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 openTabs = new Dictionary();
@@ -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 {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap about {
+ get {
+ object obj = ResourceManager.GetObject("about", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -290,6 +300,26 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap document_exchange {
+ get {
+ object obj = ResourceManager.GetObject("document_exchange", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap document_into {
+ get {
+ object obj = ResourceManager.GetObject("document_into", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -310,6 +340,16 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap document_plain_new {
+ get {
+ object obj = ResourceManager.GetObject("document_plain_new", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -380,6 +420,16 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap exit {
+ get {
+ object obj = ResourceManager.GetObject("exit", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
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 @@
At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA hasn't been sent for DEBRE/DEBRV: ({0}) Close anyway?
+
+ ..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\document_exchange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\document_into.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\document_plain_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/ENI2/Resources/about.png b/ENI2/Resources/about.png
new file mode 100644
index 00000000..c2738bf4
Binary files /dev/null and b/ENI2/Resources/about.png differ
diff --git a/ENI2/Resources/document_exchange.png b/ENI2/Resources/document_exchange.png
new file mode 100644
index 00000000..71b580aa
Binary files /dev/null and b/ENI2/Resources/document_exchange.png differ
diff --git a/ENI2/Resources/document_into.png b/ENI2/Resources/document_into.png
new file mode 100644
index 00000000..3dce3fae
Binary files /dev/null and b/ENI2/Resources/document_into.png differ
diff --git a/ENI2/Resources/document_plain_new.png b/ENI2/Resources/document_plain_new.png
new file mode 100644
index 00000000..66987e89
Binary files /dev/null and b/ENI2/Resources/document_plain_new.png differ
diff --git a/ENI2/Resources/exit.png b/ENI2/Resources/exit.png
new file mode 100644
index 00000000..0e218160
Binary files /dev/null and b/ENI2/Resources/exit.png differ
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 @@
-
+
+
@@ -30,19 +31,19 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -54,9 +55,9 @@
-
-
-
+
+
+
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 anmeldungen = new List();
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/");
+ }
}
}