diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 17c558b6..e746eb89 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -139,8 +139,8 @@ packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll - - packages\log4net.2.0.13\lib\net45\log4net.dll + + packages\log4net.2.0.14\lib\net45\log4net.dll packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll @@ -187,20 +187,20 @@ - - packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.dll + + packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll - - packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - - packages\Extended.Wpf.Toolkit.4.1.0\lib\net40\Xceed.Wpf.Toolkit.dll + + packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.Toolkit.dll @@ -772,7 +772,6 @@ - @@ -814,6 +813,7 @@ + Always diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs index e4e27983..7ffff5ae 100644 --- a/ENI2/Properties/Resources.Designer.cs +++ b/ENI2/Properties/Resources.Designer.cs @@ -590,6 +590,16 @@ namespace ENI2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap logo_eni { + get { + object obj = ResourceManager.GetObject("logo_eni", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// @@ -600,16 +610,6 @@ namespace ENI2.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap logo_transparent_babyblau { - get { - object obj = ResourceManager.GetObject("logo_transparent_babyblau", 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 87bd0449..4e788777 100644 --- a/ENI2/Properties/Resources.resx +++ b/ENI2/Properties/Resources.resx @@ -550,9 +550,6 @@ Confirmation - - ..\Resources\logo_transparent_babyblau.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\delete2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1837,4 +1834,7 @@ not known + + ..\Resources\logo_eni.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/logo_eni.png b/ENI2/Resources/logo_eni.png new file mode 100644 index 00000000..6ecfff58 Binary files /dev/null and b/ENI2/Resources/logo_eni.png differ diff --git a/ENI2/Resources/logo_transparent_babyblau.png b/ENI2/Resources/logo_transparent_babyblau.png deleted file mode 100644 index 6a9e3aa2..00000000 Binary files a/ENI2/Resources/logo_transparent_babyblau.png and /dev/null differ diff --git a/ENI2/SplashScreenWindow.xaml b/ENI2/SplashScreenWindow.xaml index 55cf1b92..d0c1c5b3 100644 --- a/ENI2/SplashScreenWindow.xaml +++ b/ENI2/SplashScreenWindow.xaml @@ -12,7 +12,11 @@ - + + + + +