diff --git a/ENI2/App.config b/ENI2/App.config index 902864d7..4c7c4bc1 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -1,18 +1,18 @@ - + -
+
-
+
- - + + @@ -26,103 +26,28 @@ 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 - - - - 825 - - - 450 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 0d005756..bf1e8e92 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..230bd65a 100644 --- a/ENI2/EditControls/CompareExcelDialog.xaml +++ b/ENI2/EditControls/CompareExcelDialog.xaml @@ -8,7 +8,7 @@ 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 ab1978e3..b887f71e 100644 --- a/ENI2/EditControls/CopyDeclarationDialog.xaml +++ b/ENI2/EditControls/CopyDeclarationDialog.xaml @@ -8,7 +8,7 @@ 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"> diff --git a/ENI2/EditControls/CoreStatusInfoDialog.xaml b/ENI2/EditControls/CoreStatusInfoDialog.xaml index b09b092d..77b843f6 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" > diff --git a/ENI2/EditControls/EditRulesDialog.xaml b/ENI2/EditControls/EditRulesDialog.xaml index d18ba960..4e26ced7 100644 --- a/ENI2/EditControls/EditRulesDialog.xaml +++ b/ENI2/EditControls/EditRulesDialog.xaml @@ -9,7 +9,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/mail_forward.png"> + Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/mail_forward.png"> diff --git a/ENI2/EditControls/ErrorListDialog.xaml b/ENI2/EditControls/ErrorListDialog.xaml index 477f5116..76cff46c 100644 --- a/ENI2/EditControls/ErrorListDialog.xaml +++ b/ENI2/EditControls/ErrorListDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_red.ico" Topmost="False"> + Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_red.ico" Topmost="False"> diff --git a/ENI2/EditControls/MessageHistoryDialog.xaml b/ENI2/EditControls/MessageHistoryDialog.xaml index a4e4f768..70165e02 100644 --- a/ENI2/EditControls/MessageHistoryDialog.xaml +++ b/ENI2/EditControls/MessageHistoryDialog.xaml @@ -7,7 +7,7 @@ xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2Test;component/Resources/clock_history.ico"> + Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2;component/Resources/clock_history.ico"> diff --git a/ENI2/EditControls/NewDGItemDialog.xaml b/ENI2/EditControls/NewDGItemDialog.xaml index d1dec33e..d58cbee2 100644 --- a/ENI2/EditControls/NewDGItemDialog.xaml +++ b/ENI2/EditControls/NewDGItemDialog.xaml @@ -9,7 +9,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" Title="{x:Static p:Resources.textNewDGItem}" Height="350" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="CanResize" - Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded"> + Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded"> diff --git a/ENI2/EditControls/NewWithIdDialog.xaml b/ENI2/EditControls/NewWithIdDialog.xaml index 6dda1383..fe51d743 100644 --- a/ENI2/EditControls/NewWithIdDialog.xaml +++ b/ENI2/EditControls/NewWithIdDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_add.ico"> + Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_add.ico"> diff --git a/ENI2/EditControls/SelectPortAreaDialog.xaml b/ENI2/EditControls/SelectPortAreaDialog.xaml index 40c24d3e..4d375c5d 100644 --- a/ENI2/EditControls/SelectPortAreaDialog.xaml +++ b/ENI2/EditControls/SelectPortAreaDialog.xaml @@ -8,7 +8,7 @@ xmlns:local="clr-namespace:ENI2.EditControls" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="Search port area" Height="400" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded"> + Title="Search port area" Height="400" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded"> diff --git a/ENI2/EditControls/ViolationListDialog.xaml b/ENI2/EditControls/ViolationListDialog.xaml index d314bb5e..651a4e22 100644 --- a/ENI2/EditControls/ViolationListDialog.xaml +++ b/ENI2/EditControls/ViolationListDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Topmost="False"> + Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Topmost="False"> diff --git a/ENI2/EditControls/VisitIdDialog.xaml b/ENI2/EditControls/VisitIdDialog.xaml index df85cc20..9e8fdf2f 100644 --- a/ENI2/EditControls/VisitIdDialog.xaml +++ b/ENI2/EditControls/VisitIdDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_new.ico"> + Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_new.ico"> diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml index e71b66a4..04a0105a 100644 --- a/ENI2/MainWindow.xaml +++ b/ENI2/MainWindow.xaml @@ -10,7 +10,7 @@ xmlns:util="clr-namespace:ENI2.Util" xmlns:local="clr-namespace:ENI2" mc:Ignorable="d" - Title="ENI 2 Testversion" + Title="ENI 2" Height="{util:SettingBinding Height}" Width="{util:SettingBinding Width}" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" SourceInitialized="Window_SourceInitialized"> diff --git a/ENI2/Resources/EUREPORT.png b/ENI2/Resources/EUREPORT.png index 375b2af7..a5a38e0c 100644 Binary files a/ENI2/Resources/EUREPORT.png and b/ENI2/Resources/EUREPORT.png differ diff --git a/bsmd.dakosy/bsmd.dakosy.csproj b/bsmd.dakosy/bsmd.dakosy.csproj index 1a0f79ae..45599c68 100644 --- a/bsmd.dakosy/bsmd.dakosy.csproj +++ b/bsmd.dakosy/bsmd.dakosy.csproj @@ -52,8 +52,8 @@ - - ..\packages\WinSCP.6.5.3\lib\net40\WinSCPnet.dll + + ..\packages\WinSCP.6.5.4\lib\net40\WinSCPnet.dll @@ -93,12 +93,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - +