From 6c0353741c31dec9e0fa7e0059aba9876248c248 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 11 Dec 2023 08:56:04 +0100 Subject: [PATCH] Release changes --- ENI2/App.config | 9 ++---- ENI2/ENI2.csproj | 8 +++--- ENI2/EditControls/CompareExcelDialog.xaml | 4 +-- ENI2/EditControls/CopyDeclarationDialog.xaml | 23 ++++++++-------- ENI2/EditControls/CoreStatusInfoDialog.xaml | 4 +-- ENI2/EditControls/EditRulesDialog.xaml | 6 ++-- ENI2/EditControls/ErrorListDialog.xaml | 2 +- ENI2/EditControls/MessageHistoryDialog.xaml | 6 ++-- ENI2/EditControls/NewDGItemDialog.xaml | 6 ++-- ENI2/EditControls/NewWithIdDialog.xaml | 26 +++++++++--------- ENI2/EditControls/SelectPortAreaDialog.xaml | 4 +-- ENI2/EditControls/ViolationListDialog.xaml | 4 +-- ENI2/EditControls/VisitIdDialog.xaml | 24 ++++++++-------- ENI2/MainWindow.xaml | 2 +- ENI2/Resources/EUREPORT.png | Bin 42234 -> 39708 bytes .../bsmd.LockingService.csproj.user | 2 +- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 18 files changed, 65 insertions(+), 69 deletions(-) diff --git a/ENI2/App.config b/ENI2/App.config index c4795a17..4c7c4bc1 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -26,20 +26,17 @@ 1000 - http://192.168.2.24/LockingService/LockingService.svc - - - BSMD ReportGenerator + http://192.168.2.24/LockingService/LockingService.svc - Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false - + diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index bd141e09..f00bde73 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -8,7 +8,7 @@ WinExe Properties ENI2 - ENI2Test + ENI2 v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -18,7 +18,7 @@ - eni_test\ + eni2.publish\ true Web true @@ -28,9 +28,9 @@ false false true - http://192.168.2.24/eni_test/ + http://192.168.2.24/eni2.publish/ http://www.textbausteine.net/ - ENI Testversion + ENI Informatikbüro Daniel Schick NSW 5.4.0.0 diff --git a/ENI2/EditControls/CompareExcelDialog.xaml b/ENI2/EditControls/CompareExcelDialog.xaml index e77d7a89..c789a0dc 100644 --- a/ENI2/EditControls/CompareExcelDialog.xaml +++ b/ENI2/EditControls/CompareExcelDialog.xaml @@ -4,11 +4,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ENI2.EditControls" - xmlns:enictrl="clr-namespace:ENI2.Controls" + xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico"> + Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico"> diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml b/ENI2/EditControls/CopyDeclarationDialog.xaml index d6e59748..b1ef8f29 100644 --- a/ENI2/EditControls/CopyDeclarationDialog.xaml +++ b/ENI2/EditControls/CopyDeclarationDialog.xaml @@ -4,11 +4,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ENI2.EditControls" - xmlns:enictrl="clr-namespace:ENI2.Controls" + xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_cards.ico"> + Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_cards.ico"> @@ -34,28 +34,28 @@ - \ No newline at end of file diff --git a/ENI2/EditControls/CoreStatusInfoDialog.xaml b/ENI2/EditControls/CoreStatusInfoDialog.xaml index b09b092d..8dc5339f 100644 --- a/ENI2/EditControls/CoreStatusInfoDialog.xaml +++ b/ENI2/EditControls/CoreStatusInfoDialog.xaml @@ -8,7 +8,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico" > + Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico" > @@ -22,7 +22,7 @@ - +