From bea46135fd2cc2b3850dd32396a9a47d2545de73 Mon Sep 17 00:00:00 2001 From: maier_S Date: Thu, 24 Mar 2022 15:52:02 +0100 Subject: [PATCH] Sicherung --- FSI.BT.Tools/App.xaml.cs | 36 +- FSI.BT.Tools/AppSettings.cs | 18 +- FSI.BT.Tools/Commands/LoginCommand.cs | 2 +- FSI.BT.Tools/Commands/OpenAppCommand.cs | 6 +- FSI.BT.Tools/Commands/ProcessCommand.cs | 25 + FSI.BT.Tools/FSI.BT.Tools.xml | 9 + FSI.BT.Tools/FrmRadialMenu.xaml.cs | 2 +- FSI.BT.Tools/Global.cs | 42 +- FSI.BT.Tools/Gui/FrmProcesses.xaml | 318 +- FSI.BT.Tools/Gui/FrmProcesses.xaml.cs | 13 +- FSI.BT.Tools/NotifyIconResources.xaml | 6 +- FSI.Lib/FSI.Lib/CompareNetObjects/Cache.cs | 208 + .../CompareNetObjects/CompareException.cs | 25 + .../CompareNetObjects/CompareExtensions.cs | 71 + .../FSI.Lib/CompareNetObjects/CompareLogic.cs | 315 + .../CompareNetObjects/CompareObjects.cs | 358 + .../FSI.Lib/CompareNetObjects/CompareParms.cs | 71 + .../CompareNetObjects/ComparisonConfig.cs | 650 + .../CompareNetObjects/ComparisonResult.cs | 245 + .../CustomValidationLogic.cs | 85 + .../FSI.Lib/CompareNetObjects/Difference.cs | 203 + .../CompareNetObjects/EnvironmentHelper.cs | 21 + .../FSI.Lib/CompareNetObjects/ExcludeLogic.cs | 220 + .../FSI.Lib/CompareNetObjects/FileHelper.cs | 44 + .../FSI.Lib/CompareNetObjects/HtmlConfig.cs | 118 + .../CompareNetObjects/ICompareLogic.cs | 30 + .../IgnoreOrderTypes/IgnoreOrderLogic.cs | 332 + .../IndexerCollectionLooper.cs | 32 + .../LogicEqualityComparer.cs | 43 + .../CompareNetObjects/ProcessHelper.cs | 69 + .../Properties/Settings.Designer.cs | 216 + .../Properties/Settings.settings | 54 + .../CompareNetObjects/PropertyEntity.cs | 70 + .../Reports/BaseDualFileReport.cs | 78 + .../Reports/BeyondCompareReport.cs | 97 + .../CompareNetObjects/Reports/CsvReport.cs | 131 + .../CompareNetObjects/Reports/HtmlReport.cs | 142 + .../Reports/IDualFileReport.cs | 25 + .../Reports/ISingleFileReport.cs | 40 + .../Reports/UserFriendlyReport.cs | 126 + .../Reports/WinMergeReport.cs | 120 + .../FSI.Lib/CompareNetObjects/RootComparer.cs | 135 + .../CompareNetObjects/RootComparerFactory.cs | 77 + .../FSI.Lib/CompareNetObjects/StringHelper.cs | 78 + .../TypeBackwardsCompatibilityExtensions.cs | 22 + .../TypeComparers/BaseComparer.cs | 179 + .../TypeComparers/BaseTypeComparer.cs | 40 + .../TypeComparers/ByteArrayComparer.cs | 119 + .../TypeComparers/ClassComparer.cs | 80 + .../TypeComparers/CollectionComparer.cs | 134 + .../TypeComparers/CustomComparer.cs | 70 + .../TypeComparers/DataColumnComparer.cs | 86 + .../TypeComparers/DataRowComparer.cs | 135 + .../TypeComparers/DataTableComparer.cs | 173 + .../TypeComparers/DatasetComparer.cs | 101 + .../TypeComparers/DateComparer.cs | 53 + .../TypeComparers/DateTimeOffsetComparer.cs | 68 + .../TypeComparers/DecimalComparer.cs | 46 + .../TypeComparers/DictionaryComparer.cs | 236 + .../TypeComparers/DoubleComparer.cs | 50 + .../TypeComparers/EnumComparer.cs | 40 + .../TypeComparers/EnumerableComparer.cs | 102 + .../TypeComparers/FieldComparer.cs | 131 + .../TypeComparers/FontComparer.cs | 78 + .../TypeComparers/HashSetComparer.cs | 135 + .../TypeComparers/ImmutableArrayComparer.cs | 49 + .../TypeComparers/IndexerComparer.cs | 153 + .../TypeComparers/IpEndPointComparer.cs | 97 + .../TypeComparers/ListComparer.cs | 228 + .../TypeComparers/PointerComparer.cs | 50 + .../TypeComparers/PropertyComparer.cs | 338 + .../ReadOnlyCollectionComparer.cs | 141 + .../TypeComparers/RuntimeTypeComparer.cs | 56 + .../TypeComparers/SimpleTypeComparer.cs | 49 + .../TypeComparers/StringBuilderComparer.cs | 66 + .../TypeComparers/StringComparer.cs | 77 + .../TypeComparers/StructComparer.cs | 60 + .../TypeComparers/TimespanComparer.cs | 54 + .../TypeComparers/UriComparer.cs | 59 + .../FSI.Lib/CompareNetObjects/TypeHelper.cs | 562 + .../FSI.Lib/CompareNetObjects/VerifyConfig.cs | 65 + .../FSI.Lib/CompareNetObjects/WebHelper.cs | 57 + FSI.Lib/FSI.Lib/CompareNetObjects/app.config | 54 + .../KellermanSoftware.Compare-NET-Objects.dxc | 103 + .../documentation/documentation.dxp | 1071 + .../documentation/documentation.dxw | 78 + .../documentation/images/PoweredByNDepend.png | Bin 0 -> 6012 bytes .../documentation/images/logo.png | Bin 0 -> 31645 bytes FSI.Lib/FSI.Lib/FSI.Lib.csproj | 350 + FSI.Lib/FSI.Lib/Guis/AutoPw/FrmMain.xaml | 4 +- FSI.Lib/FSI.Lib/Guis/AutoPw/FrmMain.xaml.cs | 14 +- FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs | 15 + .../Guis/IbaDirSync/ViewModel/ViewModelIba.cs | 109 + FSI.Lib/FSI.Lib/Guis/Prj.Mgt/FrmMain.xaml.cs | 2 - .../Guis/Prj.Mgt/ViewModel/ViewModelPrj.cs | 1 - .../Guis/SetSizePosExWindow/Model/Window.cs | 18 + .../ViewModel/ViewModelWindow.cs | 239 + .../Guis/SieTiaWinCCMsgMgt/FrmMain.xaml.cs | 30 +- .../Guis/SieTiaWinCCMsgMgt/Model/WinCC.cs | 17 + .../{WinCC.cs => ViewModel/ViewModelWinCC.cs} | 157 +- FSI.Lib/FSI.Lib/TraceTool/Helper.cs | Bin 0 -> 64602 bytes FSI.Lib/FSI.Lib/TraceTool/Plugin.cs | 82 + FSI.Lib/FSI.Lib/TraceTool/TTrace.cs | 2367 + FSI.Lib/FSI.Lib/TraceTool/TraceListener.cs | 117 + FSI.Lib/FSI.Lib/TraceTool/TraceNode.cs | 645 + FSI.Lib/FSI.Lib/TraceTool/TraceNodeBase.cs | 67 + FSI.Lib/FSI.Lib/TraceTool/TraceNodeEx.cs | 2714 + FSI.Lib/FSI.Lib/TraceTool/TraceTable.cs | 108 + FSI.Lib/FSI.Lib/TraceTool/TraceToSend.cs | 970 + FSI.Lib/FSI.Lib/TraceTool/TraceTool.xml | 2474 + .../TraceTool/Viewer/DotNetWrapper.dll | Bin 0 -> 145408 bytes .../TraceTool/Viewer/FastMM_FullDebugMode.dll | Bin 0 -> 144384 bytes .../FSI.Lib/TraceTool/Viewer/TraceTool.drc | 1478 + .../FSI.Lib/TraceTool/Viewer/TraceTool.exe | Bin 0 -> 4191232 bytes .../Viewer/TraceTool.exe - debug.lnk | Bin 0 -> 1260 bytes .../FSI.Lib/TraceTool/Viewer/TraceTool.map | 45848 ++++++++++++++++ .../TraceTool/Viewer/TraceTool_Icon.png | Bin 0 -> 456 bytes .../TraceTool/Viewer/TracetoolConfig.xml | 146 + .../TraceTool/Viewer/TracetoolConfigProd.xml | 146 + .../TraceTool/Viewer/WebSock/Fleck.dll | Bin 0 -> 44032 bytes .../WebSock/Microsoft.Win32.Primitives.dll | Bin 0 -> 21216 bytes .../Viewer/WebSock/System.AppContext.dll | Bin 0 -> 21176 bytes .../WebSock/System.Collections.Concurrent.dll | Bin 0 -> 21224 bytes .../WebSock/System.Collections.NonGeneric.dll | Bin 0 -> 21224 bytes .../System.Collections.Specialized.dll | Bin 0 -> 21224 bytes .../Viewer/WebSock/System.Collections.dll | Bin 0 -> 21696 bytes .../System.ComponentModel.EventBasedAsync.dll | Bin 0 -> 21768 bytes .../System.ComponentModel.Primitives.dll | Bin 0 -> 21752 bytes .../System.ComponentModel.TypeConverter.dll | Bin 0 -> 22784 bytes .../Viewer/WebSock/System.ComponentModel.dll | Bin 0 -> 21192 bytes .../Viewer/WebSock/System.Console.dll | Bin 0 -> 21160 bytes .../Viewer/WebSock/System.Data.Common.dll | Bin 0 -> 154448 bytes .../WebSock/System.Diagnostics.Contracts.dll | Bin 0 -> 21736 bytes .../WebSock/System.Diagnostics.Debug.dll | Bin 0 -> 21208 bytes .../System.Diagnostics.FileVersionInfo.dll | Bin 0 -> 21248 bytes .../WebSock/System.Diagnostics.Process.dll | Bin 0 -> 21728 bytes .../WebSock/System.Diagnostics.StackTrace.dll | Bin 0 -> 23936 bytes ...em.Diagnostics.TextWriterTraceListener.dll | Bin 0 -> 21280 bytes .../WebSock/System.Diagnostics.Tools.dll | Bin 0 -> 21208 bytes .../System.Diagnostics.TraceSource.dll | Bin 0 -> 21744 bytes .../WebSock/System.Diagnostics.Tracing.dll | Bin 0 -> 31608 bytes .../WebSock/System.Drawing.Primitives.dll | Bin 0 -> 21208 bytes .../Viewer/WebSock/System.Dynamic.Runtime.dll | Bin 0 -> 22224 bytes .../System.Globalization.Calendars.dll | Bin 0 -> 21744 bytes .../System.Globalization.Extensions.dll | Bin 0 -> 25992 bytes .../Viewer/WebSock/System.Globalization.dll | Bin 0 -> 21192 bytes .../WebSock/System.IO.Compression.ZipFile.dll | Bin 0 -> 21224 bytes .../Viewer/WebSock/System.IO.Compression.dll | Bin 0 -> 110944 bytes .../System.IO.FileSystem.DriveInfo.dll | Bin 0 -> 21232 bytes .../System.IO.FileSystem.Primitives.dll | Bin 0 -> 21232 bytes .../WebSock/System.IO.FileSystem.Watcher.dll | Bin 0 -> 21224 bytes .../Viewer/WebSock/System.IO.FileSystem.dll | Bin 0 -> 21192 bytes .../WebSock/System.IO.IsolatedStorage.dll | Bin 0 -> 21208 bytes .../WebSock/System.IO.MemoryMappedFiles.dll | Bin 0 -> 21216 bytes .../Viewer/WebSock/System.IO.Pipes.dll | Bin 0 -> 21168 bytes .../System.IO.UnmanagedMemoryStream.dll | Bin 0 -> 21232 bytes .../TraceTool/Viewer/WebSock/System.IO.dll | Bin 0 -> 21144 bytes .../WebSock/System.Linq.Expressions.dll | Bin 0 -> 22224 bytes .../Viewer/WebSock/System.Linq.Parallel.dll | Bin 0 -> 21192 bytes .../Viewer/WebSock/System.Linq.Queryable.dll | Bin 0 -> 21192 bytes .../TraceTool/Viewer/WebSock/System.Linq.dll | Bin 0 -> 21152 bytes .../Viewer/WebSock/System.Net.Http.dll | Bin 0 -> 198472 bytes .../WebSock/System.Net.NameResolution.dll | Bin 0 -> 21208 bytes .../WebSock/System.Net.NetworkInformation.dll | Bin 0 -> 22248 bytes .../Viewer/WebSock/System.Net.Ping.dll | Bin 0 -> 21168 bytes .../Viewer/WebSock/System.Net.Primitives.dll | Bin 0 -> 22216 bytes .../Viewer/WebSock/System.Net.Requests.dll | Bin 0 -> 21184 bytes .../Viewer/WebSock/System.Net.Security.dll | Bin 0 -> 21696 bytes .../Viewer/WebSock/System.Net.Sockets.dll | Bin 0 -> 30544 bytes .../System.Net.WebHeaderCollection.dll | Bin 0 -> 21232 bytes .../WebSock/System.Net.WebSockets.Client.dll | Bin 0 -> 21224 bytes .../Viewer/WebSock/System.Net.WebSockets.dll | Bin 0 -> 21192 bytes .../Viewer/WebSock/System.ObjectModel.dll | Bin 0 -> 21696 bytes .../WebSock/System.Reflection.Extensions.dll | Bin 0 -> 21224 bytes .../WebSock/System.Reflection.Primitives.dll | Bin 0 -> 21736 bytes .../Viewer/WebSock/System.Reflection.dll | Bin 0 -> 22200 bytes .../WebSock/System.Resources.Reader.dll | Bin 0 -> 21200 bytes .../System.Resources.ResourceManager.dll | Bin 0 -> 21232 bytes .../WebSock/System.Resources.Writer.dll | Bin 0 -> 21200 bytes ...ystem.Runtime.CompilerServices.VisualC.dll | Bin 0 -> 21784 bytes .../WebSock/System.Runtime.Extensions.dll | Bin 0 -> 21720 bytes .../Viewer/WebSock/System.Runtime.Handles.dll | Bin 0 -> 21200 bytes ...ime.InteropServices.RuntimeInformation.dll | Bin 0 -> 28624 bytes .../System.Runtime.InteropServices.dll | Bin 0 -> 24296 bytes .../WebSock/System.Runtime.Numerics.dll | Bin 0 -> 21200 bytes ...ystem.Runtime.Serialization.Formatters.dll | Bin 0 -> 21264 bytes .../System.Runtime.Serialization.Json.dll | Bin 0 -> 21240 bytes ...ystem.Runtime.Serialization.Primitives.dll | Bin 0 -> 27048 bytes .../System.Runtime.Serialization.Xml.dll | Bin 0 -> 24816 bytes .../Viewer/WebSock/System.Runtime.dll | Bin 0 -> 29360 bytes .../Viewer/WebSock/System.Security.Claims.dll | Bin 0 -> 21200 bytes ...ystem.Security.Cryptography.Algorithms.dll | Bin 0 -> 47016 bytes .../System.Security.Cryptography.Csp.dll | Bin 0 -> 21240 bytes .../System.Security.Cryptography.Encoding.dll | Bin 0 -> 21256 bytes ...ystem.Security.Cryptography.Primitives.dll | Bin 0 -> 21784 bytes ...Security.Cryptography.X509Certificates.dll | Bin 0 -> 22832 bytes .../WebSock/System.Security.Principal.dll | Bin 0 -> 21208 bytes .../WebSock/System.Security.SecureString.dll | Bin 0 -> 22392 bytes .../System.Text.Encoding.Extensions.dll | Bin 0 -> 21232 bytes .../Viewer/WebSock/System.Text.Encoding.dll | Bin 0 -> 21696 bytes .../System.Text.RegularExpressions.dll | Bin 0 -> 21232 bytes .../WebSock/System.Threading.Overlapped.dll | Bin 0 -> 37752 bytes .../System.Threading.Tasks.Parallel.dll | Bin 0 -> 21232 bytes .../Viewer/WebSock/System.Threading.Tasks.dll | Bin 0 -> 22224 bytes .../WebSock/System.Threading.Thread.dll | Bin 0 -> 21200 bytes .../WebSock/System.Threading.ThreadPool.dll | Bin 0 -> 21216 bytes .../Viewer/WebSock/System.Threading.Timer.dll | Bin 0 -> 21200 bytes .../Viewer/WebSock/System.Threading.dll | Bin 0 -> 22192 bytes .../Viewer/WebSock/System.ValueTuple.dll | Bin 0 -> 79176 bytes .../WebSock/System.Xml.ReaderWriter.dll | Bin 0 -> 21712 bytes .../Viewer/WebSock/System.Xml.XDocument.dll | Bin 0 -> 21696 bytes .../WebSock/System.Xml.XPath.XDocument.dll | Bin 0 -> 22904 bytes .../Viewer/WebSock/System.Xml.XPath.dll | Bin 0 -> 21176 bytes .../Viewer/WebSock/System.Xml.XmlDocument.dll | Bin 0 -> 21712 bytes .../WebSock/System.Xml.XmlSerializer.dll | Bin 0 -> 21712 bytes .../TraceTool/Viewer/WebSock/TraceTool.dll | Bin 0 -> 80896 bytes .../Viewer/WebSock/WebsockPlugin.dll | Bin 0 -> 20480 bytes .../TraceTool/Viewer/WebSock/netstandard.dll | Bin 0 -> 98616 bytes .../TraceTool/Viewer/clientaccesspolicy.xml | 15 + .../FSI.Lib/TraceTool/Viewer/crossdomain.xml | 6 + FSI.Lib/FSI.Lib/TraceTool/Viewer/debug.bat | 1 + .../TraceTool/Viewer/tracetool.jmin.js | 472 + FSI.Lib/FSI.Lib/TraceTool/Viewer/tracetool.js | 3914 ++ FSI.Lib/FSI.Lib/TraceTool/WinTrace.cs | 640 + FSI.Lib/FSI.Lib/TraceTool/WinWatch.cs | 154 + FSI.Lib/FSI.Lib/TraceTool/member.cs | 313 + FSI.Lib/FSI.Lib/TraceTool/readme.md | 780 + FSI.Lib/FSI.Lib/TraceTool/reflection.cs | 910 + 228 files changed, 75756 insertions(+), 118 deletions(-) create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Cache.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CompareException.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CompareExtensions.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CompareLogic.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CompareObjects.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CompareParms.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/ComparisonConfig.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/ComparisonResult.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/CustomValidationLogic.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Difference.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/EnvironmentHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/ExcludeLogic.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/FileHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/HtmlConfig.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/ICompareLogic.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/IgnoreOrderTypes/IgnoreOrderLogic.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/IgnoreOrderTypes/IndexerCollectionLooper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/LogicEqualityComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/ProcessHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Properties/Settings.Designer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Properties/Settings.settings create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/PropertyEntity.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/BaseDualFileReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/BeyondCompareReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/CsvReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/HtmlReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/IDualFileReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/ISingleFileReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/UserFriendlyReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/Reports/WinMergeReport.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/RootComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/RootComparerFactory.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/StringHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeBackwardsCompatibilityExtensions.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/BaseComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/BaseTypeComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/ByteArrayComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/ClassComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/CollectionComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/CustomComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DataColumnComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DataRowComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DataTableComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DatasetComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DateComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DateTimeOffsetComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DecimalComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DictionaryComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/DoubleComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/EnumComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/EnumerableComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/FieldComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/FontComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/HashSetComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/ImmutableArrayComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/IndexerComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/IpEndPointComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/ListComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/PointerComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/PropertyComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/ReadOnlyCollectionComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/RuntimeTypeComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/SimpleTypeComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/StringBuilderComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/StringComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/StructComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/TimespanComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeComparers/UriComparer.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/TypeHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/VerifyConfig.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/WebHelper.cs create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/app.config create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/documentation/KellermanSoftware.Compare-NET-Objects.dxc create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/documentation/documentation.dxp create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/documentation/documentation.dxw create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/documentation/images/PoweredByNDepend.png create mode 100644 FSI.Lib/FSI.Lib/CompareNetObjects/documentation/images/logo.png create mode 100644 FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs create mode 100644 FSI.Lib/FSI.Lib/Guis/IbaDirSync/ViewModel/ViewModelIba.cs create mode 100644 FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/Model/Window.cs create mode 100644 FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/ViewModel/ViewModelWindow.cs create mode 100644 FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/Model/WinCC.cs rename FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/{WinCC.cs => ViewModel/ViewModelWinCC.cs} (63%) create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Helper.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Plugin.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TTrace.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceListener.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceNode.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceNodeBase.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceNodeEx.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceTable.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceToSend.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/TraceTool.xml create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/DotNetWrapper.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/FastMM_FullDebugMode.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TraceTool.drc create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TraceTool.exe create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TraceTool.exe - debug.lnk create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TraceTool.map create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TraceTool_Icon.png create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TracetoolConfig.xml create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/TracetoolConfigProd.xml create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/Fleck.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/Microsoft.Win32.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.AppContext.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Collections.Concurrent.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Collections.NonGeneric.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Collections.Specialized.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Collections.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ComponentModel.EventBasedAsync.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ComponentModel.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ComponentModel.TypeConverter.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ComponentModel.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Console.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Data.Common.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.Contracts.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.Debug.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.FileVersionInfo.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.Process.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.StackTrace.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.TextWriterTraceListener.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.Tools.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.TraceSource.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Diagnostics.Tracing.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Drawing.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Dynamic.Runtime.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Globalization.Calendars.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Globalization.Extensions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Globalization.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.Compression.ZipFile.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.Compression.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.FileSystem.DriveInfo.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.FileSystem.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.FileSystem.Watcher.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.FileSystem.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.IsolatedStorage.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.MemoryMappedFiles.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.Pipes.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.UnmanagedMemoryStream.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.IO.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Linq.Expressions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Linq.Parallel.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Linq.Queryable.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Linq.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Http.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.NameResolution.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.NetworkInformation.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Ping.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Requests.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Security.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.Sockets.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.WebHeaderCollection.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.WebSockets.Client.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Net.WebSockets.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ObjectModel.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Reflection.Extensions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Reflection.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Reflection.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Resources.Reader.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Resources.ResourceManager.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Resources.Writer.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.CompilerServices.VisualC.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Extensions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Handles.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.InteropServices.RuntimeInformation.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.InteropServices.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Numerics.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Serialization.Formatters.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Serialization.Json.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Serialization.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.Serialization.Xml.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Runtime.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Claims.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Cryptography.Algorithms.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Cryptography.Csp.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Cryptography.Encoding.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Cryptography.Primitives.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Cryptography.X509Certificates.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.Principal.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Security.SecureString.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Text.Encoding.Extensions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Text.Encoding.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Text.RegularExpressions.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.Overlapped.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.Tasks.Parallel.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.Tasks.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.Thread.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.ThreadPool.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.Timer.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Threading.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.ValueTuple.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.ReaderWriter.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.XDocument.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.XPath.XDocument.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.XPath.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.XmlDocument.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/System.Xml.XmlSerializer.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/TraceTool.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/WebsockPlugin.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/WebSock/netstandard.dll create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/clientaccesspolicy.xml create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/crossdomain.xml create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/debug.bat create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/tracetool.jmin.js create mode 100644 FSI.Lib/FSI.Lib/TraceTool/Viewer/tracetool.js create mode 100644 FSI.Lib/FSI.Lib/TraceTool/WinTrace.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/WinWatch.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/member.cs create mode 100644 FSI.Lib/FSI.Lib/TraceTool/readme.md create mode 100644 FSI.Lib/FSI.Lib/TraceTool/reflection.cs diff --git a/FSI.BT.Tools/App.xaml.cs b/FSI.BT.Tools/App.xaml.cs index 2aaef5a..828afdd 100644 --- a/FSI.BT.Tools/App.xaml.cs +++ b/FSI.BT.Tools/App.xaml.cs @@ -1,8 +1,12 @@ using Hardcodet.Wpf.TaskbarNotification; using NHotkey; using NHotkey.Wpf; +using System.Collections; using System.Windows; using System.Windows.Input; +using FSI.Lib.Helpers; +using FSI.Lib.CompareNetObjects; +using FSI.Lib.Guis.SetSizePosExWindow; namespace FSI.BT.Tools { @@ -31,13 +35,24 @@ namespace FSI.BT.Tools Global.FrmRadialMenu = new FrmRadialMenu(); - Global.WinCC = new Lib.Guis.SieTiaWinCCMsgMgt.WinCC( + Global.WinCC = new Lib.Guis.SieTiaWinCCMsgMgt.ViewModel.ViewModelWinCC( Global.Settings.SieTiaWinCCMsgMgtAutostart, Global.Settings.SieTiaWinCCMsgMgtUpdateIntervall, Global.Settings.SieTiaWinCCMsgMgtWindowsName, Global.Settings.SieTiaWinCCMsgMgtClassName, Global.Settings.SieTiaWinCCMsgMgtBtnName - ); + ); + + Global.Iba = new Lib.Guis.IbaDirSync.ViewModel.ViewModelIba( + Global.Settings.IbaRecordDestinationath, + Global.Settings.IbaRecordSourcePath, + Global.Settings.IbaAutoSync + ); + + Global.WindowMgt = new Lib.Guis.SetSizePosExWindow.ViewModel.ViewModelWindow(); + Global.WindowMgt.AutoStart = Global.Settings.WindowMgtAutostart; + Global.WindowMgt.UpdateIntervall = Global.Settings.WindowMgtUpdateInterval; + } private void ShowRadialMenu(object sender, HotkeyEventArgs e) @@ -60,7 +75,22 @@ namespace FSI.BT.Tools private void Application_Exit(object sender, ExitEventArgs e) { - Global.Settings.Save(); + AppSettings tmpSetting = new AppSettings(Global.Settings.FileName); + tmpSetting.Load(); + + CompareLogic compareLogic = new CompareLogic(); + ComparisonResult result = compareLogic.Compare(Global.Settings, tmpSetting); + if (!result.AreEqual) + { + Global.Settings.Save(); + } + + if (Global.Iba.RoboCopy != null) + { + Global.Iba.RoboCopy.Stop(); + Global.Iba.RoboCopy.Dispose(); + } } + } } \ No newline at end of file diff --git a/FSI.BT.Tools/AppSettings.cs b/FSI.BT.Tools/AppSettings.cs index ba48a98..569e6b0 100644 --- a/FSI.BT.Tools/AppSettings.cs +++ b/FSI.BT.Tools/AppSettings.cs @@ -1,10 +1,11 @@ using FSI.Lib.WinSettings; +using System.Collections.ObjectModel; namespace FSI.BT.Tools { public class AppSettings : XmlSettings { - + public AppSettings(string fileName) : base(fileName) { TimeStampFormat = "_yyyyMMdd_HHmmss"; @@ -15,9 +16,9 @@ namespace FSI.BT.Tools [EncryptedSetting] public string[] Users { get; set; } [EncryptedSetting] - public string[] Admins{ get; set; } + public string[] Admins { get; set; } [EncryptedSetting] - public string SuperAdmin{ get; set; } + public string SuperAdmin { get; set; } public string TimeStampFormat { get; set; } public string[] SieSimaticManagerExe { get; set; } public string[] SieTiaV13Exe { get; set; } @@ -62,5 +63,16 @@ namespace FSI.BT.Tools public string SieTiaWinCCMsgMgtWindowsName { get; set; } public string SieTiaWinCCMsgMgtClassName { get; set; } public string SieTiaWinCCMsgMgtBtnName { get; set; } + public bool IbaAutoSync { get; set; } + public string IbaRecordSourcePath { get; set; } + public string IbaRecordDestinationath { get; set; } + public string[] WindowMgtName { get; set; } + public string[] WindowMgtClassName { get; set; } + public int WindowMgtUpdateInterval { get; set; } + public bool WindowMgtAutostart { get; set; } + public int[] WindowMgtX { get; set; } + public int[] WindowMgtY { get; set; } + public int[] WindowMgtHeight { get; set; } + public int[] WindowMgtWight { get; set; } } } diff --git a/FSI.BT.Tools/Commands/LoginCommand.cs b/FSI.BT.Tools/Commands/LoginCommand.cs index 23bdb5d..376fc36 100644 --- a/FSI.BT.Tools/Commands/LoginCommand.cs +++ b/FSI.BT.Tools/Commands/LoginCommand.cs @@ -12,7 +12,7 @@ namespace FSI.BT.Tools.Commands Lib.Guis.AutoPw.FrmMain frmMain = new Lib.Guis.AutoPw.FrmMain() { CloseAtLostFocus = false, - WindowStartupLocation = WindowStartupLocation.CenterOwner, + WindowStartupLocation = WindowStartupLocation.CenterScreen, }; frmMain.ShowDialog(); diff --git a/FSI.BT.Tools/Commands/OpenAppCommand.cs b/FSI.BT.Tools/Commands/OpenAppCommand.cs index 9eb8988..bcce347 100644 --- a/FSI.BT.Tools/Commands/OpenAppCommand.cs +++ b/FSI.BT.Tools/Commands/OpenAppCommand.cs @@ -57,7 +57,7 @@ namespace FSI.BT.Tools.Commands { ShowPdf = false, CloseAtLostFocus = true, - WindowStartupLocation = WindowStartupLocation.CenterOwner, + WindowStartupLocation = WindowStartupLocation.CenterScreen, Path = Global.Settings.EplPrjPath, EplExes = Global.Settings.EplExe, }; @@ -69,7 +69,7 @@ namespace FSI.BT.Tools.Commands { ShowPdf = true, CloseAtLostFocus = true, - WindowStartupLocation = WindowStartupLocation.CenterOwner, + WindowStartupLocation = WindowStartupLocation.CenterScreen, Path = Global.Settings.EplPdfPath, }; frmMainEplPdf.Show(); @@ -114,7 +114,7 @@ namespace FSI.BT.Tools.Commands { Password = GetType().Namespace.ToString(), CloseAtLostFocus = true, - WindowStartupLocation = WindowStartupLocation.CenterOwner, + WindowStartupLocation = WindowStartupLocation.CenterScreen, }; frmMainDeEnCrypt.Show(); return; diff --git a/FSI.BT.Tools/Commands/ProcessCommand.cs b/FSI.BT.Tools/Commands/ProcessCommand.cs index 560e282..d348b29 100644 --- a/FSI.BT.Tools/Commands/ProcessCommand.cs +++ b/FSI.BT.Tools/Commands/ProcessCommand.cs @@ -1,4 +1,5 @@ using System.Windows; +using System.Windows.Data; namespace FSI.BT.Tools.Commands { @@ -10,9 +11,33 @@ namespace FSI.BT.Tools.Commands public override void Execute(object parameter) { Gui.FrmProcesses frm = new Gui.FrmProcesses(); + frm.WinCC = Global.WinCC; + frm.Iba = Global.Iba; + Global.Window.Load(); + frm.WindowMgt = Global.WindowMgt; + frm.Closed += Frm_Closed; frm.ShowDialog(); } + private void Frm_Closed(object sender, System.EventArgs e) + { + Global.WinCC = ((Gui.FrmProcesses)sender).WinCC; + + Global.Settings.SieTiaWinCCMsgMgtAutostart = Global.WinCC.WinCC.AutoStart; + Global.Settings.SieTiaWinCCMsgMgtUpdateIntervall = Global.WinCC.WinCC.UpdateIntervall; + Global.Settings.SieTiaWinCCMsgMgtWindowsName = Global.WinCC.WinCC.WindowsName; + Global.Settings.SieTiaWinCCMsgMgtClassName = Global.WinCC.WinCC.WindowsClassName; + Global.Settings.SieTiaWinCCMsgMgtBtnName = Global.WinCC.WinCC.ButtonName; + + Global.Iba = ((Gui.FrmProcesses)sender).Iba; + Global.Settings.IbaRecordDestinationath = Global.Iba.Iba.Destination; + Global.Settings.IbaRecordSourcePath = Global.Iba.Iba.Source; + Global.Settings.IbaAutoSync = Global.Iba.Iba.AutoStart; + + Global.WindowMgt = ((Gui.FrmProcesses)sender).WindowMgt; + Global.Window.Save(); + } + public override bool CanExecute(object parameter) { return Global.AdminRights; diff --git a/FSI.BT.Tools/FSI.BT.Tools.xml b/FSI.BT.Tools/FSI.BT.Tools.xml index 9a29e0e..053807b 100644 --- a/FSI.BT.Tools/FSI.BT.Tools.xml +++ b/FSI.BT.Tools/FSI.BT.Tools.xml @@ -2,7 +2,9 @@ +I945AMzKKYBAAAAB21haWVyX3M= e+Dt7FRUDDoBAAAAB21haWVyX3M= + _yyyyMMdd_HHmmss + C:\Program Files (x86)\Siemens\Step7\S7BIN\S7tgtopx.exe C:\Program Files (x86)\Siemens\Automation\Portal V13\Bin\Siemens.Automation.Portal.exe C:\Program Files\Siemens\Automation\Portal V14\Bin\Siemens.Automation.Portal.exe @@ -29,6 +31,7 @@ C:\Program Files\RealVNC\VNC Viewer\vncviewer.exe,c:\Users\maier_s\OneDrive - Fondium Group GmbH\Documents\Apps\VNC-Viewer-6.20.113-Windows-64bit.exe C:\Program Files\RealVNC\VNC Viewer\vncaddrbook.exe C:\Program Files\iba\ibaAnalyzer\ibaAnalyzer.exe + http://desiaugetwf/web/?AspxAutoDetectCookieSupport=1 http://10.10.1.42/SKSchichtbuchWeb/de-DE/Plugin/ShiftBook/ShiftBook/IR http://10.10.1.42/SKChangeTrackerWeb/de-DE/Plugin/ChangeTracker @@ -39,11 +42,17 @@ http://desiaugetc7-088:3000/ http://desiaugetc7-088:3001/en/home https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd + \\10.10.1.40\Betriebstechnik\Eplan \\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\ + true 10 #32770 Zur Kenntnis genommen + + true + d:\tmp + c:\tmp \ No newline at end of file diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml.cs b/FSI.BT.Tools/FrmRadialMenu.xaml.cs index 9c564b0..a077c8a 100644 --- a/FSI.BT.Tools/FrmRadialMenu.xaml.cs +++ b/FSI.BT.Tools/FrmRadialMenu.xaml.cs @@ -18,7 +18,7 @@ namespace FSI.BT.Tools InitializeComponent(); DataContext = this; _isOpenHome = true; - tbversion.Text = "v" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor; + tbversion.Text = "v" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "b"; } #region Home diff --git a/FSI.BT.Tools/Global.cs b/FSI.BT.Tools/Global.cs index 0feecf0..a50041c 100644 --- a/FSI.BT.Tools/Global.cs +++ b/FSI.BT.Tools/Global.cs @@ -1,5 +1,6 @@ -using FSI.Lib.Guis.SieTiaWinCCMsgMgt; -using FSI.Lib.WinSettings; +using FSI.Lib.Guis.IbaDirSync.ViewModel; +using FSI.Lib.Guis.SetSizePosExWindow.ViewModel; +using FSI.Lib.Guis.SieTiaWinCCMsgMgt.ViewModel; using Hardcodet.Wpf.TaskbarNotification; namespace FSI.BT.Tools @@ -8,10 +9,45 @@ namespace FSI.BT.Tools { public static FrmRadialMenu FrmRadialMenu { get; set; } public static TaskbarIcon TaskbarIcon { get; set; } - public static WinCC WinCC { get; set; } + public static ViewModelWinCC WinCC { get; set; } public static AppSettings Settings { get; set; } + public static ViewModelIba Iba { get; set; } + public static ViewModelWindow WindowMgt { get; set; } public static bool UserRights { get; set; } public static bool AdminRights { get; set; } public static bool SuperAdminRights { get; set; } + + public static class Window + { + public static void Load() + { + for (int i = 0; i < Global.Settings.WindowMgtName.Length; i++) + { + WindowMgt.Windows.Add(new Lib.Guis.SetSizePosExWindow.Model.Window + { + Name = Global.Settings.WindowMgtName[i], + ClassName = Global.Settings.WindowMgtClassName[i], + Height = Global.Settings.WindowMgtHeight[i], + Width = Global.Settings.WindowMgtWight[i], + X = Global.Settings.WindowMgtX[i], + Y = Global.Settings.WindowMgtY[i], + }); + } + } + + public static void Save() + { + for (int i = 0; i < Global.WindowMgt.Windows.Count; i++) + { + Global.Settings.WindowMgtName[i] = Global.WindowMgt.Windows[i].Name; + Global.Settings.WindowMgtClassName[i] = Global.WindowMgt.Windows[i].ClassName; + Global.Settings.WindowMgtHeight[i] = Global.WindowMgt.Windows[i].Height; + Global.Settings.WindowMgtWight[i] = Global.WindowMgt.Windows[i].Width; + Global.Settings.WindowMgtX[i] = Global.WindowMgt.Windows[i].X; + Global.Settings.WindowMgtY[i] = Global.WindowMgt.Windows[i].Y; + } + } + } + } } diff --git a/FSI.BT.Tools/Gui/FrmProcesses.xaml b/FSI.BT.Tools/Gui/FrmProcesses.xaml index 9b123f6..1fd2053 100644 --- a/FSI.BT.Tools/Gui/FrmProcesses.xaml +++ b/FSI.BT.Tools/Gui/FrmProcesses.xaml @@ -5,33 +5,311 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:FSI.BT.Tools.Gui" mc:Ignorable="d" - Title="FrmProcesses" - Height="450" - Width="800"> + Title="FSI.BT.Tools Prozesse" + SizeToContent="WidthAndHeight" + Height="Auto" + Width="Auto"> - - - - - - - - - - - + + + + + + + + + - - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +