58 Commits

Author SHA1 Message Date
Developer01
9bf7e08cfa Commit für beide repositories, entfernen Bagetverweise 2025-09-15 09:32:36 +02:00
Developer01
3953e74f82 MS Administration 2025-05-08 09:20:29 +02:00
Developer01
ae70046979 LookUpControl Width wider 2025-05-02 08:32:19 +02:00
Developer01
d91a0ab6ab ZugferdService Verweise erneuern 2025-04-24 18:15:12 +02:00
Developer01
d75f7939af MS Documentvierwer 2025-04-10 22:29:32 +02:00
Developer01
0d5bfef93f MS SnapPanel ScrollBar 2025-04-10 18:01:00 +02:00
Developer01
ef32824a08 Baget GDPicture update 2025-03-28 15:19:16 +01:00
Developer01
16f00e8cdd MS SQL Editor Patterns etc, DocumentViewer Relation mailldll 2025-03-27 17:04:56 +01:00
Developer01
6ed8db99ff MS documentViewer 2025-03-14 14:42:37 +01:00
Developer01
3f109c010d MS DocumentViewer 2025-02-25 16:34:43 +01:00
Developer01
76b2860739 MS Revert 2025-02-24 08:22:27 +01:00
Developer01
d0a638cf2d Revert "MS Logging"
This reverts commit 0fe82815b8.
2025-02-24 08:21:56 +01:00
Developer01
0fe82815b8 MS Logging 2025-02-21 11:53:51 +01:00
Developer01
e5631f0800 Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2025-02-12 14:11:58 +01:00
Developer01
fdbb348f7d MS LookUpGrid 2025-02-12 14:11:50 +01:00
1f4a5f23b2 testGui 2025-02-11 15:36:44 +01:00
6ecc066b0f ZUGFeRD Service: Version 2.8.9.0 2025-02-11 10:34:32 +01:00
Developer01
8161bec2d7 Lookupgrid Anchor etc 2025-02-07 10:52:49 +01:00
Developer01
cb1c9d957f GUi CW PRofileFilter 2025-01-30 16:06:18 +01:00
Developer01
c4d0b17564 MS easyFlow GUI - Match Strings ändern 2025-01-30 09:15:03 +01:00
Developer01
36f4532ccc Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2025-01-28 14:57:17 +01:00
Developer01
4dfe64216d MS DocuentViewer und ClipboardWatcher 2025-01-28 14:57:03 +01:00
9832dd0381 ZUGFeRDService: Neues DB-Feld ItemType hinzugefügt 2025-01-28 14:37:20 +01:00
45f71e06be ZUGFeRD Service - Verarbeitung von XML-Belegen 2025-01-28 14:20:04 +01:00
Developer01
56f4327926 MS 2025-01-22 07:56:50 +01:00
Developer01
54c94e11a6 Merge Commit 2025-01-21 18:07:37 +01:00
Developer01
d04b4999da MS DocumentResultList Debug 2025-01-21 18:06:50 +01:00
98b70ef791 ZUGFeRD Service: Version 2.8.8.0 2025-01-10 10:51:21 +01:00
c6756e13aa ZUGFeRD Service/WebService: Lesen/Auswertung neue Config-Schalter. GDPicture-Lizenz-Abfrage 2025-01-10 10:50:35 +01:00
64c9f14ec9 GDPicture-Lizenz 2024-11-29 11:06:07 +01:00
4ffe78b7ea ZUGFeRD Service: Version 2.8.7.0 2024-10-18 12:14:31 +02:00
Developer01
8a208993d9 MS Jobrunner only start when job exists 2024-10-11 08:40:00 +02:00
Developer01
b81ac40139 MS Logging 2024-10-08 13:48:39 +02:00
Developer01
bcbb88a4a4 Update GD Picture 2024-09-23 17:13:05 +02:00
Developer01
72da437201 Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2024-09-05 15:30:30 +02:00
Developer01
5210f59677 MS easyFLOW Renaming 2024-09-05 15:28:55 +02:00
39492f617a EMailService: Fehlerhandling 2024-07-24 14:03:03 +02:00
70b037f3b5 ZUGFeRD Service: Version 2.8.6.0 2024-07-10 14:19:11 +02:00
89391ed599 ZUGFeRD Dienst: Lesen des XML-PATH-Wertes in die Property-Objekte, für spätere Verwendung 2024-07-10 14:18:17 +02:00
e4d258cde6 LookupGrid: Version 3.4.0.0 2024-07-10 09:14:42 +02:00
e2c6ddcb39 Merge 2024-07-10 09:14:18 +02:00
2b1e44e077 ZUGFeRD Service: Version 2.8.5.0 2024-07-10 09:08:59 +02:00
b6e2f74c0e Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2024-07-08 14:33:13 +02:00
4413fc78a3 Controls.LookupGrid: Version 3.3.1.0 2024-07-08 10:18:44 +02:00
991f76d7e7 Controls.LookupGrid: Französische Texte 2024-07-08 10:18:25 +02:00
9ee028936e MS 2024-07-08 10:01:23 +02:00
fbb3f6d24c EMail Service: app.config bereinigt! 2024-07-04 12:50:22 +02:00
39ccf57f70 EMail Service: Version 1.7.2.0 2024-07-04 12:43:41 +02:00
658a961eec Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2024-06-28 13:23:43 +02:00
13c0c2e175 Ms Working with Bytes 2024-06-28 13:23:29 +02:00
34002c8631 EMail Service: Version 1.7.1.0 2024-06-28 12:59:58 +02:00
09d47a303e EmailService: IsNullOrWhiteSpace ist hier besser 2024-06-28 12:59:33 +02:00
b3cc85278d EMail Service: Youtrack ES-3
Comment-Feld wird überschrieben, weil das Replace vermutlich nicht funktionierte
2024-06-28 12:57:48 +02:00
40d9cef351 Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo 2024-06-28 11:43:49 +02:00
e4968e701b ZUGFeRD Service: Version 2.8.4.0 2024-06-28 11:43:43 +02:00
c0175f1fb5 Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2024-06-25 11:23:19 +02:00
797a01245a V 1.7 Test ByteData 2024-06-25 11:23:13 +02:00
2e768dae5e ZUGFeRD Service 2.8.3.0 2024-06-12 09:05:45 +02:00
77 changed files with 3510 additions and 2325 deletions

View File

@@ -131,6 +131,7 @@
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="ChatControl.resx"> <EmbeddedResource Include="ChatControl.resx">
<DependentUpon>ChatControl.vb</DependentUpon> <DependentUpon>ChatControl.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" /> <EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx"> <EmbeddedResource Include="My Project\Resources.resx">

View File

@@ -1,6 +1,61 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <configSections>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</startup> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configuration> </configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
</providers>
<defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
</entityFramework>
</configuration>

View File

@@ -98,6 +98,7 @@ Partial Class DocumentViewer
Me.GdViewer.DrawPageBorders = True Me.GdViewer.DrawPageBorders = True
Me.GdViewer.EnableDeferredPainting = True Me.GdViewer.EnableDeferredPainting = True
Me.GdViewer.EnabledProgressBar = True Me.GdViewer.EnabledProgressBar = True
Me.GdViewer.EnableFuzzySearch = False
Me.GdViewer.EnableICM = False Me.GdViewer.EnableICM = False
Me.GdViewer.EnableMenu = True Me.GdViewer.EnableMenu = True
Me.GdViewer.EnableMouseWheel = True Me.GdViewer.EnableMouseWheel = True

View File

@@ -161,26 +161,6 @@
NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
<data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
Cjwvc3ZnPgs=
</value> </value>
</data> </data>
<data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -243,6 +223,26 @@
ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
<data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
Cjwvc3ZnPgs=
</value> </value>
</data> </data>
<metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -489,6 +489,7 @@ Public Class DocumentViewer
End Sub End Sub
Private Function DoLoadFile(FilePath As String) As Boolean Private Function DoLoadFile(FilePath As String) As Boolean
Try Try
_logger.Debug($"Starting DoLoadFile with [{FilePath}] ...")
Dim oFileInfo = New FileInfo(FilePath) Dim oFileInfo = New FileInfo(FilePath)
Dim oExtension As String = oFileInfo.Extension.ToUpper Dim oExtension As String = oFileInfo.Extension.ToUpper
@@ -502,6 +503,7 @@ Public Class DocumentViewer
Select Case oExtension.ToUpper Select Case oExtension.ToUpper
Case ".MSG" Case ".MSG"
'msg is converted to eml and then displayed in GDPicture
Dim oEmlPath As String = _email.Convert_ToEml(FilePath) Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
_TempFiles.Add(oEmlPath) _TempFiles.Add(oEmlPath)
DoLoadFile(oEmlPath) DoLoadFile(oEmlPath)
@@ -523,6 +525,7 @@ Public Class DocumentViewer
SpreadsheetControl1.Dock = DockStyle.Fill SpreadsheetControl1.Dock = DockStyle.Fill
Case Else Case Else
_logger.Debug($"Loading GDViewer with extension [{oExtension}] ...")
GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
GdViewer.ForceTemporaryMode = True GdViewer.ForceTemporaryMode = True

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +16,8 @@
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,6 +52,9 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -73,43 +79,204 @@
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
<HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
<HintPath>D:\ProgramFiles\GdPicture.net 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath> </Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
<HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
</Reference>
<Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
</Reference>
<Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@@ -205,24 +372,6 @@
<None Include="Resources\tooltips1.svg" /> <None Include="Resources\tooltips1.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="GdPicture.NET.14.filters.64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="GdPicture.NET.14.filters.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="GdPicture.NET.14.image.gdimgplug.64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="GdPicture.NET.14.image.gdimgplug.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\viewsettings.svg" /> <None Include="Resources\viewsettings.svg" />
<None Include="Resources\next.svg" /> <None Include="Resources\next.svg" />
<None Include="Resources\prev.svg" /> <None Include="Resources\prev.svg" />
@@ -236,5 +385,19 @@
<None Include="Resources\rotateclockwise.svg" /> <None Include="Resources\rotateclockwise.svg" />
<None Include="Resources\rotatecounterclockwise.svg" /> <None Include="Resources\rotatecounterclockwise.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="MailLicense.xml" />
<Content Include="README.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
</Project> </Project>

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<License>
<Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
<ProductName>Mail.dll</ProductName>
<SubscriptionUntil>2022-07-29</SubscriptionUntil>
<RegisteredTo>Digital Data GmbH</RegisteredTo>
<LicenseType>single developer</LicenseType>
<BuyerName>Digital Data GmbH</BuyerName>
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
<Reference URI="">
<Transforms>
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
</Signature>
</License>

View File

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
' Werte der Assemblyattribute überprüfen ' Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("DocumentViewer")> <Assembly: AssemblyTitle("DigitalData.DocumentViewer")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("Stellt den Digital Data DocumentViewer für Applikationen zur Verfügung")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("Digutal Data GmbH, Heuchelheim")>
<Assembly: AssemblyProduct("DocumentViewer")> <Assembly: AssemblyProduct("DigitalData.DocumentViewer")>
<Assembly: AssemblyCopyright("Copyright © 2024")> <Assembly: AssemblyCopyright("Copyright © 2025")>
<Assembly: AssemblyTrademark("1.9.4.0")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.4.0")> <Assembly: AssemblyVersion("1.9.8.0")>
<Assembly: AssemblyFileVersion("1.9.4.0")> <Assembly: AssemblyFileVersion("1.9.8.0")>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase

View File

@@ -0,0 +1,5 @@
BASE MODULE
===========
This module is intended for often used constants and datastructures.
Therefor it is important that this module does not have any dependencies on other modules!!

View File

@@ -1,4 +1,49 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
<package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
<package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
<package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
<package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
<package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
<package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.0.5" targetFramework="net461" /> <package id="NLog" version="5.0.5" targetFramework="net461" />
<package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
<package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
<package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
<package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
<package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
<package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
<package id="System.Management" version="9.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages> </packages>

View File

@@ -135,11 +135,18 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="frmLookupGrid.aa.resx">
<DependentUpon>frmLookupGrid.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmLookupGrid.en.resx"> <EmbeddedResource Include="frmLookupGrid.en.resx">
<DependentUpon>frmLookupGrid.vb</DependentUpon> <DependentUpon>frmLookupGrid.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmLookupGrid.fr.resx">
<DependentUpon>frmLookupGrid.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmLookupGrid.resx"> <EmbeddedResource Include="frmLookupGrid.resx">
<DependentUpon>frmLookupGrid.vb</DependentUpon> <DependentUpon>frmLookupGrid.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="LookupControl3.resx"> <EmbeddedResource Include="LookupControl3.resx">
<DependentUpon>LookupControl3.vb</DependentUpon> <DependentUpon>LookupControl3.vb</DependentUpon>
@@ -156,6 +163,7 @@
<LastGenOutput>Strings.en.Designer.vb</LastGenOutput> <LastGenOutput>Strings.en.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace> <CustomToolNamespace>My.Resources</CustomToolNamespace>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.fr.resx" />
<EmbeddedResource Include="Resources\Strings.resx"> <EmbeddedResource Include="Resources\Strings.resx">
<CustomToolNamespace>My.Resources</CustomToolNamespace> <CustomToolNamespace>My.Resources</CustomToolNamespace>
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>

View File

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("LookupGrid")> <Assembly: AssemblyProduct("LookupGrid")>
<Assembly: AssemblyCopyright("Copyright © 2022")> <Assembly: AssemblyCopyright("Copyright © 2024")>
<Assembly: AssemblyTrademark("3.3.0.0")> <Assembly: AssemblyTrademark("3.4.0.0")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.3.0.0")> <Assembly: AssemblyVersion("3.4.4.0")>
<Assembly: AssemblyFileVersion("3.3.0.0")> <Assembly: AssemblyFileVersion("3.4.4.0")>

View File

@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.42000
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@@ -15,12 +15,12 @@ Imports System
Namespace My.Resources Namespace My.Resources
'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert 'This class was auto-generated by the StronglyTypedResourceBuilder
'-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. 'class via a tool like ResGen or Visual Studio.
'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen 'To add or remove a member, edit your .ResX file then rerun ResGen
'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. 'with the /str option, or rebuild your VS project.
'''<summary> '''<summary>
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary> '''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _ <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -37,7 +37,7 @@ Namespace My.Resources
End Sub End Sub
'''<summary> '''<summary>
''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' Returns the cached ResourceManager instance used by this class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -51,8 +51,8 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle ''' Overrides the current thread's CurrentUICulture property for all
''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' resource lookups using this strongly typed resource class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Shared Property Culture() As Global.System.Globalization.CultureInfo Friend Shared Property Culture() As Global.System.Globalization.CultureInfo
@@ -65,7 +65,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Keine Datensätze ausgewählt ähnelt. ''' Looks up a localized string similar to Keine Datensätze ausgewählt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property LookupControl_NoRecords() As String Friend Shared ReadOnly Property LookupControl_NoRecords() As String
Get Get
@@ -74,7 +74,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die {0} Datensätze ausgewählt ähnelt. ''' Looks up a localized string similar to {0} Datensätze ausgewählt.
'''</summary> '''</summary>
Friend Shared ReadOnly Property LookupControl_NRecords() As String Friend Shared ReadOnly Property LookupControl_NRecords() As String
Get Get
@@ -83,7 +83,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Wert aus: ähnelt. ''' Looks up a localized string similar to Bitte wählen Sie einen Wert aus:.
'''</summary> '''</summary>
Friend Shared ReadOnly Property PopupForm_Text() As String Friend Shared ReadOnly Property PopupForm_Text() As String
Get Get
@@ -92,7 +92,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt. ''' Looks up a localized string similar to Bitte wählen Sie einen oder mehrere Werte aus:.
'''</summary> '''</summary>
Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
Get Get

View File

@@ -0,0 +1,132 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="LookupControl_NoRecords" xml:space="preserve">
<value>Aucun record sélectionné</value>
</data>
<data name="LookupControl_NRecords" xml:space="preserve">
<value>{0} records sélectionnés</value>
</data>
<data name="PopupForm_Text" xml:space="preserve">
<value>Veuillez sélectionner une valeur :</value>
</data>
<data name="PopupForm_TextMultiselect" xml:space="preserve">
<value>Veuillez sélectionner une ou plusieurs valeurs :</value>
</data>
</root>

View File

@@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmLookupGrid Partial Class frmLookupGrid
Inherits DevExpress.XtraEditors.XtraForm Inherits DevExpress.XtraEditors.XtraForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _ <System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean) Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try Try
If disposing AndAlso components IsNot Nothing Then If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmLookupGrid
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookupGrid)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookupGrid))
Me.gridLookup = New DevExpress.XtraGrid.GridControl() Me.gridLookup = New DevExpress.XtraGrid.GridControl()
@@ -36,6 +36,12 @@ Partial Class frmLookupGrid
'gridLookup 'gridLookup
' '
resources.ApplyResources(Me.gridLookup, "gridLookup") resources.ApplyResources(Me.gridLookup, "gridLookup")
Me.gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
Me.gridLookup.EmbeddedNavigator.Anchor = CType(resources.GetObject("gridLookup.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
Me.gridLookup.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("gridLookup.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
Me.gridLookup.EmbeddedNavigator.ImeMode = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
Me.gridLookup.EmbeddedNavigator.TextLocation = CType(resources.GetObject("gridLookup.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
Me.gridLookup.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
Me.gridLookup.MainView = Me.viewLookup Me.gridLookup.MainView = Me.viewLookup
Me.gridLookup.Name = "gridLookup" Me.gridLookup.Name = "gridLookup"
Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup}) Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup})
@@ -68,6 +74,8 @@ Partial Class frmLookupGrid
' '
'frmLookupGrid 'frmLookupGrid
' '
Me.Appearance.BackColor = System.Drawing.Color.White
Me.Appearance.Options.UseBackColor = True
resources.ApplyResources(Me, "$this") resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.gridLookup) Me.Controls.Add(Me.gridLookup)

View File

@@ -0,0 +1,161 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>Default</value>
</data>
<data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
</data>
<data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Tile</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>Center</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
<value />
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>None</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
<value />
</data>
</root>

View File

@@ -117,12 +117,49 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="btnClear.Text" xml:space="preserve"> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>Clear</value> <data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>Default</value>
</data>
<data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
</data>
<data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Tile</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing"> <data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>390, 293</value> <value>0, 0</value>
</data>
<assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>Center</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
<value />
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>None</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
<value />
</data>
<data name="btnClear.Text" xml:space="preserve">
<value>Clear</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Choose a value:</value> <value>Choose a value:</value>

View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="btnClear.Text" xml:space="preserve">
<value>Vider</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Choisissez une valeur :</value>
</data>
</root>

View File

@@ -118,15 +118,36 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="gridLookup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="gridLookup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Fill</value> <value>Top, Bottom, Left, Right</value>
</data>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
<value>True</value>
</data>
<data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
<data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value>
</data>
<data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
<value>None</value>
</data>
<assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
<value>Application</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="gridLookup.Location" type="System.Drawing.Point, System.Drawing"> <data name="gridLookup.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>12, 2</value>
</data> </data>
<data name="gridLookup.Size" type="System.Drawing.Size, System.Drawing"> <data name="gridLookup.Size" type="System.Drawing.Size, System.Drawing">
<value>388, 221</value> <value>469, 260</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="gridLookup.TabIndex" type="System.Int32, mscorlib"> <data name="gridLookup.TabIndex" type="System.Int32, mscorlib">
@@ -144,11 +165,14 @@
<data name="&gt;&gt;gridLookup.ZOrder" xml:space="preserve"> <data name="&gt;&gt;gridLookup.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="btnOK.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 6</value> <value>3, 10</value>
</data> </data>
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 23</value> <value>117, 32</value>
</data> </data>
<data name="btnOK.TabIndex" type="System.Int32, mscorlib"> <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@@ -169,13 +193,13 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value> <value>Bottom, Left</value>
</data> </data>
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
<value>240, 6</value> <value>135, 10</value>
</data> </data>
<data name="btnClear.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 23</value> <value>117, 32</value>
</data> </data>
<data name="btnClear.TabIndex" type="System.Int32, mscorlib"> <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@@ -199,10 +223,13 @@
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 221</value> <value>0, 271</value>
</data>
<data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>388, 40</value> <value>493, 45</value>
</data> </data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib"> <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@@ -226,7 +253,7 @@
<value>6, 13</value> <value>6, 13</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>388, 261</value> <value>493, 316</value>
</data> </data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>390, 293</value> <value>390, 293</value>

View File

@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
' Werte der Assemblyattribute überprüfen ' Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("SnapPanel")> <Assembly: AssemblyTitle("DigitalData.SnapPanel")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("Integriert ein SnapPanel für das Design von Forms")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
<Assembly: AssemblyProduct("SnapPanel")> <Assembly: AssemblyProduct("DigitalData.SnapPanel")>
<Assembly: AssemblyCopyright("Copyright © 2021")> <Assembly: AssemblyCopyright("")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' indem Sie "*" wie unten gezeigt eingeben: ' indem Sie "*" wie unten gezeigt eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.1.0")> <Assembly: AssemblyVersion("2.0.1.0")>
<Assembly: AssemblyFileVersion("1.0.1.0")> <Assembly: AssemblyFileVersion("2.0.1.0")>

View File

@@ -5,7 +5,9 @@ Public Class ClassSnapPanel
Private _ShowGrid As Boolean = True Private _ShowGrid As Boolean = True
Private _GridSize As Integer = 16 Private _GridSize As Integer = 16
Public Sub New()
Me.AutoScroll = True ' Scrollbars aktivieren
End Sub
Public Property GridSize As Integer Public Property GridSize As Integer
Get Get
Return _GridSize Return _GridSize
@@ -30,12 +32,14 @@ Public Class ClassSnapPanel
AddHandler e.Control.LocationChanged, AddressOf AlignToGrid AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
AddHandler e.Control.DragDrop, AddressOf AlignToGrid AddHandler e.Control.DragDrop, AddressOf AlignToGrid
MyBase.OnControlAdded(e) MyBase.OnControlAdded(e)
UpdateScrollArea()
End Sub End Sub
Protected Overrides Sub OnControlRemoved(e As ControlEventArgs) Protected Overrides Sub OnControlRemoved(e As ControlEventArgs)
RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
MyBase.OnControlRemoved(e) MyBase.OnControlRemoved(e)
UpdateScrollArea()
End Sub End Sub
Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs) Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
@@ -51,6 +55,23 @@ Public Class ClassSnapPanel
Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
item.Location = New Point(x, y) item.Location = New Point(x, y)
UpdateScrollArea()
End If End If
End Sub End Sub
Private Sub UpdateScrollArea()
Dim maxWidth As Integer = 0
Dim maxHeight As Integer = 0
' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen
For Each ctrl As Control In Controls
Dim right As Integer = ctrl.Right
Dim bottom As Integer = ctrl.Bottom
If right > maxWidth Then maxWidth = right
If bottom > maxHeight Then maxHeight = bottom
Next
' Scrollbereich setzen
Me.AutoScrollMinSize = New Size(maxWidth, maxHeight)
End Sub
End Class End Class

View File

@@ -74,6 +74,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DBCleaner", "DBCleaner\DBCl
EndProject EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMIService.Tests\EDMIService.Tests.vbproj", "{E3DA65CA-964D-4896-991A-B5426884E215}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMIService.Tests\EDMIService.Tests.vbproj", "{E3DA65CA-964D-4896-991A-B5426884E215}"
EndProject EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "..\DDModules\Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -180,6 +182,10 @@ Global
{E3DA65CA-964D-4896-991A-B5426884E215}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3DA65CA-964D-4896-991A-B5426884E215}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.ActiveCfg = Release|Any CPU {E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.Build.0 = Release|Any CPU {E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.Build.0 = Release|Any CPU
{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -210,6 +216,7 @@ Global
{9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
{5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
{E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}

View File

@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
' Werte der Assemblyattribute überprüfen ' Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("ClipboardWatcher")> <Assembly: AssemblyTitle("easyFLOWBib")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("ClipboardWatcher")> <Assembly: AssemblyProduct("easyFLOWBib")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("Copyright © 2023")>
<Assembly: AssemblyTrademark("1.5.3.0")> <Assembly: AssemblyTrademark("1.5.3.0")>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.3.0")> <Assembly: AssemblyVersion("1.6.2.0")>
<Assembly: AssemblyFileVersion("1.5.3.0")> <Assembly: AssemblyFileVersion("1.6.2.0")>

View File

@@ -82,7 +82,7 @@ Public Class ProfileFilter
Dim oFilteredProfiles As New List(Of ProfileData) Dim oFilteredProfiles As New List(Of ProfileData)
Dim oRootNode As TreeNode = New TreeNode() With { Dim oRootNode As TreeNode = New TreeNode() With {
.Text = $"Suche nach '{ClipboardContents}'", .Text = $"easyFLOW Search with term: '{ClipboardContents}'",
.Tag = NODE_ROOT, .Tag = NODE_ROOT,
.ImageIndex = ImageIndex.Root .ImageIndex = ImageIndex.Root
} }
@@ -90,6 +90,9 @@ Public Class ProfileFilter
_TreeView.Nodes.Add(oRootNode) _TreeView.Nodes.Add(oRootNode)
For Each oProfile In Profiles For Each oProfile In Profiles
If oProfile.Name = String.Empty Then
oProfile.Name = $"ProfileName for ID {oProfile.Guid} is empty - Check SQL"
End If
Logger.Debug("Current Profile: {0}", oProfile.Name) Logger.Debug("Current Profile: {0}", oProfile.Name)
Dim oNode = _ProfileMatch.NewProfileNode(oProfile) Dim oNode = _ProfileMatch.NewProfileNode(oProfile)
@@ -576,7 +579,7 @@ Public Class ProfileFilter
oList.Add(New ProfileData() With { oList.Add(New ProfileData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.Regex = oRow.Item("REGEX_EXPRESSION"), .Regex = oRow.Item("REGEX_EXPRESSION"),
.Name = oRow.ItemEx("NAME", String.Empty), .Name = oRow.ItemEx("PROFIL_NAME", "Check_Function_TransformProfiles"),
.Comment = oRow.ItemEx("COMMENT", String.Empty), .Comment = oRow.ItemEx("COMMENT", String.Empty),
.ProfileType = oRow.ItemEx("PROFILE_TYPE", String.Empty), .ProfileType = oRow.ItemEx("PROFILE_TYPE", String.Empty),
.Processes = oProcessList, .Processes = oProcessList,
@@ -647,10 +650,10 @@ Public Class ProfileFilter
Dim oProcessList As New List(Of ProcessData) Dim oProcessList As New List(Of ProcessData)
For Each oRow As DataRow In ProcessDatatable.Rows For Each oRow As DataRow In ProcessDatatable.Rows
If oRow.Item("PROFILE_ID") = ProfileId Then If oRow.Item("PROFIL_ID") = ProfileId Then
oProcessList.Add(New ProcessData() With { oProcessList.Add(New ProcessData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.PROFILE_ID = oRow.Item("PROFILE_ID"), .PROFILE_ID = oRow.Item("PROFIL_ID"),
.ProcessName = oRow.ItemEx("PROC_NAME", String.Empty) .ProcessName = oRow.ItemEx("PROC_NAME", String.Empty)
}) })
End If End If

View File

@@ -28,7 +28,7 @@ Public Class ProfileMatch
_Logger.Debug("New Profile Node for Profile {0}", Profile.Name) _Logger.Debug("New Profile Node for Profile {0}", Profile.Name)
Dim oNode As New TreeNode() With { Dim oNode As New TreeNode() With {
.Text = $"Profile: {Profile.Name}", .Text = $"Checking profile with name: '{Profile.Name}'",
.ImageIndex = ProfileFilter.ImageIndex.Profile, .ImageIndex = ProfileFilter.ImageIndex.Profile,
.Tag = Profile.Name & "-PROFILE" .Tag = Profile.Name & "-PROFILE"
} }
@@ -39,7 +39,7 @@ Public Class ProfileMatch
Public Function NewClipboardRegexNode(Profile As ProfileData, IsMatch As Boolean) As TreeNode Public Function NewClipboardRegexNode(Profile As ProfileData, IsMatch As Boolean) As TreeNode
_Logger.Debug("New Clipboard Regex Node for Profile {0}", Profile.Name) _Logger.Debug("New Clipboard Regex Node for Profile {0}", Profile.Name)
Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex {Profile.Regex}" Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex: '{Profile.Regex}'"
Dim oNode As New TreeNode() With { Dim oNode As New TreeNode() With {
.Text = oText, .Text = oText,
.ImageIndex = ProfileFilter.ImageIndex.Clipboard, .ImageIndex = ProfileFilter.ImageIndex.Clipboard,
@@ -56,7 +56,7 @@ Public Class ProfileMatch
If IsCatchAll Then If IsCatchAll Then
oText = $"{GetMatchText(IsMatch)} on Catch-All Process" oText = $"{GetMatchText(IsMatch)} on Catch-All Process"
Else Else
oText = $"{GetMatchText(IsMatch)} on ProcessName {Process.ProcessName}" oText = $"{GetMatchText(IsMatch)} on ProcessName: '{Process.ProcessName}'"
End If End If
Dim oNode As New TreeNode() With { Dim oNode As New TreeNode() With {
@@ -73,7 +73,7 @@ Public Class ProfileMatch
_Logger.Debug("New Window Node for Profile {0} and WindowTitle {1}", Profile.Name, Window.Title) _Logger.Debug("New Window Node for Profile {0} and WindowTitle {1}", Profile.Name, Window.Title)
Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH") Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
Dim oText = $"{GetMatchText(IsMatch)} on WindowTitle {Window.Title}" Dim oText = $"{GetMatchText(IsMatch)} on WindowTitle: '{Window.Title}'"
Dim oNode As New TreeNode() With { Dim oNode As New TreeNode() With {
.Text = oText, .Text = oText,
.ImageIndex = ProfileFilter.ImageIndex.Window, .ImageIndex = ProfileFilter.ImageIndex.Window,
@@ -88,7 +88,7 @@ Public Class ProfileMatch
_Logger.Debug("New Control Node for Profile {0} and Control {1}", Profile.Name, Control.Description) _Logger.Debug("New Control Node for Profile {0} and Control {1}", Profile.Name, Control.Description)
Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH") Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}" Dim oText = $"{GetMatchText(IsMatch)} on Control: '{Control.Description}'"
Dim oNode As New TreeNode() With { Dim oNode As New TreeNode() With {
.Text = oText, .Text = oText,

View File

@@ -34,7 +34,6 @@ Partial Class frmMatch
' '
'TileControlMatch 'TileControlMatch
' '
resources.ApplyResources(Me.TileControlMatch, "TileControlMatch")
Me.TileControlMatch.AllowDragTilesBetweenGroups = False Me.TileControlMatch.AllowDragTilesBetweenGroups = False
Me.TileControlMatch.AppearanceGroupText.BackColor = System.Drawing.Color.Transparent Me.TileControlMatch.AppearanceGroupText.BackColor = System.Drawing.Color.Transparent
Me.TileControlMatch.AppearanceGroupText.Font = CType(resources.GetObject("TileControlMatch.AppearanceGroupText.Font"), System.Drawing.Font) Me.TileControlMatch.AppearanceGroupText.Font = CType(resources.GetObject("TileControlMatch.AppearanceGroupText.Font"), System.Drawing.Font)
@@ -43,6 +42,7 @@ Partial Class frmMatch
Me.TileControlMatch.AppearanceGroupText.Options.UseFont = True Me.TileControlMatch.AppearanceGroupText.Options.UseFont = True
Me.TileControlMatch.AppearanceGroupText.Options.UseForeColor = True Me.TileControlMatch.AppearanceGroupText.Options.UseForeColor = True
Me.TileControlMatch.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.TileControlMatch.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
resources.ApplyResources(Me.TileControlMatch, "TileControlMatch")
Me.TileControlMatch.Groups.Add(Me.TileGroupDocumentsData) Me.TileControlMatch.Groups.Add(Me.TileGroupDocumentsData)
Me.TileControlMatch.Groups.Add(Me.TileGroupDocuments) Me.TileControlMatch.Groups.Add(Me.TileGroupDocuments)
Me.TileControlMatch.Groups.Add(Me.TileGroupData) Me.TileControlMatch.Groups.Add(Me.TileGroupData)
@@ -67,16 +67,16 @@ Partial Class frmMatch
' '
'Label1 'Label1
' '
resources.ApplyResources(Me.Label1, "Label1")
Me.Label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.Label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
resources.ApplyResources(Me.Label1, "Label1")
Me.Label1.ForeColor = System.Drawing.Color.White Me.Label1.ForeColor = System.Drawing.Color.White
Me.Label1.Name = "Label1" Me.Label1.Name = "Label1"
' '
'Label2 'Label2
' '
resources.ApplyResources(Me.Label2, "Label2")
Me.Label2.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.Label2.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand
resources.ApplyResources(Me.Label2, "Label2")
Me.Label2.ForeColor = System.Drawing.SystemColors.Control Me.Label2.ForeColor = System.Drawing.SystemColors.Control
Me.Label2.Name = "Label2" Me.Label2.Name = "Label2"
' '

View File

@@ -117,154 +117,154 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="TileControlMatch.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="&gt;&gt;TileControlMatch.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 420</value>
</data>
<data name="&gt;&gt;Label1.Name" xml:space="preserve">
<value>Label1</value>
</data>
<data name="&gt;&gt;TileControlMatch.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 30</value>
</data>
<data name="&gt;&gt;SplashScreenManager1.Name" xml:space="preserve">
<value>SplashScreenManager1</value>
</data>
<data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 38</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="TileControlMatch.AppearanceGroupText.Font" type="System.Drawing.Font, System.Drawing"> <data name="TileControlMatch.AppearanceGroupText.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 12pt</value> <value>Segoe UI, 12pt</value>
</data> </data>
<data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="TileControlMatch.Text" xml:space="preserve">
<value>TileControl1</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="TileControlMatch.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="TileControlMatch.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="TileGroupData.Text" xml:space="preserve"> <data name="TileGroupDocumentsData.Text" xml:space="preserve">
<value>Daten</value> <value>Kombiniert</value>
</data>
<data name="Label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="&gt;&gt;Label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="TileControlMatch.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 38</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>800, 450</value>
</data>
<data name="Label1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="&gt;&gt;Label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Label2.Name" xml:space="preserve">
<value>Label2</value>
</data>
<data name="&gt;&gt;TileGroupDocumentsData.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9.75pt</value>
</data>
<data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI Semibold, 12pt, style=Bold</value>
</data>
<data name="&gt;&gt;TileGroupDocumentsData.Name" xml:space="preserve">
<value>TileGroupDocumentsData</value>
</data>
<data name="Label2.Text" xml:space="preserve">
<value>Wie wurden die Profile gefunden?</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmMatch</value>
</data>
<data name="&gt;&gt;Label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SplashScreenManager1.Type" xml:space="preserve">
<value>DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Label1.Text" xml:space="preserve">
<value>Es wurde(n) {0} in {1} für Ihre Suche nach '{2}' gefunden:</value>
</data>
<data name="&gt;&gt;TileGroupDocuments.Name" xml:space="preserve">
<value>TileGroupDocuments</value>
</data>
<data name="Label2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data> </data>
<data name="TileGroupDocuments.Text" xml:space="preserve"> <data name="TileGroupDocuments.Text" xml:space="preserve">
<value>Dokumente</value> <value>Dokumente</value>
</data> </data>
<data name="TileGroupData.Text" xml:space="preserve">
<value>Daten</value>
</data>
<data name="TileControlMatch.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 38</value>
</data>
<data name="TileControlMatch.Size" type="System.Drawing.Size, System.Drawing"> <data name="TileControlMatch.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 382</value> <value>800, 382</value>
</data> </data>
<data name="&gt;&gt;Label2.Parent" xml:space="preserve"> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>$this</value> <data name="TileControlMatch.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data> </data>
<data name="Label2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="TileControlMatch.Text" xml:space="preserve">
<value>5, 5, 5, 5</value> <value>TileControl1</value>
</data> </data>
<data name="&gt;&gt;TileControlMatch.Name" xml:space="preserve"> <data name="&gt;&gt;TileControlMatch.Name" xml:space="preserve">
<value>TileControlMatch</value> <value>TileControlMatch</value>
</data> </data>
<data name="&gt;&gt;Label2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;TileControlMatch.Type" xml:space="preserve">
<value>1</value> <value>DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;TileControlMatch.Parent" xml:space="preserve">
<value>$this</value>
</data> </data>
<data name="&gt;&gt;TileControlMatch.ZOrder" xml:space="preserve"> <data name="&gt;&gt;TileControlMatch.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;TileGroupData.Name" xml:space="preserve"> <data name="Label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>TileGroupData</value> <value>Top</value>
</data> </data>
<data name="TileGroupDocumentsData.Text" xml:space="preserve"> <data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
<value>Kombiniert</value> <value>Segoe UI Semibold, 12pt, style=Bold</value>
</data> </data>
<data name="&gt;&gt;TileGroupDocuments.Type" xml:space="preserve"> <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>0, 0</value>
</data>
<data name="Label1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 38</value>
</data> </data>
<data name="Label1.TabIndex" type="System.Int32, mscorlib"> <data name="Label1.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="Label1.Text" xml:space="preserve">
<value>Clipboard Watcher - Profile gefunden</value> <value>Es wurde(n) {0} in {1} für Ihre Suche nach '{2}' gefunden:</value>
</data>
<data name="&gt;&gt;Label1.Name" xml:space="preserve">
<value>Label1</value>
</data>
<data name="&gt;&gt;Label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
<value>2</value>
</data> </data>
<data name="Label2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="Label2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="&gt;&gt;TileGroupData.Type" xml:space="preserve"> <data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>Segoe UI, 9.75pt</value>
</data>
<data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 420</value>
</data>
<data name="Label2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 30</value>
</data>
<data name="Label2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="Label2.Text" xml:space="preserve">
<value>Wie wurden die Profile gefunden?</value>
</data>
<data name="&gt;&gt;Label2.Name" xml:space="preserve">
<value>Label2</value>
</data>
<data name="&gt;&gt;Label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
<value>1</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>800, 450</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>easyFLOW - Profile gefunden</value>
</data>
<data name="&gt;&gt;TileGroupDocumentsData.Name" xml:space="preserve">
<value>TileGroupDocumentsData</value>
</data>
<data name="&gt;&gt;TileGroupDocumentsData.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;TileGroupDocuments.Name" xml:space="preserve">
<value>TileGroupDocuments</value>
</data>
<data name="&gt;&gt;TileGroupDocuments.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;TileGroupData.Name" xml:space="preserve">
<value>TileGroupData</value>
</data>
<data name="&gt;&gt;TileGroupData.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.TileGroup, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplashScreenManager1.Name" xml:space="preserve">
<value>SplashScreenManager1</value>
</data>
<data name="&gt;&gt;SplashScreenManager1.Type" xml:space="preserve">
<value>DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmMatch</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root> </root>

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -46,6 +49,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Dialogs.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Dialogs.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -64,56 +70,235 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Controls.DocumentViewer">
<HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Base"> <Reference Include="DigitalData.Modules.Base">
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database"> <Reference Include="DigitalData.Modules.Database, Version=2.3.6.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.EDMI.API"> <Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath> <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Patterns"> <Reference Include="DigitalData.Modules.Messaging, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath> <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Windows"> <Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath> <HintPath>..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.ZooFlow"> <Reference Include="DigitalData.Modules.ZooFlow">
<HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath> <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14"> <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
<HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
</Reference>
<Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
</Reference>
<Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.Linq" /> <Reference Include="System.Data.Linq" />
<Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
<Reference Include="System.IdentityModel" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Remoting" /> <Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" /> <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@@ -347,10 +532,6 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
<Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
<Name>DocumentViewer</Name>
</ProjectReference>
<ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj"> <ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
<Project>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</Project> <Project>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</Project>
<Name>LookupControl</Name> <Name>LookupControl</Name>
@@ -634,4 +815,14 @@
<None Include="Resources\check1.svg" /> <None Include="Resources\check1.svg" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
</Project> </Project>

View File

@@ -52,12 +52,15 @@ Namespace DocumentResultList
Select Case Mode Select Case Mode
Case OperationMode.NoAppServer Case OperationMode.NoAppServer
Logger.Debug($"DRL Loader - Loading Document Load_FromWindream ")
oDocument = Load_FromWindream(pObjectId, pFullPath) oDocument = Load_FromWindream(pObjectId, pFullPath)
Case OperationMode.WithAppServer Case OperationMode.WithAppServer
Logger.Debug($"DRL Loader - Loading Document with AppServer ")
oDocument = Load_FromIDB(pObjectId) oDocument = Load_FromIDB(pObjectId)
Case OperationMode.ZooFlow Case OperationMode.ZooFlow
Logger.Debug($"DRL Loader - Loading Document from Zooflow")
oDocument = Load_FromZooflow(pObjectId) oDocument = Load_FromZooflow(pObjectId)
Case Else Case Else

View File

@@ -10,7 +10,7 @@ Namespace DocumentResultList
Inherits BaseClass Inherits BaseClass
Private WithEvents FileOpenTimer As New Timer Private WithEvents FileOpenTimer As New Timer
Private FileEx As Modules.Filesystem.File Private FileEx As DigitalData.Modules.Filesystem.File
Private EnableWatching As Boolean = True Private EnableWatching As Boolean = True
' TODO: Hashes for checking if the opened file was modified externally ' TODO: Hashes for checking if the opened file was modified externally
@@ -53,7 +53,7 @@ Namespace DocumentResultList
Public Sub New(pLogConfig As LogConfig, pEnableWatching As Boolean) Public Sub New(pLogConfig As LogConfig, pEnableWatching As Boolean)
MyBase.New(pLogConfig) MyBase.New(pLogConfig)
FileEx = New Modules.Filesystem.File(pLogConfig) FileEx = New DigitalData.Modules.Filesystem.File(pLogConfig)
EnableWatching = pEnableWatching EnableWatching = pEnableWatching
End Sub End Sub

View File

@@ -164,37 +164,25 @@ Partial Class frmDocumentResultList
' '
'SplitContainerControl1 'SplitContainerControl1
' '
resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1")
Me.SplitContainerControl1.Collapsed = True Me.SplitContainerControl1.Collapsed = True
Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1")
Me.SplitContainerControl1.Name = "SplitContainerControl1" Me.SplitContainerControl1.Name = "SplitContainerControl1"
' '
'SplitContainerControl1.Panel1 'SplitContainerControl1.Panel1
' '
resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1) Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1)
resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
' '
'SplitContainerControl1.Panel2 'SplitContainerControl1.Panel2
' '
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 325 Me.SplitContainerControl1.SplitterPosition = 325
' '
'GridControl1 'GridControl1
' '
resources.ApplyResources(Me.GridControl1, "GridControl1") resources.ApplyResources(Me.GridControl1, "GridControl1")
Me.GridControl1.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControl1.EmbeddedNavigator.AccessibleDescription")
Me.GridControl1.EmbeddedNavigator.AccessibleName = resources.GetString("GridControl1.EmbeddedNavigator.AccessibleName")
Me.GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
Me.GridControl1.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
Me.GridControl1.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControl1.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
Me.GridControl1.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControl1.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
Me.GridControl1.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
Me.GridControl1.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControl1.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
Me.GridControl1.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl1.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
Me.GridControl1.EmbeddedNavigator.ToolTip = resources.GetString("GridControl1.EmbeddedNavigator.ToolTip")
Me.GridControl1.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl1.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
Me.GridControl1.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControl1.EmbeddedNavigator.ToolTipTitle")
Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.MenuManager = Me.RibbonControl Me.GridControl1.MenuManager = Me.RibbonControl
Me.GridControl1.Name = "GridControl1" Me.GridControl1.Name = "GridControl1"
@@ -207,7 +195,6 @@ Partial Class frmDocumentResultList
Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Gainsboro Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1})
resources.ApplyResources(Me.GridView1, "GridView1")
Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.GridControl = Me.GridControl1
Me.GridView1.Name = "GridView1" Me.GridView1.Name = "GridView1"
Me.GridView1.OptionsBehavior.Editable = False Me.GridView1.OptionsBehavior.Editable = False
@@ -220,9 +207,9 @@ Partial Class frmDocumentResultList
' '
'GridBand1 'GridBand1
' '
resources.ApplyResources(Me.GridBand1, "GridBand1")
Me.GridBand1.AppearanceHeader.Font = CType(resources.GetObject("GridBand1.AppearanceHeader.Font"), System.Drawing.Font) Me.GridBand1.AppearanceHeader.Font = CType(resources.GetObject("GridBand1.AppearanceHeader.Font"), System.Drawing.Font)
Me.GridBand1.AppearanceHeader.Options.UseFont = True Me.GridBand1.AppearanceHeader.Options.UseFont = True
resources.ApplyResources(Me.GridBand1, "GridBand1")
Me.GridBand1.OptionsBand.AllowHotTrack = False Me.GridBand1.OptionsBand.AllowHotTrack = False
Me.GridBand1.OptionsBand.AllowMove = False Me.GridBand1.OptionsBand.AllowMove = False
Me.GridBand1.OptionsBand.AllowPress = False Me.GridBand1.OptionsBand.AllowPress = False
@@ -231,15 +218,11 @@ Partial Class frmDocumentResultList
' '
'RibbonControl 'RibbonControl
' '
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
Me.RibbonControl.ExpandCollapseItem.Id = 0 Me.RibbonControl.ExpandCollapseItem.Id = 0
Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags")
Me.RibbonControl.Images = Me.SvgImageCollection1 Me.RibbonControl.Images = Me.SvgImageCollection1
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace}) Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace})
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.MaxItemId = 61 Me.RibbonControl.MaxItemId = 61
Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2}) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
@@ -256,30 +239,22 @@ Partial Class frmDocumentResultList
' '
'SwitchMainContainerHorizontal 'SwitchMainContainerHorizontal
' '
resources.ApplyResources(Me.SwitchMainContainerHorizontal, "SwitchMainContainerHorizontal")
Me.SwitchMainContainerHorizontal.BindableChecked = True Me.SwitchMainContainerHorizontal.BindableChecked = True
resources.ApplyResources(Me.SwitchMainContainerHorizontal, "SwitchMainContainerHorizontal")
Me.SwitchMainContainerHorizontal.Checked = True Me.SwitchMainContainerHorizontal.Checked = True
Me.SwitchMainContainerHorizontal.Id = 1 Me.SwitchMainContainerHorizontal.Id = 1
Me.SwitchMainContainerHorizontal.ImageOptions.ImageIndex = CType(resources.GetObject("SwitchMainContainerHorizontal.ImageOptions.ImageIndex"), Integer)
Me.SwitchMainContainerHorizontal.ImageOptions.LargeImageIndex = CType(resources.GetObject("SwitchMainContainerHorizontal.ImageOptions.LargeImageIndex"), Integer)
Me.SwitchMainContainerHorizontal.ImageOptions.SvgImage = CType(resources.GetObject("SwitchMainContainerHorizontal.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.SwitchMainContainerHorizontal.Name = "SwitchMainContainerHorizontal" Me.SwitchMainContainerHorizontal.Name = "SwitchMainContainerHorizontal"
' '
'SwitchDetailContainerHorizontal 'SwitchDetailContainerHorizontal
' '
resources.ApplyResources(Me.SwitchDetailContainerHorizontal, "SwitchDetailContainerHorizontal") resources.ApplyResources(Me.SwitchDetailContainerHorizontal, "SwitchDetailContainerHorizontal")
Me.SwitchDetailContainerHorizontal.Id = 2 Me.SwitchDetailContainerHorizontal.Id = 2
Me.SwitchDetailContainerHorizontal.ImageOptions.ImageIndex = CType(resources.GetObject("SwitchDetailContainerHorizontal.ImageOptions.ImageIndex"), Integer)
Me.SwitchDetailContainerHorizontal.ImageOptions.LargeImageIndex = CType(resources.GetObject("SwitchDetailContainerHorizontal.ImageOptions.LargeImageIndex"), Integer)
Me.SwitchDetailContainerHorizontal.ImageOptions.SvgImage = CType(resources.GetObject("SwitchDetailContainerHorizontal.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.SwitchDetailContainerHorizontal.Name = "SwitchDetailContainerHorizontal" Me.SwitchDetailContainerHorizontal.Name = "SwitchDetailContainerHorizontal"
' '
'BarButtonItemExportGrid1 'BarButtonItemExportGrid1
' '
resources.ApplyResources(Me.BarButtonItemExportGrid1, "BarButtonItemExportGrid1") resources.ApplyResources(Me.BarButtonItemExportGrid1, "BarButtonItemExportGrid1")
Me.BarButtonItemExportGrid1.Id = 3 Me.BarButtonItemExportGrid1.Id = 3
Me.BarButtonItemExportGrid1.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItemExportGrid1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItemExportGrid1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItemExportGrid1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItemExportGrid1.Name = "BarButtonItemExportGrid1" Me.BarButtonItemExportGrid1.Name = "BarButtonItemExportGrid1"
Me.BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing Me.BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
@@ -288,9 +263,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1") resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1")
Me.BarStaticItem1.Id = 7 Me.BarStaticItem1.Id = 7
Me.BarStaticItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarStaticItem1.ImageOptions.ImageIndex"), Integer)
Me.BarStaticItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImageIndex"), Integer)
Me.BarStaticItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarStaticItem1.Name = "BarStaticItem1" Me.BarStaticItem1.Name = "BarStaticItem1"
Me.BarStaticItem1.Tag = "{0} Ergebnisse" Me.BarStaticItem1.Tag = "{0} Ergebnisse"
' '
@@ -298,8 +270,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.labelResultCount, "labelResultCount") resources.ApplyResources(Me.labelResultCount, "labelResultCount")
Me.labelResultCount.Id = 8 Me.labelResultCount.Id = 8
Me.labelResultCount.ImageOptions.ImageIndex = CType(resources.GetObject("labelResultCount.ImageOptions.ImageIndex"), Integer)
Me.labelResultCount.ImageOptions.LargeImageIndex = CType(resources.GetObject("labelResultCount.ImageOptions.LargeImageIndex"), Integer)
Me.labelResultCount.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.insertpagecount Me.labelResultCount.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.insertpagecount
Me.labelResultCount.Name = "labelResultCount" Me.labelResultCount.Name = "labelResultCount"
Me.labelResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@@ -310,29 +280,22 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.BarButtonBack, "BarButtonBack") resources.ApplyResources(Me.BarButtonBack, "BarButtonBack")
Me.BarButtonBack.Id = 9 Me.BarButtonBack.Id = 9
Me.BarButtonBack.ImageOptions.Image = CType(resources.GetObject("BarButtonBack.ImageOptions.Image"), System.Drawing.Image) Me.BarButtonBack.ImageOptions.Image = CType(resources.GetObject("BarButtonBack.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonBack.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonBack.ImageOptions.ImageIndex"), Integer)
Me.BarButtonBack.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonBack.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonBack.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonBack.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonBack.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonBack.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonBack.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonBack.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonBack.Name = "BarButtonBack" Me.BarButtonBack.Name = "BarButtonBack"
' '
'BarButtonResetGridLayout 'BarButtonResetGridLayout
' '
resources.ApplyResources(Me.BarButtonResetGridLayout, "BarButtonResetGridLayout") resources.ApplyResources(Me.BarButtonResetGridLayout, "BarButtonResetGridLayout")
Me.BarButtonResetGridLayout.Id = 10 Me.BarButtonResetGridLayout.Id = 10
Me.BarButtonResetGridLayout.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonResetGridLayout.ImageOptions.ImageIndex"), Integer)
Me.BarButtonResetGridLayout.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonResetGridLayout.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonResetGridLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetGridLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonResetGridLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetGridLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonResetGridLayout.Name = "BarButtonResetGridLayout" Me.BarButtonResetGridLayout.Name = "BarButtonResetGridLayout"
Me.BarButtonResetGridLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing Me.BarButtonResetGridLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
' '
'labelCriticalError 'labelCriticalError
' '
resources.ApplyResources(Me.labelCriticalError, "labelCriticalError")
Me.labelCriticalError.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right Me.labelCriticalError.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
resources.ApplyResources(Me.labelCriticalError, "labelCriticalError")
Me.labelCriticalError.Id = 14 Me.labelCriticalError.Id = 14
Me.labelCriticalError.ImageOptions.ImageIndex = CType(resources.GetObject("labelCriticalError.ImageOptions.ImageIndex"), Integer)
Me.labelCriticalError.ImageOptions.LargeImageIndex = CType(resources.GetObject("labelCriticalError.ImageOptions.LargeImageIndex"), Integer)
Me.labelCriticalError.ImageOptions.SvgImage = CType(resources.GetObject("labelCriticalError.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.labelCriticalError.ImageOptions.SvgImage = CType(resources.GetObject("labelCriticalError.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.labelCriticalError.ItemAppearance.Normal.BackColor = System.Drawing.Color.White Me.labelCriticalError.ItemAppearance.Normal.BackColor = System.Drawing.Color.White
Me.labelCriticalError.ItemAppearance.Normal.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical Me.labelCriticalError.ItemAppearance.Normal.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical
@@ -344,11 +307,9 @@ Partial Class frmDocumentResultList
' '
'labelWarning 'labelWarning
' '
resources.ApplyResources(Me.labelWarning, "labelWarning")
Me.labelWarning.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right Me.labelWarning.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
resources.ApplyResources(Me.labelWarning, "labelWarning")
Me.labelWarning.Id = 15 Me.labelWarning.Id = 15
Me.labelWarning.ImageOptions.ImageIndex = CType(resources.GetObject("labelWarning.ImageOptions.ImageIndex"), Integer)
Me.labelWarning.ImageOptions.LargeImageIndex = CType(resources.GetObject("labelWarning.ImageOptions.LargeImageIndex"), Integer)
Me.labelWarning.ImageOptions.SvgImage = CType(resources.GetObject("labelWarning.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.labelWarning.ImageOptions.SvgImage = CType(resources.GetObject("labelWarning.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.labelWarning.ItemAppearance.Normal.BackColor = System.Drawing.Color.White Me.labelWarning.ItemAppearance.Normal.BackColor = System.Drawing.Color.White
Me.labelWarning.ItemAppearance.Normal.Options.UseBackColor = True Me.labelWarning.ItemAppearance.Normal.Options.UseBackColor = True
@@ -360,8 +321,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemFileOpen, "MenuItemFileOpen") resources.ApplyResources(Me.MenuItemFileOpen, "MenuItemFileOpen")
Me.MenuItemFileOpen.Id = 16 Me.MenuItemFileOpen.Id = 16
Me.MenuItemFileOpen.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemFileOpen.ImageOptions.ImageIndex"), Integer)
Me.MenuItemFileOpen.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemFileOpen.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemFileOpen.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.singlepageview Me.MenuItemFileOpen.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.singlepageview
Me.MenuItemFileOpen.Name = "MenuItemFileOpen" Me.MenuItemFileOpen.Name = "MenuItemFileOpen"
' '
@@ -369,8 +328,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemPropertiesIDB, "MenuItemPropertiesIDB") resources.ApplyResources(Me.MenuItemPropertiesIDB, "MenuItemPropertiesIDB")
Me.MenuItemPropertiesIDB.Id = 17 Me.MenuItemPropertiesIDB.Id = 17
Me.MenuItemPropertiesIDB.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemPropertiesIDB.ImageOptions.ImageIndex"), Integer)
Me.MenuItemPropertiesIDB.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemPropertiesIDB.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemPropertiesIDB.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemPropertiesIDB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.MenuItemPropertiesIDB.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemPropertiesIDB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.MenuItemPropertiesIDB.Name = "MenuItemPropertiesIDB" Me.MenuItemPropertiesIDB.Name = "MenuItemPropertiesIDB"
' '
@@ -378,8 +335,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemFolderOpen, "MenuItemFolderOpen") resources.ApplyResources(Me.MenuItemFolderOpen, "MenuItemFolderOpen")
Me.MenuItemFolderOpen.Id = 18 Me.MenuItemFolderOpen.Id = 18
Me.MenuItemFolderOpen.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemFolderOpen.ImageOptions.ImageIndex"), Integer)
Me.MenuItemFolderOpen.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemFolderOpen.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemFolderOpen.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemFolderOpen.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.MenuItemFolderOpen.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemFolderOpen.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.MenuItemFolderOpen.Name = "MenuItemFolderOpen" Me.MenuItemFolderOpen.Name = "MenuItemFolderOpen"
' '
@@ -387,8 +342,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemFilepathCopy, "MenuItemFilepathCopy") resources.ApplyResources(Me.MenuItemFilepathCopy, "MenuItemFilepathCopy")
Me.MenuItemFilepathCopy.Id = 19 Me.MenuItemFilepathCopy.Id = 19
Me.MenuItemFilepathCopy.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemFilepathCopy.ImageOptions.ImageIndex"), Integer)
Me.MenuItemFilepathCopy.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemFilepathCopy.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemFilepathCopy.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.copy Me.MenuItemFilepathCopy.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.copy
Me.MenuItemFilepathCopy.Name = "MenuItemFilepathCopy" Me.MenuItemFilepathCopy.Name = "MenuItemFilepathCopy"
' '
@@ -396,8 +349,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemFolderpathCopy, "MenuItemFolderpathCopy") resources.ApplyResources(Me.MenuItemFolderpathCopy, "MenuItemFolderpathCopy")
Me.MenuItemFolderpathCopy.Id = 20 Me.MenuItemFolderpathCopy.Id = 20
Me.MenuItemFolderpathCopy.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemFolderpathCopy.ImageOptions.ImageIndex"), Integer)
Me.MenuItemFolderpathCopy.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemFolderpathCopy.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemFolderpathCopy.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.open Me.MenuItemFolderpathCopy.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.open
Me.MenuItemFolderpathCopy.Name = "MenuItemFolderpathCopy" Me.MenuItemFolderpathCopy.Name = "MenuItemFolderpathCopy"
' '
@@ -405,8 +356,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemProperties, "MenuItemProperties") resources.ApplyResources(Me.MenuItemProperties, "MenuItemProperties")
Me.MenuItemProperties.Id = 26 Me.MenuItemProperties.Id = 26
Me.MenuItemProperties.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemProperties.ImageOptions.ImageIndex"), Integer)
Me.MenuItemProperties.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemProperties.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemProperties.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemProperties.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.MenuItemProperties.ImageOptions.SvgImage = CType(resources.GetObject("MenuItemProperties.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.MenuItemProperties.Name = "MenuItemProperties" Me.MenuItemProperties.Name = "MenuItemProperties"
' '
@@ -414,8 +363,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemsOpenFileZooFlow, "MenuItemsOpenFileZooFlow") resources.ApplyResources(Me.MenuItemsOpenFileZooFlow, "MenuItemsOpenFileZooFlow")
Me.MenuItemsOpenFileZooFlow.Id = 27 Me.MenuItemsOpenFileZooFlow.Id = 27
Me.MenuItemsOpenFileZooFlow.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemsOpenFileZooFlow.ImageOptions.ImageIndex"), Integer)
Me.MenuItemsOpenFileZooFlow.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemsOpenFileZooFlow.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemsOpenFileZooFlow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.singlepageview1 Me.MenuItemsOpenFileZooFlow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.singlepageview1
Me.MenuItemsOpenFileZooFlow.Name = "MenuItemsOpenFileZooFlow" Me.MenuItemsOpenFileZooFlow.Name = "MenuItemsOpenFileZooFlow"
' '
@@ -423,8 +370,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemPropertiesZooFlow, "MenuItemPropertiesZooFlow") resources.ApplyResources(Me.MenuItemPropertiesZooFlow, "MenuItemPropertiesZooFlow")
Me.MenuItemPropertiesZooFlow.Id = 28 Me.MenuItemPropertiesZooFlow.Id = 28
Me.MenuItemPropertiesZooFlow.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemPropertiesZooFlow.ImageOptions.ImageIndex"), Integer)
Me.MenuItemPropertiesZooFlow.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemPropertiesZooFlow.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemPropertiesZooFlow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.editcolors Me.MenuItemPropertiesZooFlow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.editcolors
Me.MenuItemPropertiesZooFlow.Name = "MenuItemPropertiesZooFlow" Me.MenuItemPropertiesZooFlow.Name = "MenuItemPropertiesZooFlow"
' '
@@ -432,8 +377,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.ButtonRefresh, "ButtonRefresh") resources.ApplyResources(Me.ButtonRefresh, "ButtonRefresh")
Me.ButtonRefresh.Id = 29 Me.ButtonRefresh.Id = 29
Me.ButtonRefresh.ImageOptions.ImageIndex = CType(resources.GetObject("ButtonRefresh.ImageOptions.ImageIndex"), Integer)
Me.ButtonRefresh.ImageOptions.LargeImageIndex = CType(resources.GetObject("ButtonRefresh.ImageOptions.LargeImageIndex"), Integer)
Me.ButtonRefresh.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.refreshallpivottable Me.ButtonRefresh.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.refreshallpivottable
Me.ButtonRefresh.Name = "ButtonRefresh" Me.ButtonRefresh.Name = "ButtonRefresh"
' '
@@ -441,53 +384,36 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
Me.BarButtonItem1.Id = 30 Me.BarButtonItem1.Id = 30
Me.BarButtonItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem1.Name = "BarButtonItem1" Me.BarButtonItem1.Name = "BarButtonItem1"
' '
'BarButtonItem2 'BarButtonItem2
' '
resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
Me.BarButtonItem2.Id = 31 Me.BarButtonItem2.Id = 31
Me.BarButtonItem2.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem2.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem2.Name = "BarButtonItem2" Me.BarButtonItem2.Name = "BarButtonItem2"
' '
'BarButtonItem3 'BarButtonItem3
' '
resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3") resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
Me.BarButtonItem3.Id = 32 Me.BarButtonItem3.Id = 32
Me.BarButtonItem3.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem3.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem3.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem3.Name = "BarButtonItem3" Me.BarButtonItem3.Name = "BarButtonItem3"
' '
'BarButtonItem4 'BarButtonItem4
' '
resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4") resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4")
Me.BarButtonItem4.Id = 33 Me.BarButtonItem4.Id = 33
Me.BarButtonItem4.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem4.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem4.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem4.Name = "BarButtonItem4" Me.BarButtonItem4.Name = "BarButtonItem4"
' '
'BarButtonItem5 'BarButtonItem5
' '
resources.ApplyResources(Me.BarButtonItem5, "BarButtonItem5") resources.ApplyResources(Me.BarButtonItem5, "BarButtonItem5")
Me.BarButtonItem5.Id = 34 Me.BarButtonItem5.Id = 34
Me.BarButtonItem5.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem5.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem5.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem5.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem5.Name = "BarButtonItem5" Me.BarButtonItem5.Name = "BarButtonItem5"
' '
'MenuItemStartAdhocWorkflow 'MenuItemStartAdhocWorkflow
' '
resources.ApplyResources(Me.MenuItemStartAdhocWorkflow, "MenuItemStartAdhocWorkflow") resources.ApplyResources(Me.MenuItemStartAdhocWorkflow, "MenuItemStartAdhocWorkflow")
Me.MenuItemStartAdhocWorkflow.Id = 36 Me.MenuItemStartAdhocWorkflow.Id = 36
Me.MenuItemStartAdhocWorkflow.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemStartAdhocWorkflow.ImageOptions.ImageIndex"), Integer)
Me.MenuItemStartAdhocWorkflow.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemStartAdhocWorkflow.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemStartAdhocWorkflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_transition Me.MenuItemStartAdhocWorkflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_transition
Me.MenuItemStartAdhocWorkflow.Name = "MenuItemStartAdhocWorkflow" Me.MenuItemStartAdhocWorkflow.Name = "MenuItemStartAdhocWorkflow"
' '
@@ -495,8 +421,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemCheckInFile, "MenuItemCheckInFile") resources.ApplyResources(Me.MenuItemCheckInFile, "MenuItemCheckInFile")
Me.MenuItemCheckInFile.Id = 37 Me.MenuItemCheckInFile.Id = 37
Me.MenuItemCheckInFile.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemCheckInFile.ImageOptions.ImageIndex"), Integer)
Me.MenuItemCheckInFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemCheckInFile.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemCheckInFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.security_unlock Me.MenuItemCheckInFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.security_unlock
Me.MenuItemCheckInFile.Name = "MenuItemCheckInFile" Me.MenuItemCheckInFile.Name = "MenuItemCheckInFile"
' '
@@ -504,8 +428,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemCheckOutFile, "MenuItemCheckOutFile") resources.ApplyResources(Me.MenuItemCheckOutFile, "MenuItemCheckOutFile")
Me.MenuItemCheckOutFile.Id = 38 Me.MenuItemCheckOutFile.Id = 38
Me.MenuItemCheckOutFile.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemCheckOutFile.ImageOptions.ImageIndex"), Integer)
Me.MenuItemCheckOutFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemCheckOutFile.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemCheckOutFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources._private Me.MenuItemCheckOutFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources._private
Me.MenuItemCheckOutFile.Name = "MenuItemCheckOutFile" Me.MenuItemCheckOutFile.Name = "MenuItemCheckOutFile"
' '
@@ -513,8 +435,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemVersionFile, "MenuItemVersionFile") resources.ApplyResources(Me.MenuItemVersionFile, "MenuItemVersionFile")
Me.MenuItemVersionFile.Id = 39 Me.MenuItemVersionFile.Id = 39
Me.MenuItemVersionFile.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemVersionFile.ImageOptions.ImageIndex"), Integer)
Me.MenuItemVersionFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemVersionFile.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemVersionFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.enablescrolling Me.MenuItemVersionFile.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.enablescrolling
Me.MenuItemVersionFile.Name = "MenuItemVersionFile" Me.MenuItemVersionFile.Name = "MenuItemVersionFile"
' '
@@ -522,8 +442,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.chkGridShowQuickfilter, "chkGridShowQuickfilter") resources.ApplyResources(Me.chkGridShowQuickfilter, "chkGridShowQuickfilter")
Me.chkGridShowQuickfilter.Id = 40 Me.chkGridShowQuickfilter.Id = 40
Me.chkGridShowQuickfilter.ImageOptions.ImageIndex = CType(resources.GetObject("chkGridShowQuickfilter.ImageOptions.ImageIndex"), Integer)
Me.chkGridShowQuickfilter.ImageOptions.LargeImageIndex = CType(resources.GetObject("chkGridShowQuickfilter.ImageOptions.LargeImageIndex"), Integer)
Me.chkGridShowQuickfilter.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.filterquery Me.chkGridShowQuickfilter.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.filterquery
Me.chkGridShowQuickfilter.Name = "chkGridShowQuickfilter" Me.chkGridShowQuickfilter.Name = "chkGridShowQuickfilter"
' '
@@ -531,8 +449,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.chkGridShowGrouping, "chkGridShowGrouping") resources.ApplyResources(Me.chkGridShowGrouping, "chkGridShowGrouping")
Me.chkGridShowGrouping.Id = 41 Me.chkGridShowGrouping.Id = 41
Me.chkGridShowGrouping.ImageOptions.ImageIndex = CType(resources.GetObject("chkGridShowGrouping.ImageOptions.ImageIndex"), Integer)
Me.chkGridShowGrouping.ImageOptions.LargeImageIndex = CType(resources.GetObject("chkGridShowGrouping.ImageOptions.LargeImageIndex"), Integer)
Me.chkGridShowGrouping.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.groupheader Me.chkGridShowGrouping.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.groupheader
Me.chkGridShowGrouping.Name = "chkGridShowGrouping" Me.chkGridShowGrouping.Name = "chkGridShowGrouping"
' '
@@ -540,8 +456,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.chkGridShowTitle, "chkGridShowTitle") resources.ApplyResources(Me.chkGridShowTitle, "chkGridShowTitle")
Me.chkGridShowTitle.Id = 42 Me.chkGridShowTitle.Id = 42
Me.chkGridShowTitle.ImageOptions.ImageIndex = CType(resources.GetObject("chkGridShowTitle.ImageOptions.ImageIndex"), Integer)
Me.chkGridShowTitle.ImageOptions.LargeImageIndex = CType(resources.GetObject("chkGridShowTitle.ImageOptions.LargeImageIndex"), Integer)
Me.chkGridShowTitle.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.title Me.chkGridShowTitle.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.title
Me.chkGridShowTitle.Name = "chkGridShowTitle" Me.chkGridShowTitle.Name = "chkGridShowTitle"
' '
@@ -549,8 +463,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.MenuItemSaveProperties, "MenuItemSaveProperties") resources.ApplyResources(Me.MenuItemSaveProperties, "MenuItemSaveProperties")
Me.MenuItemSaveProperties.Id = 43 Me.MenuItemSaveProperties.Id = 43
Me.MenuItemSaveProperties.ImageOptions.ImageIndex = CType(resources.GetObject("MenuItemSaveProperties.ImageOptions.ImageIndex"), Integer)
Me.MenuItemSaveProperties.ImageOptions.LargeImageIndex = CType(resources.GetObject("MenuItemSaveProperties.ImageOptions.LargeImageIndex"), Integer)
Me.MenuItemSaveProperties.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save1 Me.MenuItemSaveProperties.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save1
Me.MenuItemSaveProperties.Name = "MenuItemSaveProperties" Me.MenuItemSaveProperties.Name = "MenuItemSaveProperties"
' '
@@ -558,8 +470,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11") resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11")
Me.BarButtonItem11.Id = 44 Me.BarButtonItem11.Id = 44
Me.BarButtonItem11.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem11.ImageOptions.ImageIndex"), Integer)
Me.BarButtonItem11.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem11.ImageOptions.LargeImageIndex"), Integer)
Me.BarButtonItem11.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.columnheaders Me.BarButtonItem11.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.columnheaders
Me.BarButtonItem11.Name = "BarButtonItem11" Me.BarButtonItem11.Name = "BarButtonItem11"
' '
@@ -568,9 +478,6 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.BarEditItemGridFontSize, "BarEditItemGridFontSize") resources.ApplyResources(Me.BarEditItemGridFontSize, "BarEditItemGridFontSize")
Me.BarEditItemGridFontSize.Edit = Me.cmbGridFontSize Me.BarEditItemGridFontSize.Edit = Me.cmbGridFontSize
Me.BarEditItemGridFontSize.Id = 52 Me.BarEditItemGridFontSize.Id = 52
Me.BarEditItemGridFontSize.ImageOptions.ImageIndex = CType(resources.GetObject("BarEditItemGridFontSize.ImageOptions.ImageIndex"), Integer)
Me.BarEditItemGridFontSize.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarEditItemGridFontSize.ImageOptions.LargeImageIndex"), Integer)
Me.BarEditItemGridFontSize.ImageOptions.SvgImage = CType(resources.GetObject("BarEditItemGridFontSize.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarEditItemGridFontSize.Name = "BarEditItemGridFontSize" Me.BarEditItemGridFontSize.Name = "BarEditItemGridFontSize"
' '
'cmbGridFontSize 'cmbGridFontSize
@@ -583,8 +490,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.btnSaveWorkspace, "btnSaveWorkspace") resources.ApplyResources(Me.btnSaveWorkspace, "btnSaveWorkspace")
Me.btnSaveWorkspace.Id = 54 Me.btnSaveWorkspace.Id = 54
Me.btnSaveWorkspace.ImageOptions.ImageIndex = CType(resources.GetObject("btnSaveWorkspace.ImageOptions.ImageIndex"), Integer)
Me.btnSaveWorkspace.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSaveWorkspace.ImageOptions.LargeImageIndex"), Integer)
Me.btnSaveWorkspace.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save3 Me.btnSaveWorkspace.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save3
Me.btnSaveWorkspace.Name = "btnSaveWorkspace" Me.btnSaveWorkspace.Name = "btnSaveWorkspace"
' '
@@ -592,8 +497,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1") resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1")
Me.BarWorkspaceMenuItem1.Id = 55 Me.BarWorkspaceMenuItem1.Id = 55
Me.BarWorkspaceMenuItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarWorkspaceMenuItem1.ImageOptions.ImageIndex"), Integer)
Me.BarWorkspaceMenuItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarWorkspaceMenuItem1.ImageOptions.LargeImageIndex"), Integer)
Me.BarWorkspaceMenuItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_localization Me.BarWorkspaceMenuItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_localization
Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1" Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1"
Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1 Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1
@@ -608,8 +511,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.btnSaveWorkspaceAs, "btnSaveWorkspaceAs") resources.ApplyResources(Me.btnSaveWorkspaceAs, "btnSaveWorkspaceAs")
Me.btnSaveWorkspaceAs.Id = 56 Me.btnSaveWorkspaceAs.Id = 56
Me.btnSaveWorkspaceAs.ImageOptions.ImageIndex = CType(resources.GetObject("btnSaveWorkspaceAs.ImageOptions.ImageIndex"), Integer)
Me.btnSaveWorkspaceAs.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSaveWorkspaceAs.ImageOptions.LargeImageIndex"), Integer)
Me.btnSaveWorkspaceAs.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.saveas Me.btnSaveWorkspaceAs.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.saveas
Me.btnSaveWorkspaceAs.Name = "btnSaveWorkspaceAs" Me.btnSaveWorkspaceAs.Name = "btnSaveWorkspaceAs"
' '
@@ -617,8 +518,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.btnSaveAsMySearch, "btnSaveAsMySearch") resources.ApplyResources(Me.btnSaveAsMySearch, "btnSaveAsMySearch")
Me.btnSaveAsMySearch.Id = 57 Me.btnSaveAsMySearch.Id = 57
Me.btnSaveAsMySearch.ImageOptions.ImageIndex = CType(resources.GetObject("btnSaveAsMySearch.ImageOptions.ImageIndex"), Integer)
Me.btnSaveAsMySearch.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSaveAsMySearch.ImageOptions.LargeImageIndex"), Integer)
Me.btnSaveAsMySearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_security_permission_action Me.btnSaveAsMySearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_security_permission_action
Me.btnSaveAsMySearch.Name = "btnSaveAsMySearch" Me.btnSaveAsMySearch.Name = "btnSaveAsMySearch"
' '
@@ -626,8 +525,6 @@ Partial Class frmDocumentResultList
' '
resources.ApplyResources(Me.lblCurrentWorkspace, "lblCurrentWorkspace") resources.ApplyResources(Me.lblCurrentWorkspace, "lblCurrentWorkspace")
Me.lblCurrentWorkspace.Id = 60 Me.lblCurrentWorkspace.Id = 60
Me.lblCurrentWorkspace.ImageOptions.ImageIndex = CType(resources.GetObject("lblCurrentWorkspace.ImageOptions.ImageIndex"), Integer)
Me.lblCurrentWorkspace.ImageOptions.LargeImageIndex = CType(resources.GetObject("lblCurrentWorkspace.ImageOptions.LargeImageIndex"), Integer)
Me.lblCurrentWorkspace.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.business_world2 Me.lblCurrentWorkspace.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.business_world2
Me.lblCurrentWorkspace.Name = "lblCurrentWorkspace" Me.lblCurrentWorkspace.Name = "lblCurrentWorkspace"
Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
@@ -758,47 +655,35 @@ Partial Class frmDocumentResultList
' '
'RibbonStatusBar 'RibbonStatusBar
' '
resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount) Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount)
Me.RibbonStatusBar.ItemLinks.Add(Me.labelCriticalError) Me.RibbonStatusBar.ItemLinks.Add(Me.labelCriticalError)
Me.RibbonStatusBar.ItemLinks.Add(Me.labelWarning) Me.RibbonStatusBar.ItemLinks.Add(Me.labelWarning)
Me.RibbonStatusBar.ItemLinks.Add(Me.lblCurrentWorkspace) Me.RibbonStatusBar.ItemLinks.Add(Me.lblCurrentWorkspace)
resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Name = "RibbonStatusBar"
Me.RibbonStatusBar.Ribbon = Me.RibbonControl Me.RibbonStatusBar.Ribbon = Me.RibbonControl
' '
'SplitContainerControl2 'SplitContainerControl2
' '
resources.ApplyResources(Me.SplitContainerControl2, "SplitContainerControl2")
Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
resources.ApplyResources(Me.SplitContainerControl2, "SplitContainerControl2")
Me.SplitContainerControl2.Horizontal = False Me.SplitContainerControl2.Horizontal = False
Me.SplitContainerControl2.Name = "SplitContainerControl2" Me.SplitContainerControl2.Name = "SplitContainerControl2"
' '
'SplitContainerControl2.Panel1 'SplitContainerControl2.Panel1
' '
resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2) Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2)
resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
' '
'SplitContainerControl2.Panel2 'SplitContainerControl2.Panel2
' '
resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3)
resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
Me.SplitContainerControl2.SplitterPosition = 223 Me.SplitContainerControl2.SplitterPosition = 223
' '
'GridControl2 'GridControl2
' '
resources.ApplyResources(Me.GridControl2, "GridControl2") resources.ApplyResources(Me.GridControl2, "GridControl2")
Me.GridControl2.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControl2.EmbeddedNavigator.AccessibleDescription")
Me.GridControl2.EmbeddedNavigator.AccessibleName = resources.GetString("GridControl2.EmbeddedNavigator.AccessibleName")
Me.GridControl2.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControl2.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
Me.GridControl2.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControl2.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
Me.GridControl2.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControl2.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
Me.GridControl2.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControl2.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
Me.GridControl2.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl2.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
Me.GridControl2.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControl2.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
Me.GridControl2.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl2.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
Me.GridControl2.EmbeddedNavigator.ToolTip = resources.GetString("GridControl2.EmbeddedNavigator.ToolTip")
Me.GridControl2.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl2.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
Me.GridControl2.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControl2.EmbeddedNavigator.ToolTipTitle")
Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.MainView = Me.GridView2
Me.GridControl2.MenuManager = Me.RibbonControl Me.GridControl2.MenuManager = Me.RibbonControl
Me.GridControl2.Name = "GridControl2" Me.GridControl2.Name = "GridControl2"
@@ -809,7 +694,6 @@ Partial Class frmDocumentResultList
Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2}) Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2})
resources.ApplyResources(Me.GridView2, "GridView2")
Me.GridView2.GridControl = Me.GridControl2 Me.GridView2.GridControl = Me.GridControl2
Me.GridView2.Name = "GridView2" Me.GridView2.Name = "GridView2"
Me.GridView2.OptionsView.EnableAppearanceEvenRow = True Me.GridView2.OptionsView.EnableAppearanceEvenRow = True
@@ -817,9 +701,9 @@ Partial Class frmDocumentResultList
' '
'GridBand2 'GridBand2
' '
resources.ApplyResources(Me.GridBand2, "GridBand2")
Me.GridBand2.AppearanceHeader.Font = CType(resources.GetObject("GridBand2.AppearanceHeader.Font"), System.Drawing.Font) Me.GridBand2.AppearanceHeader.Font = CType(resources.GetObject("GridBand2.AppearanceHeader.Font"), System.Drawing.Font)
Me.GridBand2.AppearanceHeader.Options.UseFont = True Me.GridBand2.AppearanceHeader.Options.UseFont = True
resources.ApplyResources(Me.GridBand2, "GridBand2")
Me.GridBand2.OptionsBand.AllowHotTrack = False Me.GridBand2.OptionsBand.AllowHotTrack = False
Me.GridBand2.OptionsBand.AllowMove = False Me.GridBand2.OptionsBand.AllowMove = False
Me.GridBand2.OptionsBand.AllowPress = False Me.GridBand2.OptionsBand.AllowPress = False
@@ -829,18 +713,6 @@ Partial Class frmDocumentResultList
'GridControl3 'GridControl3
' '
resources.ApplyResources(Me.GridControl3, "GridControl3") resources.ApplyResources(Me.GridControl3, "GridControl3")
Me.GridControl3.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControl3.EmbeddedNavigator.AccessibleDescription")
Me.GridControl3.EmbeddedNavigator.AccessibleName = resources.GetString("GridControl3.EmbeddedNavigator.AccessibleName")
Me.GridControl3.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControl3.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
Me.GridControl3.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControl3.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
Me.GridControl3.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControl3.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
Me.GridControl3.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControl3.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
Me.GridControl3.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl3.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
Me.GridControl3.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControl3.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
Me.GridControl3.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl3.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
Me.GridControl3.EmbeddedNavigator.ToolTip = resources.GetString("GridControl3.EmbeddedNavigator.ToolTip")
Me.GridControl3.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl3.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
Me.GridControl3.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControl3.EmbeddedNavigator.ToolTipTitle")
Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MainView = Me.GridView3
Me.GridControl3.MenuManager = Me.RibbonControl Me.GridControl3.MenuManager = Me.RibbonControl
Me.GridControl3.Name = "GridControl3" Me.GridControl3.Name = "GridControl3"
@@ -851,7 +723,6 @@ Partial Class frmDocumentResultList
Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView3.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand3}) Me.GridView3.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand3})
resources.ApplyResources(Me.GridView3, "GridView3")
Me.GridView3.GridControl = Me.GridControl3 Me.GridView3.GridControl = Me.GridControl3
Me.GridView3.Name = "GridView3" Me.GridView3.Name = "GridView3"
Me.GridView3.OptionsView.EnableAppearanceEvenRow = True Me.GridView3.OptionsView.EnableAppearanceEvenRow = True
@@ -859,9 +730,9 @@ Partial Class frmDocumentResultList
' '
'GridBand3 'GridBand3
' '
resources.ApplyResources(Me.GridBand3, "GridBand3")
Me.GridBand3.AppearanceHeader.Font = CType(resources.GetObject("GridBand3.AppearanceHeader.Font"), System.Drawing.Font) Me.GridBand3.AppearanceHeader.Font = CType(resources.GetObject("GridBand3.AppearanceHeader.Font"), System.Drawing.Font)
Me.GridBand3.AppearanceHeader.Options.UseFont = True Me.GridBand3.AppearanceHeader.Options.UseFont = True
resources.ApplyResources(Me.GridBand3, "GridBand3")
Me.GridBand3.OptionsBand.AllowHotTrack = False Me.GridBand3.OptionsBand.AllowHotTrack = False
Me.GridBand3.OptionsBand.AllowMove = False Me.GridBand3.OptionsBand.AllowMove = False
Me.GridBand3.OptionsBand.AllowPress = False Me.GridBand3.OptionsBand.AllowPress = False
@@ -876,7 +747,6 @@ Partial Class frmDocumentResultList
' '
'XtraSaveFileDialog 'XtraSaveFileDialog
' '
resources.ApplyResources(Me.XtraSaveFileDialog, "XtraSaveFileDialog")
Me.XtraSaveFileDialog.FileName = "XtraSaveFileDialog1" Me.XtraSaveFileDialog.FileName = "XtraSaveFileDialog1"
' '
'RibbonPageGroup6 'RibbonPageGroup6
@@ -892,46 +762,46 @@ Partial Class frmDocumentResultList
' '
'DockPanelFileList 'DockPanelFileList
' '
resources.ApplyResources(Me.DockPanelFileList, "DockPanelFileList")
Me.DockPanelFileList.Controls.Add(Me.DockPanel2_Container) Me.DockPanelFileList.Controls.Add(Me.DockPanel2_Container)
Me.DockPanelFileList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanelFileList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
Me.DockPanelFileList.ID = New System.Guid("1839997d-1d60-4497-acbb-0a49e64d6376") Me.DockPanelFileList.ID = New System.Guid("1839997d-1d60-4497-acbb-0a49e64d6376")
resources.ApplyResources(Me.DockPanelFileList, "DockPanelFileList")
Me.DockPanelFileList.Name = "DockPanelFileList" Me.DockPanelFileList.Name = "DockPanelFileList"
Me.DockPanelFileList.Options.ShowCloseButton = False Me.DockPanelFileList.Options.ShowCloseButton = False
Me.DockPanelFileList.OriginalSize = New System.Drawing.Size(590, 200) Me.DockPanelFileList.OriginalSize = New System.Drawing.Size(590, 200)
' '
'DockPanel2_Container 'DockPanel2_Container
' '
resources.ApplyResources(Me.DockPanel2_Container, "DockPanel2_Container")
Me.DockPanel2_Container.Controls.Add(Me.SplitContainerControl1) Me.DockPanel2_Container.Controls.Add(Me.SplitContainerControl1)
resources.ApplyResources(Me.DockPanel2_Container, "DockPanel2_Container")
Me.DockPanel2_Container.Name = "DockPanel2_Container" Me.DockPanel2_Container.Name = "DockPanel2_Container"
' '
'panelContainerStatus 'panelContainerStatus
' '
resources.ApplyResources(Me.panelContainerStatus, "panelContainerStatus")
Me.panelContainerStatus.ActiveChild = Me.DockPanelMetadata Me.panelContainerStatus.ActiveChild = Me.DockPanelMetadata
Me.panelContainerStatus.Controls.Add(Me.DockPanelMetadata) Me.panelContainerStatus.Controls.Add(Me.DockPanelMetadata)
Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus) Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus)
Me.panelContainerStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right Me.panelContainerStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
Me.panelContainerStatus.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe") Me.panelContainerStatus.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe")
resources.ApplyResources(Me.panelContainerStatus, "panelContainerStatus")
Me.panelContainerStatus.Name = "panelContainerStatus" Me.panelContainerStatus.Name = "panelContainerStatus"
Me.panelContainerStatus.OriginalSize = New System.Drawing.Size(275, 200) Me.panelContainerStatus.OriginalSize = New System.Drawing.Size(275, 200)
Me.panelContainerStatus.Tabbed = True Me.panelContainerStatus.Tabbed = True
' '
'DockPanelMetadata 'DockPanelMetadata
' '
resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata")
Me.DockPanelMetadata.Controls.Add(Me.DockPanel3_Container) Me.DockPanelMetadata.Controls.Add(Me.DockPanel3_Container)
Me.DockPanelMetadata.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill Me.DockPanelMetadata.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanelMetadata.ID = New System.Guid("a7688cec-f13e-448b-82cf-a6bb020fb3f7") Me.DockPanelMetadata.ID = New System.Guid("a7688cec-f13e-448b-82cf-a6bb020fb3f7")
resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata")
Me.DockPanelMetadata.Name = "DockPanelMetadata" Me.DockPanelMetadata.Name = "DockPanelMetadata"
Me.DockPanelMetadata.Options.ShowCloseButton = False Me.DockPanelMetadata.Options.ShowCloseButton = False
Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 434) Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 434)
' '
'DockPanel3_Container 'DockPanel3_Container
' '
resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container")
Me.DockPanel3_Container.Controls.Add(Me.CtrlObjectPropertyDialog) Me.DockPanel3_Container.Controls.Add(Me.CtrlObjectPropertyDialog)
resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container")
Me.DockPanel3_Container.Name = "DockPanel3_Container" Me.DockPanel3_Container.Name = "DockPanel3_Container"
' '
'CtrlObjectPropertyDialog 'CtrlObjectPropertyDialog
@@ -941,26 +811,26 @@ Partial Class frmDocumentResultList
' '
'DockPanelStatus 'DockPanelStatus
' '
resources.ApplyResources(Me.DockPanelStatus, "DockPanelStatus")
Me.DockPanelStatus.Controls.Add(Me.ControlContainer1) Me.DockPanelStatus.Controls.Add(Me.ControlContainer1)
Me.DockPanelStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill Me.DockPanelStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanelStatus.FloatVertical = True Me.DockPanelStatus.FloatVertical = True
Me.DockPanelStatus.ID = New System.Guid("ef61c6cb-3dbd-4dd5-9df0-9d331a859d3d") Me.DockPanelStatus.ID = New System.Guid("ef61c6cb-3dbd-4dd5-9df0-9d331a859d3d")
resources.ApplyResources(Me.DockPanelStatus, "DockPanelStatus")
Me.DockPanelStatus.Name = "DockPanelStatus" Me.DockPanelStatus.Name = "DockPanelStatus"
Me.DockPanelStatus.Options.ShowCloseButton = False Me.DockPanelStatus.Options.ShowCloseButton = False
Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 434) Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 434)
' '
'ControlContainer1 'ControlContainer1
' '
resources.ApplyResources(Me.ControlContainer1, "ControlContainer1")
Me.ControlContainer1.Controls.Add(Me.LayoutControl1) Me.ControlContainer1.Controls.Add(Me.LayoutControl1)
resources.ApplyResources(Me.ControlContainer1, "ControlContainer1")
Me.ControlContainer1.Name = "ControlContainer1" Me.ControlContainer1.Name = "ControlContainer1"
' '
'LayoutControl1 'LayoutControl1
' '
resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
Me.LayoutControl1.Controls.Add(Me.txtCheckedOutWho) Me.LayoutControl1.Controls.Add(Me.txtCheckedOutWho)
Me.LayoutControl1.Controls.Add(Me.dateCheckedOutWhen) Me.LayoutControl1.Controls.Add(Me.dateCheckedOutWhen)
resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Name = "LayoutControl1"
Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 325, 650, 400) Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 325, 650, 400)
Me.LayoutControl1.Root = Me.Root Me.LayoutControl1.Root = Me.Root
@@ -985,7 +855,6 @@ Partial Class frmDocumentResultList
' '
'Root 'Root
' '
resources.ApplyResources(Me.Root, "Root")
Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
Me.Root.GroupBordersVisible = False Me.Root.GroupBordersVisible = False
Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.EmptySpaceItem1}) Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.EmptySpaceItem1})
@@ -995,33 +864,32 @@ Partial Class frmDocumentResultList
' '
'LayoutControlGroup1 'LayoutControlGroup1
' '
resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2}) Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2})
Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0)
Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
Me.LayoutControlGroup1.Size = New System.Drawing.Size(248, 93) Me.LayoutControlGroup1.Size = New System.Drawing.Size(248, 93)
resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
' '
'LayoutControlItem1 'LayoutControlItem1
' '
resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
Me.LayoutControlItem1.Control = Me.txtCheckedOutWho Me.LayoutControlItem1.Control = Me.txtCheckedOutWho
Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Name = "LayoutControlItem1"
Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24) Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24)
resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13)
' '
'LayoutControlItem2 'LayoutControlItem2
' '
resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
Me.LayoutControlItem2.Control = Me.dateCheckedOutWhen Me.LayoutControlItem2.Control = Me.dateCheckedOutWhen
Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 24)
Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Name = "LayoutControlItem2"
Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24) Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24)
resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13)
' '
'EmptySpaceItem1 'EmptySpaceItem1
' '
resources.ApplyResources(Me.EmptySpaceItem1, "EmptySpaceItem1")
Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.AllowHotTrack = False
Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 93) Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 93)
Me.EmptySpaceItem1.Name = "EmptySpaceItem1" Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
@@ -1030,24 +898,24 @@ Partial Class frmDocumentResultList
' '
'DockPanelPreview 'DockPanelPreview
' '
resources.ApplyResources(Me.DockPanelPreview, "DockPanelPreview")
Me.DockPanelPreview.Controls.Add(Me.DockPanel1_Container) Me.DockPanelPreview.Controls.Add(Me.DockPanel1_Container)
Me.DockPanelPreview.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill Me.DockPanelPreview.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanelPreview.ID = New System.Guid("6e5335e5-ba54-49c1-81b3-f174ea4e59ca") Me.DockPanelPreview.ID = New System.Guid("6e5335e5-ba54-49c1-81b3-f174ea4e59ca")
resources.ApplyResources(Me.DockPanelPreview, "DockPanelPreview")
Me.DockPanelPreview.Name = "DockPanelPreview" Me.DockPanelPreview.Name = "DockPanelPreview"
Me.DockPanelPreview.Options.ShowCloseButton = False Me.DockPanelPreview.Options.ShowCloseButton = False
Me.DockPanelPreview.OriginalSize = New System.Drawing.Size(324, 200) Me.DockPanelPreview.OriginalSize = New System.Drawing.Size(324, 200)
' '
'DockPanel1_Container 'DockPanel1_Container
' '
resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container")
Me.DockPanel1_Container.Controls.Add(Me.DocumentViewer1) Me.DockPanel1_Container.Controls.Add(Me.DocumentViewer1)
resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container")
Me.DockPanel1_Container.Name = "DockPanel1_Container" Me.DockPanel1_Container.Name = "DockPanel1_Container"
' '
'frmDocumentResultList 'frmDocumentResultList
' '
resources.ApplyResources(Me, "$this")
Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.DockPanelPreview) Me.Controls.Add(Me.DockPanelPreview)
Me.Controls.Add(Me.panelContainerStatus) Me.Controls.Add(Me.panelContainerStatus)

File diff suppressed because it is too large Load Diff

View File

@@ -33,7 +33,7 @@ Public Class frmDocumentResultList
Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
' Helper Classes ' Helper Classes
Private Client As Client Private EDMI_API_Client As Client
Private Documentloader As Loader Private Documentloader As Loader
Private ControlManager As AttributeControls Private ControlManager As AttributeControls
Private CheckoutManager As CheckInOut Private CheckoutManager As CheckInOut
@@ -168,7 +168,7 @@ Public Class frmDocumentResultList
LanguageEx.LogApplicationLanguage(Logger) LanguageEx.LogApplicationLanguage(Logger)
Documentloader = New Loader(LogConfig, OperationMode, Client, Environment.User) Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User)
If OperationMode = OperationMode.NoAppServer Then If OperationMode = OperationMode.NoAppServer Then
Watcher = New Watcher(LogConfig, pEnableWatching:=False) Watcher = New Watcher(LogConfig, pEnableWatching:=False)
@@ -219,7 +219,7 @@ Public Class frmDocumentResultList
RibbonPageGroup_Navigation.Visible = Params.ShowBackNavigation RibbonPageGroup_Navigation.Visible = Params.ShowBackNavigation
If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
CtrlObjectPropertyDialog.Initialize(LogConfig, Me, Client, Environment) CtrlObjectPropertyDialog.Initialize(LogConfig, Me, EDMI_API_Client, Environment)
CtrlObjectPropertyDialog.Hide() CtrlObjectPropertyDialog.Hide()
SwitchMainContainerHorizontal.Visibility = BarItemVisibility.Never SwitchMainContainerHorizontal.Visibility = BarItemVisibility.Never
SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never
@@ -419,7 +419,7 @@ Public Class frmDocumentResultList
#Region "Watcher" #Region "Watcher"
Public Async Sub Watcher_FileOpened(sender As Object, e As DocumentResultList.Watcher.FileOpenedArgs) Handles Watcher.FileOpened Public Async Sub Watcher_FileOpened(sender As Object, e As DocumentResultList.Watcher.FileOpenedArgs) Handles Watcher.FileOpened
Await Client.SetObjectStateAsync(e.File.Document.Id, OBJECT_STATE_FILE_OPENED, New Options.SetObjectStateOptions With { Await EDMI_API_Client.SetObjectStateAsync(e.File.Document.Id, OBJECT_STATE_FILE_OPENED, New Options.SetObjectStateOptions With {
.Language = Environment.User.Language, .Language = Environment.User.Language,
.Username = Environment.User.UserName .Username = Environment.User.UserName
}) })
@@ -430,7 +430,7 @@ Public Class frmDocumentResultList
Dim oDoctype As GlobalStateDoctype = Nothing Dim oDoctype As GlobalStateDoctype = Nothing
If e.File.Document.DocumentType IsNot Nothing Then If e.File.Document.DocumentType IsNot Nothing Then
oDoctype = Client.ClientConfig.DocumentTypes. oDoctype = EDMI_API_Client.ClientConfig.DocumentTypes.
Where(Function(doctype) doctype.Name = e.File.Document.DocumentType). Where(Function(doctype) doctype.Name = e.File.Document.DocumentType).
FirstOrDefault() FirstOrDefault()
End If End If
@@ -477,7 +477,7 @@ Public Class frmDocumentResultList
Private Async Function Watcher_UpdateFile(pFile As DocumentResultList.Watcher.OpenFile, pCreateNewVersion As Boolean) As Task Private Async Function Watcher_UpdateFile(pFile As DocumentResultList.Watcher.OpenFile, pCreateNewVersion As Boolean) As Task
Dim oFileInfo As New FileInfo(pFile.FilePath) Dim oFileInfo As New FileInfo(pFile.FilePath)
Dim oDisplayName As String = pFile.Document.DisplayFileName Dim oDisplayName As String = pFile.Document.DisplayFileName
Dim oObjectId = Await Client.UpdateFileAsync(pFile.Document.Id, pFile.FilePath, New Options.UpdateFileOptions With { Dim oObjectId = Await EDMI_API_Client.UpdateFileAsync(pFile.Document.Id, pFile.FilePath, New Options.UpdateFileOptions With {
.CreateNewFileVersion = pCreateNewVersion, .CreateNewFileVersion = pCreateNewVersion,
.Language = Environment.User.Language, .Language = Environment.User.Language,
.Username = Environment.User.UserName .Username = Environment.User.UserName
@@ -521,11 +521,11 @@ Public Class frmDocumentResultList
Dim oAddress As String = oServerAddress.Item1 Dim oAddress As String = oServerAddress.Item1
Dim oPort As Integer = oServerAddress.Item2 Dim oPort As Integer = oServerAddress.Item2
Client = New Client(LogConfig, oAddress, oPort) EDMI_API_Client = New Client(LogConfig, oAddress, oPort)
ControlManager = New AttributeControls(LogConfig, Environment, Client) ControlManager = New AttributeControls(LogConfig, Environment, EDMI_API_Client)
CheckoutManager = New CheckInOut(LogConfig, Client) CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client)
If Not Client.Connect() Then If Not EDMI_API_Client.Connect() Then
Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address)
Return False Return False
End If End If
@@ -920,7 +920,7 @@ Public Class frmDocumentResultList
FileEx.OpenFileProperties(_CurrentDocument.FullPath) FileEx.OpenFileProperties(_CurrentDocument.FullPath)
Case Else Case Else
Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, Client, _CurrentDocument.Id) Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, EDMI_API_Client, _CurrentDocument.Id)
oPropertyDialog.Show() oPropertyDialog.Show()
End Select End Select
End Sub End Sub
@@ -970,13 +970,13 @@ Public Class frmDocumentResultList
Exit Sub Exit Sub
End If End If
Await Client.CheckOutFile(oObjectId, oResultComment) Await EDMI_API_Client.CheckOutFile(oObjectId, oResultComment)
End Sub End Sub
Private Sub MenuItemCheckInFile_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemCheckInFile.ItemClick Private Sub MenuItemCheckInFile_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemCheckInFile.ItemClick
Dim oObjectId = _CurrentDocument?.Id Dim oObjectId = _CurrentDocument?.Id
Client.CheckInFile(oObjectId) EDMI_API_Client.CheckInFile(oObjectId)
End Sub End Sub
Private Function ShowCheckInOutCommentForm() Private Function ShowCheckInOutCommentForm()
@@ -1166,4 +1166,8 @@ Public Class frmDocumentResultList
Private Sub MenuItemStartAdhocWorkflow_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemStartAdhocWorkflow.ItemClick Private Sub MenuItemStartAdhocWorkflow_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemStartAdhocWorkflow.ItemClick
End Sub End Sub
Private Sub GridView_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged, GridView2.FocusedRowChanged, GridView1.FocusedRowChanged
End Sub
End Class End Class

View File

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
' Werte der Assemblyattribute überprüfen ' Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("Common")> <Assembly: AssemblyTitle("DigitalData.Common")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("Enthält allgemeine Dialoge und Formulare für Digital Data Produkte")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
<Assembly: AssemblyProduct("Common")> <Assembly: AssemblyProduct("DigitalData.Common")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("")>
<Assembly: AssemblyTrademark("2.5.5.0")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.6.0")> <Assembly: AssemblyVersion("2.7.0.0")>
<Assembly: AssemblyFileVersion("2.5.6.0")> <Assembly: AssemblyFileVersion("2.7.0.0")>

View File

@@ -5,16 +5,22 @@ Namespace SQLEditor
Public Class Placeholders Public Class Placeholders
Public Const AUTO_INDEX_ZOOFLOW = "ATTR_A" Public Const AUTO_INDEX_ZOOFLOW = "ATTR_A"
Public Const MAN_INDEX_ZOOFLOW = "ATTR_M" Public Const MAN_INDEX_ZOOFLOW = "ATTR_M"
Public Function GetInternalPlaceholders(AttributStore As String) As GalleryItemGroup
Public Function GetInternalPlaceholders() As GalleryItemGroup
Dim oModule = "INT" Dim oModule = "INT"
Dim oImage = My.Resources.electronics_desktopmac Dim oImage = My.Resources.electronics_desktopmac
Dim oImagePrivate = My.Resources._private
Dim oValue As String
If AttributStore = "WM" Then
oValue = "WMDocID"
Else
oValue = "IDBObjID"
End If
Dim oItems As New List(Of GalleryItem)() From { Dim oItems As New List(Of GalleryItem)() From {
GetGalleryItem(New Placeholder("USERNAME", "Benutzername", oModule, "USERNAME"), oImage), GetGalleryItem(New Placeholder("USERNAME", "Benutzername", oModule, "USERNAME"), oImage),
GetGalleryItem(New Placeholder("MACHINE", "Aktuelles Datum", oModule, "MACHINE"), oImage), GetGalleryItem(New Placeholder("MACHINE", "Aktuelles Datum", oModule, "MACHINE"), oImage),
GetGalleryItem(New Placeholder("DOMAIN", "Email-Adresse", oModule, "DOMAIN"), oImage), GetGalleryItem(New Placeholder("DOMAIN", "Email-Adresse", oModule, "DOMAIN"), oImage),
GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage) GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage),
GetGalleryItem(New Placeholder(oValue, "UniqueObjectID", oModule, oValue), oImagePrivate)
} }
Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Intern"} Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Intern"}
@@ -35,6 +41,7 @@ Namespace SQLEditor
Return oGroup1 Return oGroup1
End Function End Function
Friend Function GetWindreamPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup Friend Function GetWindreamPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup
Dim oImage = My.Resources.bo_contract Dim oImage = My.Resources.bo_contract
Dim oItems As New List(Of GalleryItem)() Dim oItems As New List(Of GalleryItem)()

View File

@@ -33,6 +33,7 @@ Public Class frmSQLEditor
Public Property PlaceholdersAutomaticPrefix As String Public Property PlaceholdersAutomaticPrefix As String
Public Property PlaceholdersAutomaticTitle As String = "Automatisches Attribut" Public Property PlaceholdersAutomaticTitle As String = "Automatisches Attribut"
Public Property PlaceholdersWindream As List(Of String) Public Property PlaceholdersWindream As List(Of String)
Public Property ATTRIBUTE_STORE As String = "WM"
Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer)
MyClass.New(pLogConfig, pDatabase, True) MyClass.New(pLogConfig, pDatabase, True)
@@ -80,19 +81,30 @@ Public Class frmSQLEditor
Dim oConnectionGroup = LoadConnections() Dim oConnectionGroup = LoadConnections()
Dim oSelectedItem = Nothing Dim oSelectedItem = Nothing
Dim oConnectionisZero As Boolean = False
' Missing/Negative connection will always result in default (DD_ECM) connection ' Missing/Negative connection will always result in default (DD_ECM) connection
If SQLConnection <= 0 Then If SQLConnection <= 0 Then
oConnectionisZero = True
SQLConnection = 1 SQLConnection = 1
End If End If
' Select the supplied connection in the ribbon gallery ' Select the supplied connection in the ribbon gallery
For Each oItem As GalleryItem In oConnectionGroup.Items If oConnectionisZero = True Then
Dim oConnection = oItem.Tag For Each oItem As GalleryItem In oConnectionGroup.Items
If SQLConnection = oConnection.id Then Dim oConnection = oItem.Tag
oSelectedItem = oItem If oConnection.NAME = "DD_ECM" Then
End If oSelectedItem = oItem
Next End If
Next
Else
For Each oItem As GalleryItem In oConnectionGroup.Items
Dim oConnection = oItem.Tag
If oConnection.Id = SQLConnection Then
oSelectedItem = oItem
End If
Next
End If
GalleryConnection.Gallery.Groups.Add(oConnectionGroup) GalleryConnection.Gallery.Groups.Add(oConnectionGroup)
@@ -153,7 +165,7 @@ Public Class frmSQLEditor
End If End If
oPlaceholders.Add(Placeholders.GetUserPlaceholders()) oPlaceholders.Add(Placeholders.GetUserPlaceholders())
oPlaceholders.Add(Placeholders.GetInternalPlaceholders()) oPlaceholders.Add(Placeholders.GetInternalPlaceholders(ATTRIBUTE_STORE))
Return oPlaceholders Return oPlaceholders
End Function End Function

View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System"> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup> </sectionGroup>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections> </configSections>
<applicationSettings> <applicationSettings>
<DevExpress.LookAndFeel.Design.AppSettings> <DevExpress.LookAndFeel.Design.AppSettings>
@@ -11,46 +13,106 @@
<value>Skin/Office 2019 White</value> <value>Skin/Office 2019 White</value>
</setting> </setting>
<setting name="DefaultPalette" serializeAs="String"> <setting name="DefaultPalette" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="TouchUI" serializeAs="String"> <setting name="TouchUI" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="CompactUI" serializeAs="String"> <setting name="CompactUI" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="TouchScaleFactor" serializeAs="String"> <setting name="TouchScaleFactor" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="DirectX" serializeAs="String"> <setting name="DirectX" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="RegisterUserSkins" serializeAs="String"> <setting name="RegisterUserSkins" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="RegisterBonusSkins" serializeAs="String"> <setting name="RegisterBonusSkins" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="FontBehavior" serializeAs="String"> <setting name="FontBehavior" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="DefaultAppFont" serializeAs="String"> <setting name="DefaultAppFont" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="DPIAwarenessMode" serializeAs="String"> <setting name="DPIAwarenessMode" serializeAs="String">
<value></value> <value>
</value>
</setting> </setting>
<setting name="CustomPaletteCollection" serializeAs="Xml"> <setting name="CustomPaletteCollection" serializeAs="Xml">
<value/> <value />
</setting> </setting>
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<entityFramework>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
</providers>
<defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
</entityFramework>
</configuration>

View File

@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
<package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.0.5" targetFramework="net461" /> <package id="NLog" version="5.0.5" targetFramework="net461" />
<package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
<package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
<package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
<package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
<package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
<package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
<package id="System.Management" version="9.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages> </packages>

View File

@@ -48,9 +48,24 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Interfaces">
<HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Jobs">
<HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
@@ -131,27 +146,5 @@
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Modules.Jobs\Jobs.vbproj">
<Project>{39ec839a-3c30-4922-a41e-6b09d1dde5c3}</Project>
<Name>Jobs</Name>
</ProjectReference>
<ProjectReference Include="..\Modules.Config\Config.vbproj">
<Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
<Name>Config</Name>
</ProjectReference>
<ProjectReference Include="..\Modules.Database\Database.vbproj">
<Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
<Name>Database</Name>
</ProjectReference>
<ProjectReference Include="..\Modules.Interfaces\Interfaces.vbproj">
<Project>{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}</Project>
<Name>Interfaces</Name>
</ProjectReference>
<ProjectReference Include="..\Modules.Logging\Logging.vbproj">
<Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
<Name>Logging</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project> </Project>

View File

@@ -26,7 +26,7 @@ Public Class Form1
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Dim oGroup As String = ListBox1.SelectedItem Dim oGroup As String = ListBox1.SelectedItem
Dim oAttributeMappings = GetAttributeMappings() Dim oAttributeMappings = GetAttributeMappings()
_sync.SyncUsersForGroup(oGroup, oAttributeMappings, _firebird, _sql) _sync.SyncUsersForGroup(oGroup, oAttributeMappings, _sql)
End Sub End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
@@ -70,6 +70,6 @@ Public Class Form1
End Function End Function
Private Sub btnParseConfig_Click(sender As Object, e As EventArgs) Handles btnParseConfig.Click Private Sub btnParseConfig_Click(sender As Object, e As EventArgs) Handles btnParseConfig.Click
Dim oConfig = JobConfigParser.ParseConfig(txtJobConfigString.Text) 'Dim oConfig = JobConfigParser.ParseConfig(txtJobConfigString.Text)
End Sub End Sub
End Class End Class

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="NLog" version="4.7.0" targetFramework="net461" /> <package id="NLog" version="5.0.5" targetFramework="net48" />
</packages> </packages>

View File

@@ -31,6 +31,10 @@
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" /> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" /> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

View File

@@ -14,6 +14,8 @@
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -73,9 +75,13 @@
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer"> <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath> <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.Common">
<HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Config"> <Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
@@ -85,8 +91,7 @@
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Interfaces, Version=1.12.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Interfaces">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath> <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Jobs, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Jobs, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -106,7 +111,7 @@
<HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath> <HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14"> <Reference Include="GdPicture.NET.14">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\GdPicture.NET 14.1\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath> <HintPath>..\GUIs.Test.ZUGFeRDTest\bin\Debug\GdPicture.NET.14.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mail"> <Reference Include="Mail">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath> <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
@@ -353,10 +358,6 @@
<Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project> <Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project>
<Name>LookupControl</Name> <Name>LookupControl</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\GUIs.Common\Common.vbproj">
<Project>{d20a6bf2-c7c6-4a7a-b34d-fa27d775a049}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\Service.EDMIService\EDMIService.vbproj"> <ProjectReference Include="..\Service.EDMIService\EDMIService.vbproj">
<Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project> <Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project>
<Name>EDMIService</Name> <Name>EDMIService</Name>
@@ -382,4 +383,11 @@
<None Include="Resources\actions_send.svg" /> <None Include="Resources\actions_send.svg" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
</Project> </Project>

View File

@@ -30,7 +30,7 @@ Partial Class frmDocView
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.TextBox1 = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
@@ -106,19 +106,19 @@ Partial Class frmDocView
' '
'DocumentViewer1 'DocumentViewer1
' '
Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.MyDocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill
Me.DocumentViewer1.FileLoaded = False Me.MyDocumentViewer.FileLoaded = False
Me.DocumentViewer1.Location = New System.Drawing.Point(0, 43) Me.MyDocumentViewer.Location = New System.Drawing.Point(0, 43)
Me.DocumentViewer1.Name = "DocumentViewer1" Me.MyDocumentViewer.Name = "DocumentViewer1"
Me.DocumentViewer1.Size = New System.Drawing.Size(1079, 463) Me.MyDocumentViewer.Size = New System.Drawing.Size(1079, 463)
Me.DocumentViewer1.TabIndex = 0 Me.MyDocumentViewer.TabIndex = 0
' '
'frmDocView 'frmDocView
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1079, 506) Me.ClientSize = New System.Drawing.Size(1079, 506)
Me.Controls.Add(Me.DocumentViewer1) Me.Controls.Add(Me.MyDocumentViewer)
Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Panel1)
Me.Name = "frmDocView" Me.Name = "frmDocView"
Me.Text = "frmDocView" Me.Text = "frmDocView"
@@ -128,7 +128,7 @@ Partial Class frmDocView
End Sub End Sub
Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
Friend WithEvents Panel1 As Panel Friend WithEvents Panel1 As Panel
Friend WithEvents Button1 As Button Friend WithEvents Button1 As Button
Friend WithEvents TextBox1 As TextBox Friend WithEvents TextBox1 As TextBox

View File

@@ -11,17 +11,17 @@ Public Class frmDocView
If String.IsNullOrEmpty(TextBox1.Text) Then If String.IsNullOrEmpty(TextBox1.Text) Then
If OpenFileDialog1.ShowDialog() = DialogResult.OK Then If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
TextBox1.Text = OpenFileDialog1.FileName TextBox1.Text = OpenFileDialog1.FileName
DocumentViewer1.LoadFile(TextBox1.Text) MyDocumentViewer.LoadFile(TextBox1.Text)
End If End If
Else Else
DocumentViewer1.LoadFile(TextBox1.Text) MyDocumentViewer.LoadFile(TextBox1.Text)
End If End If
End Sub End Sub
Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load
LogConfig = New LogConfig(LogConfig.PathType.Temp) LogConfig = New LogConfig(LogConfig.PathType.Temp)
DocumentViewer1.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = False, .ShowPrintButton = False,
.ShowRotateButton = False, .ShowRotateButton = False,
.ShowFlipButton = False, .ShowFlipButton = False,
@@ -30,16 +30,16 @@ Public Class frmDocView
End Sub End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
DocumentViewer1.Done() MyDocumentViewer.Done()
End Sub End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
If DocumentViewer1.AddAnnotation("Some Text") Then If MyDocumentViewer.AddAnnotation("Some Text") Then
End If End If
End Sub End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
DocumentViewer1.Save() MyDocumentViewer.Save()
End Sub End Sub
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click

View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="GdPicture" version="14.2.90" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net461" /> <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net461" />
<package id="NLog" version="5.0.5" targetFramework="net472" /> <package id="NLog" version="5.0.5" targetFramework="net472" />
<package id="Quartz" version="3.5.0" targetFramework="net462" /> <package id="Quartz" version="3.5.0" targetFramework="net462" />

View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup> </sectionGroup>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup> </startup>
<applicationSettings> <applicationSettings>
<ZUGFeRDTest.My.MySettings> <ZUGFeRDTest.My.MySettings>
@@ -40,72 +40,112 @@
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.XML.API" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.XML.API" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.SwingAWT" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.SwingAWT" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Security" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Security" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Beans" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Beans" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Media" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Media" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.XML.Bind" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.XML.Bind" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral"/> <assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0"/> <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/> <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/> <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/> <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/> <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="itext.kernel" publicKeyToken="8354ae6d2174ddca" culture="neutral"/> <assemblyIdentity name="itext.kernel" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0"/> <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="itext.pdfa" publicKeyToken="8354ae6d2174ddca" culture="neutral"/> <assemblyIdentity name="itext.pdfa" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0"/> <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="itext.io" publicKeyToken="8354ae6d2174ddca" culture="neutral"/> <assemblyIdentity name="itext.io" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0"/> <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

View File

@@ -23,38 +23,44 @@ Partial Class Form1
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.Button1 = New System.Windows.Forms.Button() Me.btRunJob = New System.Windows.Forms.Button()
Me.ListBox1 = New System.Windows.Forms.ListBox() Me.ListBox1 = New System.Windows.Forms.ListBox()
Me.Button2 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button()
Me.Button3 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button()
Me.Button4 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button()
Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.Button7 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button()
Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
Me.txtPropName = New System.Windows.Forms.TextBox() Me.txtPropName = New System.Windows.Forms.TextBox()
Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.Button6 = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button()
Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
Me.txtMD5Checksum = New System.Windows.Forms.TextBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.Button5 = New System.Windows.Forms.Button()
Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
Me.Button1 = New System.Windows.Forms.Button()
Me.GroupBox1.SuspendLayout() Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout() Me.GroupBox2.SuspendLayout()
Me.GroupBox3.SuspendLayout() Me.GroupBox3.SuspendLayout()
Me.GroupBox4.SuspendLayout() Me.GroupBox4.SuspendLayout()
Me.GroupBox5.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'OpenFileDialog1 'OpenFileDialog1
' '
Me.OpenFileDialog1.FileName = "OpenFileDialog1" Me.OpenFileDialog1.FileName = "OpenFileDialog1"
' '
'Button1 'btRunJob
' '
Me.Button1.Location = New System.Drawing.Point(6, 19) Me.btRunJob.Location = New System.Drawing.Point(6, 19)
Me.Button1.Name = "Button1" Me.btRunJob.Name = "btRunJob"
Me.Button1.Size = New System.Drawing.Size(221, 23) Me.btRunJob.Size = New System.Drawing.Size(221, 23)
Me.Button1.TabIndex = 0 Me.btRunJob.TabIndex = 0
Me.Button1.Text = "Run Job" Me.btRunJob.Text = "Run Job"
Me.Button1.UseVisualStyleBackColor = True Me.btRunJob.UseVisualStyleBackColor = True
' '
'ListBox1 'ListBox1
' '
@@ -64,7 +70,7 @@ Partial Class Form1
Me.ListBox1.FormattingEnabled = True Me.ListBox1.FormattingEnabled = True
Me.ListBox1.Location = New System.Drawing.Point(378, 8) Me.ListBox1.Location = New System.Drawing.Point(378, 8)
Me.ListBox1.Name = "ListBox1" Me.ListBox1.Name = "ListBox1"
Me.ListBox1.Size = New System.Drawing.Size(532, 472) Me.ListBox1.Size = New System.Drawing.Size(532, 602)
Me.ListBox1.TabIndex = 1 Me.ListBox1.TabIndex = 1
' '
'Button2 'Button2
@@ -96,22 +102,32 @@ Partial Class Form1
' '
'GroupBox1 'GroupBox1
' '
Me.GroupBox1.Controls.Add(Me.Button1) Me.GroupBox1.Controls.Add(Me.ButtonValidateXMLOnly)
Me.GroupBox1.Location = New System.Drawing.Point(12, 12) Me.GroupBox1.Controls.Add(Me.btRunJob)
Me.GroupBox1.Location = New System.Drawing.Point(12, 58)
Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(360, 92) Me.GroupBox1.Size = New System.Drawing.Size(360, 92)
Me.GroupBox1.TabIndex = 7 Me.GroupBox1.TabIndex = 7
Me.GroupBox1.TabStop = False Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Run Job like in ZUGFeRD Service" Me.GroupBox1.Text = "Run Job like in ZUGFeRD Service"
' '
'ButtonValidateXMLOnly
'
Me.ButtonValidateXMLOnly.Location = New System.Drawing.Point(6, 48)
Me.ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(221, 23)
Me.ButtonValidateXMLOnly.TabIndex = 4
Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True
'
'GroupBox2 'GroupBox2
' '
Me.GroupBox2.Controls.Add(Me.Button2) Me.GroupBox2.Controls.Add(Me.Button2)
Me.GroupBox2.Controls.Add(Me.Button7) Me.GroupBox2.Controls.Add(Me.Button7)
Me.GroupBox2.Controls.Add(Me.Button3) Me.GroupBox2.Controls.Add(Me.Button3)
Me.GroupBox2.Location = New System.Drawing.Point(12, 110) Me.GroupBox2.Location = New System.Drawing.Point(12, 156)
Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(360, 155) Me.GroupBox2.Size = New System.Drawing.Size(360, 109)
Me.GroupBox2.TabIndex = 8 Me.GroupBox2.TabIndex = 8
Me.GroupBox2.TabStop = False Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)" Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
@@ -136,6 +152,15 @@ Partial Class Form1
Me.GroupBox3.TabStop = False Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Open PDF and calculate Checksum" Me.GroupBox3.Text = "Open PDF and calculate Checksum"
' '
'txtMD5Checksum
'
Me.txtMD5Checksum.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ZUGFeRDTest.My.MySettings.Default, "MD5Cheksum", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
Me.txtMD5Checksum.Name = "txtMD5Checksum"
Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
Me.txtMD5Checksum.TabIndex = 5
Me.txtMD5Checksum.Text = Global.ZUGFeRDTest.My.MySettings.Default.MD5Cheksum
'
'txtPropName 'txtPropName
' '
Me.txtPropName.Location = New System.Drawing.Point(6, 48) Me.txtPropName.Location = New System.Drawing.Point(6, 48)
@@ -149,7 +174,7 @@ Partial Class Form1
Me.GroupBox4.Controls.Add(Me.txtPropName) Me.GroupBox4.Controls.Add(Me.txtPropName)
Me.GroupBox4.Location = New System.Drawing.Point(12, 362) Me.GroupBox4.Location = New System.Drawing.Point(12, 362)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(360, 122) Me.GroupBox4.Size = New System.Drawing.Size(360, 80)
Me.GroupBox4.TabIndex = 11 Me.GroupBox4.TabIndex = 11
Me.GroupBox4.TabStop = False Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "GroupBox4" Me.GroupBox4.Text = "GroupBox4"
@@ -163,20 +188,46 @@ Partial Class Form1
Me.Button6.Text = "Find and Extract XML Path Value" Me.Button6.Text = "Find and Extract XML Path Value"
Me.Button6.UseVisualStyleBackColor = True Me.Button6.UseVisualStyleBackColor = True
' '
'txtMD5Checksum 'GroupBox5
' '
Me.txtMD5Checksum.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ZUGFeRDTest.My.MySettings.Default, "MD5Cheksum", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.GroupBox5.Controls.Add(Me.Button5)
Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49) Me.GroupBox5.Location = New System.Drawing.Point(12, 490)
Me.txtMD5Checksum.Name = "txtMD5Checksum" Me.GroupBox5.Name = "GroupBox5"
Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20) Me.GroupBox5.Size = New System.Drawing.Size(360, 122)
Me.txtMD5Checksum.TabIndex = 5 Me.GroupBox5.TabIndex = 12
Me.txtMD5Checksum.Text = Global.ZUGFeRDTest.My.MySettings.Default.MD5Cheksum Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "GroupBox5"
'
'Button5
'
Me.Button5.Location = New System.Drawing.Point(6, 19)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(221, 23)
Me.Button5.TabIndex = 11
Me.Button5.Text = "Write Binary to PDF"
Me.Button5.UseVisualStyleBackColor = True
'
'OpenFileDialog2
'
Me.OpenFileDialog2.FileName = "OpenFileDialog2"
Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
'
'Button1
'
Me.Button1.Location = New System.Drawing.Point(18, 12)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(180, 23)
Me.Button1.TabIndex = 13
Me.Button1.Text = "Open Logpath"
Me.Button1.UseVisualStyleBackColor = True
' '
'Form1 'Form1
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(916, 492) Me.ClientSize = New System.Drawing.Size(916, 633)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.GroupBox5)
Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.GroupBox4)
Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.GroupBox2)
@@ -190,12 +241,13 @@ Partial Class Form1
Me.GroupBox3.PerformLayout() Me.GroupBox3.PerformLayout()
Me.GroupBox4.ResumeLayout(False) Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout() Me.GroupBox4.PerformLayout()
Me.GroupBox5.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents OpenFileDialog1 As OpenFileDialog
Friend WithEvents Button1 As Button Friend WithEvents btRunJob As Button
Friend WithEvents ListBox1 As ListBox Friend WithEvents ListBox1 As ListBox
Friend WithEvents Button2 As Button Friend WithEvents Button2 As Button
Friend WithEvents Button3 As Button Friend WithEvents Button3 As Button
@@ -209,4 +261,9 @@ Partial Class Form1
Friend WithEvents Button6 As Button Friend WithEvents Button6 As Button
Friend WithEvents Button7 As Button Friend WithEvents Button7 As Button
Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
Friend WithEvents GroupBox5 As GroupBox
Friend WithEvents Button5 As Button
Friend WithEvents ButtonValidateXMLOnly As Button
Friend WithEvents OpenFileDialog2 As OpenFileDialog
Friend WithEvents Button1 As Button
End Class End Class

View File

@@ -123,4 +123,7 @@
<metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>159, 17</value> <value>159, 17</value>
</metadata> </metadata>
<metadata name="OpenFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>328, 17</value>
</metadata>
</root> </root>

File diff suppressed because one or more lines are too long

View File

@@ -14,6 +14,8 @@
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,8 +50,13 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Database, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -60,18 +67,114 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath> <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL"> <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
<HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
</Reference>
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
</Reference>
<Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.SqlClient, Version=4.6.1.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Data.SqlClient, Version=4.6.1.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -79,15 +182,49 @@
</Reference> </Reference>
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
@@ -152,4 +289,11 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
</Project> </Project>

View File

@@ -1,6 +1,35 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" /> <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.1.0" targetFramework="net461" /> <package id="NLog" version="5.1.0" targetFramework="net461" />
<package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
<package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
<package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
<package id="System.Data.SqlClient" version="4.8.6" targetFramework="net462" /> <package id="System.Data.SqlClient" version="4.8.6" targetFramework="net462" />
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
<package id="System.Management" version="8.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages> </packages>

View File

@@ -66,7 +66,7 @@ Public Class JobRunner
{"MSSQL", _mssql}, {"MSSQL", _mssql},
{"Args", oJobConfig.Args} {"Args", oJobConfig.Args}
} }
Dim oCountGraphJobs As Int16 = 0
Dim oJob = JobBuilder.Create(Of T)(). Dim oJob = JobBuilder.Create(Of T)().
WithIdentity(oJobIdentity). WithIdentity(oJobIdentity).
UsingJobData(oJobData). UsingJobData(oJobData).
@@ -82,12 +82,13 @@ Public Class JobRunner
Await _scheduler.ScheduleJob(oJob, oTrigger) Await _scheduler.ScheduleJob(oJob, oTrigger)
_Logger.Info("Job {0} scheduled.", JobName) _Logger.Info("Job {0} scheduled.", JobName)
oCountGraphJobs += 1
Else Else
_Logger.Info("Job {0} is disabled.", JobName) _Logger.Info("Job {0} is disabled.", JobName)
End If End If
' If StartWithoutDelay is True, start Job after 10 Seconds ' If StartWithoutDelay is True, start Job after 10 Seconds
If oJobConfig.StartWithoutDelay Then If oJobConfig.StartWithoutDelay And oCountGraphJobs > 0 Then
Dim oDebugJob = JobBuilder.Create(Of T)(). Dim oDebugJob = JobBuilder.Create(Of T)().
WithIdentity(oJobIdentity & "-DEBUG"). WithIdentity(oJobIdentity & "-DEBUG").
UsingJobData(oJobData). UsingJobData(oJobData).
@@ -100,6 +101,10 @@ Public Class JobRunner
_Logger.Info("Job {0} will start in 10 Seconds.", JobName) _Logger.Info("Job {0} will start in 10 Seconds.", JobName)
Await _scheduler.ScheduleJob(oDebugJob, oDebugTrigger) Await _scheduler.ScheduleJob(oDebugJob, oDebugTrigger)
Else
If oCountGraphJobs = 0 Then
_Logger.Info("No Jobs configured!!")
End If
End If End If
End Function End Function

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.0.0")> <Assembly: AssemblyVersion("2.4.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -19,7 +19,7 @@
<applicationSettings> <applicationSettings>
<DDEmailService.My.MySettings> <DDEmailService.My.MySettings>
<setting name="MSSQL_SELECT" serializeAs="String"> <setting name="MSSQL_SELECT" serializeAs="String">
<value>SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_ADRESS &lt;&gt; '' and REMINDER_TYPE_ID = 202377 AND EMAIL_SENT IS NULL</value> <value>SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_ADRESS &lt;&gt; '' AND EMAIL_SENT IS NULL</value>
</setting> </setting>
</DDEmailService.My.MySettings> </DDEmailService.My.MySettings>
</applicationSettings> </applicationSettings>

View File

@@ -135,6 +135,7 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<Compile Include="TempFiles.vb" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="My Project\Resources.resx"> <EmbeddedResource Include="My Project\Resources.resx">

View File

@@ -6,6 +6,7 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Messaging
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports FirebirdSql.Data
Public Class EmailService Public Class EmailService
Private _Logger As Logger Private _Logger As Logger
@@ -13,16 +14,18 @@ Public Class EmailService
Private _ConfigManager As ConfigManager(Of Config) Private _ConfigManager As ConfigManager(Of Config)
Private _Config As Config Private _Config As Config
Private _Firebird As Firebird ' Private _Firebird As Firebird
Private _MSSQL As MSSQLServer Private _MSSQL As MSSQLServer
Private _MSSQL_Test As MSSQLServer Private _MSSQL_Test As MSSQLServer
Private _Encryption As EncryptionLegacy Private _Encryption As EncryptionLegacy
Private _EmailQueue As BackgroundWorker Private _EmailQueue As BackgroundWorker
Private _QueueTimer As Timer Private _QueueTimer As Timer
Private _TempFiles As TempFiles
Private _AnyDatabaseInitialized As Boolean = False Private _AnyDatabaseInitialized As Boolean = False
Private _limilab As Limilab Private _limilab As Limilab
Private _MailSender As Mail.MailSender Private _MailSender As Mail.MailSender
Private ReadOnly _messageSend As Boolean = False Private _AttachmentByteData As Byte()
Private _RecentAttachmentByteData As Byte()
Private Enum DatabaseType Private Enum DatabaseType
Firebird Firebird
@@ -76,8 +79,9 @@ Public Class EmailService
End If End If
End If End If
_AnyDatabaseInitialized = _Firebird?._DBInitialized Or _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized _AnyDatabaseInitialized = _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
_TempFiles = New TempFiles(_LogConfig)
_TempFiles.Create()
' === Initialize Email === ' === Initialize Email ===
_Logger.Debug("Inititalize Email") _Logger.Debug("Inititalize Email")
@@ -194,9 +198,9 @@ Public Class EmailService
Dim oAccounts As New List(Of EmailAccount) Dim oAccounts As New List(Of EmailAccount)
Select Case Database Select Case Database
Case DatabaseType.Firebird 'Case DatabaseType.Firebird
oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True" ' oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
oEmailAccounts = _Firebird.GetDatatable(oSQL) ' oEmailAccounts = _Firebird.GetDatatable(oSQL)
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1" oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1"
oEmailAccounts = MSSQLInstance.GetDatatable(oSQL) oEmailAccounts = MSSQLInstance.GetDatatable(oSQL)
@@ -288,9 +292,9 @@ Public Class EmailService
End If End If
Select Case Database Select Case Database
Case DatabaseType.Firebird 'Case DatabaseType.Firebird
oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''" ' oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
oEmailQueue = _Firebird.GetDatatable(oSQL) ' oEmailQueue = _Firebird.GetDatatable(oSQL)
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
If My.Settings.MSSQL_SELECT <> String.Empty Then If My.Settings.MSSQL_SELECT <> String.Empty Then
_Logger.Debug("My.Settings.MSSQL_SELECT will be used..") _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
@@ -372,6 +376,8 @@ Public Class EmailService
Dim oSubject = String.Empty Dim oSubject = String.Empty
Dim oBody = String.Empty Dim oBody = String.Empty
Dim oAddedWhen = Now Dim oAddedWhen = Now
Dim ATT1_RELATED_ID = String.Empty
Dim ATT1_REL_TYPE = String.Empty
Select Case Database Select Case Database
Case DatabaseType.Firebird Case DatabaseType.Firebird
@@ -409,16 +415,36 @@ Public Class EmailService
oAddedWhen = oRow.ItemEx("ADDED_WHEN", Now) oAddedWhen = oRow.ItemEx("ADDED_WHEN", Now)
oAttachment = oRow.ItemEx("EMAIL_ATTMT1", String.Empty) oAttachment = oRow.ItemEx("EMAIL_ATTMT1", String.Empty)
ATT1_RELATED_ID = oRow.ItemEx("ATT1_RELATED_ID", String.Empty)
ATT1_REL_TYPE = oRow.ItemEx("ATT1_REL_TYPE", String.Empty)
End Select End Select
If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
_Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
If ATT1_REL_TYPE = "EnvelopeResult" Then
GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance)
End If
If IsNothing(_AttachmentByteData) = False Then
Dim oTempFolder = _TempFiles.TempPath
Dim oTempFilename = String.Concat(oTempFolder, "\", $"SigningReport_{ATT1_RELATED_ID}.pdf")
If Not Directory.Exists(oTempFolder) Then
Directory.CreateDirectory(oTempFolder)
_Logger.Info($"created directory [{oTempFolder}]!")
End If
Dim oFileFromByteData = CreateTempFileFromByte(oTempFilename)
If Not IsNothing(oFileFromByteData) Then
_Logger.Info($"oFileFromByteData is [{oFileFromByteData}]!")
oAttachment = oFileFromByteData
End If
End If
End If
If oAttachment <> String.Empty Then If oAttachment <> String.Empty Then
If oAttachment.ToString.Contains("\") Then If oAttachment.ToString.Contains("\") Then
If File.Exists(oAttachment) = False Then If File.Exists(oAttachment) = False Then
_Logger.Warn($"Email Attachment [{oAttachment}] not existing!") _Logger.Warn($"Email Attachment [{oAttachment}] Not existing!")
oComment = $"Email Attachment [{oAttachment}] not existing!" oComment = $"Email Attachment [{oAttachment}] Not existing!"
oAttachment = String.Empty oAttachment = String.Empty
Else Else
_Logger.Debug("Email Attachment is: {0}", oAttachment) _Logger.Debug("Email Attachment Is: {0}", oAttachment)
End If End If
End If End If
@@ -429,22 +455,16 @@ Public Class EmailService
Dim oMessageSent = _MailSender.SendMail(oAddresses, oAccount.Sender, oSubject, oBody, oAddedWhen, oAttachments, False) Dim oMessageSent = _MailSender.SendMail(oAddresses, oAccount.Sender, oSubject, oBody, oAddedWhen, oAttachments, False)
If oMessageSent Then If oMessageSent = True Then
oTotalSent.Add(oEmailTo) oTotalSent.Add(oEmailTo)
oSuccessfulSent.Add(oEmailTo) oSuccessfulSent.Add(oEmailTo)
Select Case Database Select Case Database
Case DatabaseType.Firebird 'Case DatabaseType.Firebird
oSQL = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGuid}" ' oSQL = GetFirebirdUpdateString(oComment, oGuid)
If oSQL.Contains(",COMMENT = ''") Then ' _Firebird.ExecuteNonQuery(oSQL)
oSQL.Replace(",COMMENT = ''", "")
End If
_Firebird.ExecuteNonQuery(oSQL)
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(),COMMENT = '{oComment}' WHERE GUID = {oGuid} " oSQL = GetSQLUpdateString(oComment, oGuid)
If oSQL.Contains(",COMMENT = ''") Then
oSQL.Replace(",COMMENT = ''", "")
End If
MSSQLInstance.ExecuteNonQuery(oSQL) MSSQLInstance.ExecuteNonQuery(oSQL)
End Select End Select
_Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}") _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")
@@ -454,28 +474,15 @@ Public Class EmailService
oFailedSent.Add(oEmailTo) oFailedSent.Add(oEmailTo)
Select Case Database Select Case Database
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET ERROR_TIMESTAMP = GETDATE(),ERROR_MSG = '{_limilab.ErrorMessage}' WHERE GUID = {oGuid} " Dim oErrorMessage As String
MSSQLInstance.ExecuteNonQuery(oSQL) If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
If _messageSend = True Then oErrorMessage = _limilab.ErrorMessage
Select Case Database Else
Case DatabaseType.Firebird oErrorMessage = $"Could not sent email to email adress. Check log!"
oSQL = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGuid}"
If oSQL.Contains(",COMMENT = ''") Then
oSQL.Replace(",COMMENT = ''", "")
End If
_Firebird.ExecuteNonQuery(oSQL)
Case DatabaseType.MSSQL
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(),COMMENT = '{oComment}' WHERE GUID = {oGuid} "
If oSQL.Contains(",COMMENT = ''") Then
oSQL.Replace(",COMMENT = ''", "")
End If
MSSQLInstance.ExecuteNonQuery(oSQL)
End Select
_Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo} - although there was an error in connection close!")
End If End If
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
MSSQLInstance.ExecuteNonQuery(oSQL)
End Select End Select
End If End If
@@ -506,11 +513,89 @@ Public Class EmailService
End Try End Try
End Function End Function
Private Function GetSQLUpdateString(pComment As String, pGuid As Integer) As String
Dim oSQL As String = "UPDATE TBEMLP_EMAIL_OUT SET "
oSQL += " EMAIL_SENT = GETDATE() "
If String.IsNullOrWhiteSpace(pComment) = False Then
oSQL += $", COMMENT = '{pComment}' "
End If
oSQL += $" WHERE Guid = {pGuid}"
Return oSQL
End Function
Private Function GetFirebirdUpdateString(pComment As String, pGuid As Integer) As String
' Vermutlich wird das nicht mehr gebraucht?
Dim oSQL As String = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{pComment}' WHERE GUID = {pGuid}"
If oSQL.Contains(",COMMENT = ''") Then
oSQL.Replace(",COMMENT = ''", "")
End If
Return oSQL
End Function
Private Sub GetEnvelope_Result_FileStreamByte(ByVal pEnvID As Long, pMSSQL As MSSQLServer)
Dim strSql As String
'For Document
Try
'Get image data from gridview column.
strSql = "Select [DOC_RESULT] from [TBSIG_ENVELOPE] WHERE GUID = " & pEnvID
Dim obyteDB = pMSSQL.GetScalarValue(strSql)
If Not IsDBNull(obyteDB) Then
'Get image data from DB
Dim fileData As Byte() = DirectCast(obyteDB, Byte())
If Not fileData Is Nothing Then
_AttachmentByteData = fileData
Else
_AttachmentByteData = Nothing
End If
Else
_AttachmentByteData = Nothing
End If
Catch ex As Exception
_Logger.Warn($"Error in GetEnvelope_Result_FileStreamByte [{ex.Message}]")
_Logger.Error(ex)
_AttachmentByteData = Nothing
End Try
End Sub
Private Function CreateTempFileFromByte(ByVal sFileName As String) As String
Try
Dim oTempFolder = _TempFiles.TempPath
If Not Directory.Exists(oTempFolder) Then
Directory.CreateDirectory(oTempFolder)
_Logger.Info($"created directory [{oTempFolder}]!")
End If
If Not _AttachmentByteData Is Nothing Then
'Read image data into a file stream
Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)
fs.Write(_AttachmentByteData, 0, _AttachmentByteData.Length)
'Set image variable value using memory stream.
fs.Flush()
fs.Close()
End Using
'Open File
Return sFileName
Else
_Logger.Warn($"Error in CreateTempFileFromByte - _AttachmentByteData is nothing!")
Return Nothing
End If
Catch ex As Exception
_Logger.Warn($"Error in CreateTempFileFromByte [{ex.Message}]")
_Logger.Error(ex)
Return Nothing
End Try
End Function
Protected Overrides Sub OnStop() Protected Overrides Sub OnStop()
Try Try
_Logger.Warn("Service {0} was stopped.", ServiceName) _Logger.Warn("Service {0} was stopped.", ServiceName)
_TempFiles.CleanUp()
Catch ex As Exception Catch ex As Exception
_Logger.Warn("Error while stopping service!") _Logger.Warn("Error while stopping service!")
_Logger.Error(ex) _Logger.Error(ex)

View File

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("DDEmailService")> <Assembly: AssemblyProduct("DDEmailService")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("Copyright © 2024")>
<Assembly: AssemblyTrademark("1.5.2.0")> <Assembly: AssemblyTrademark("1.7.3.0")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.0.0")> <Assembly: AssemblyVersion("1.7.4.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -0,0 +1,60 @@
Imports System.IO
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging
Public Class TempFiles
Inherits BaseClass
Public Property TempPath As String
Public Sub New(pLogConfig As LogConfig)
MyBase.New(pLogConfig)
Dim oTempDirectoryPath = Path.GetTempPath()
TempPath = Path.Combine(oTempDirectoryPath, "EnvelopeGenerator")
End Sub
Public Function Create() As Boolean
Try
If Directory.Exists(TempPath) = False Then
Directory.CreateDirectory(TempPath)
Else
CleanUpFiles()
End If
Return True
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
Private Function CleanUpFiles() As Boolean
Try
For Each fileItem As String In Directory.GetFiles(TempPath)
Logger.Debug("Deleting tempPath-file: {0} ...", fileItem)
File.Delete(fileItem)
Next
Return True
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
Public Function CleanUp() As Boolean
Try
Logger.Debug("Deleting tempPath-Data: {0} ...", TempPath)
Directory.Delete(TempPath, True)
Return True
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
End Class

View File

@@ -2,23 +2,30 @@
Public Property Custom As New CustomConfig Public Property Custom As New CustomConfig
Public Property MSSQLConnectionString As String = "" Public Property MSSQLConnectionString As String = ""
Public Property MSSQLEmailOutAccountID As String = 1 Public Property MSSQLEmailOutAccountID As String = 1
Public Property PORTAL_NAME As String = "WISAG-Portal" Public Property PORTAL_NAME As String = "WISAG-Portal"
Public Property JobInterval As Integer = 10 Public Property JobInterval As Integer = 10
Public Property ExceptionEmailAddress As String = "wisag-flow@digitaldata.works" Public Property ExceptionEmailAddress As String = "wisag-flow@digitaldata.works"
Public Property Debug As Boolean = False Public Property Debug As Boolean = False
Public Property WatchDirectory As String = String.Empty Public Property WatchDirectory As String = String.Empty
Public Property SuccessDirectory As String = String.Empty
Public Property ErrorDirectory As String = String.Empty
Public Property OriginalEmailDirectory As String = String.Empty
Public Property RejectedEmailDirectory As String = String.Empty
Public Property AttachmentsSubDirectory As String = String.Empty
Public Property NonZugferdDirectory As String = String.Empty
Public Property SuccessDirectory As String = String.Empty
Public Property ErrorDirectory As String = String.Empty
Public Property OriginalEmailDirectory As String = String.Empty
Public Property RejectedEmailDirectory As String = String.Empty
Public Property AttachmentsSubDirectory As String = String.Empty
Public Property NonZugferdDirectory As String = String.Empty
Public Class CustomConfig Public Class CustomConfig
''' <summary> ''' <summary>
@@ -49,9 +56,21 @@
''' </summary> ''' </summary>
Public Property RejectionTemplateId As Integer = 0 Public Property RejectionTemplateId As Integer = 0
''' <summary>
''' Enthält die Version des GDPicture Modules,
''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
''' gelesen werden soll.
''' </summary>
Public Property GDPictureVersion As String = ""
Public Property AllowFacturX As Boolean = False Public Property AllowFacturX As Boolean = False
Public Property AllowXRechnung As Boolean = False Public Property AllowXRechnung As Boolean = False
Public Property AllowZugferd10 As Boolean = True Public Property AllowZugferd10 As Boolean = True
Public Property AllowZugferd2x As Boolean = True Public Property AllowZugferd2x As Boolean = True
Public Property AllowPeppolBISBill3x As Boolean = False
End Class End Class
End Class End Class

View File

@@ -48,29 +48,29 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Base, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Base\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Config\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database, Version=2.3.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Database\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Interfaces, Version=1.12.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Interfaces, Version=2.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Interfaces\DigitalData.Modules.Interfaces.dll</HintPath> <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Jobs, Version=2.5.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Jobs, Version=2.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Jobs\DigitalData.Modules.Jobs.dll</HintPath> <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Install .Net\0 DD - Bibliotheken\Modules\Logging\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

View File

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("DDZUGFeRDService")> <Assembly: AssemblyProduct("DDZUGFeRDService")>
<Assembly: AssemblyCopyright("Copyright © 2024")> <Assembly: AssemblyCopyright("Copyright © 2025")>
<Assembly: AssemblyTrademark("2.8.2.0")> <Assembly: AssemblyTrademark("2.8.9.0")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.8.2.0")> <Assembly: AssemblyVersion("2.8.9.0")>
<Assembly: AssemblyFileVersion("2.8.2.0")> <Assembly: AssemblyFileVersion("2.8.9.0")>

View File

@@ -52,7 +52,9 @@ Public Class ThreadRunner
.AllowXRechnung = _config.Config.Custom.AllowXRechnung, .AllowXRechnung = _config.Config.Custom.AllowXRechnung,
.AllowZugferd10 = _config.Config.Custom.AllowZugferd10, .AllowZugferd10 = _config.Config.Custom.AllowZugferd10,
.AllowZugferd2x = _config.Config.Custom.AllowZugferd2x, .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x,
.RejectionTemplateId = _config.Config.Custom.RejectionTemplateId .AllowPeppolBISBill3x = _config.Config.Custom.AllowPeppolBISBill3x,
.RejectionTemplateId = _config.Config.Custom.RejectionTemplateId,
.GDPictureVersion = _config.Config.Custom.GDPictureVersion
} }
oArgs = LoadFolderConfig(oArgs) oArgs = LoadFolderConfig(oArgs)
@@ -64,6 +66,7 @@ Public Class ThreadRunner
_logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes) _logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes)
_logger.Debug("MinFileAgeInMinutes: [{0}]", oArgs.MinFileAgeInMinutes) _logger.Debug("MinFileAgeInMinutes: [{0}]", oArgs.MinFileAgeInMinutes)
_logger.Debug("RejectionTemplateId: [{0}]", oArgs.RejectionTemplateId) _logger.Debug("RejectionTemplateId: [{0}]", oArgs.RejectionTemplateId)
_logger.Debug("GDPictureVersion: [{0}]", oArgs.GDPictureVersion)
_jobArguments = oArgs _jobArguments = oArgs
@@ -173,7 +176,7 @@ Public Class ThreadRunner
Dim oResult As DataTable = _mssql.GetDatatable(oSQL) Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
For Each oRow As DataRow In oResult.Rows For Each oRow As DataRow In oResult.Rows
Dim oXmlPath = oRow.Item("XML_PATH") Dim oXmlPath As String = oRow.Item("XML_PATH")
Dim oTableName = oRow.Item("TABLE_NAME") Dim oTableName = oRow.Item("TABLE_NAME")
Dim oTableColumn = oRow.Item("TABLE_COLUMN") Dim oTableColumn = oRow.Item("TABLE_COLUMN")
Dim oDescription = oRow.Item("DESCRIPTION") Dim oDescription = oRow.Item("DESCRIPTION")
@@ -181,6 +184,7 @@ Public Class ThreadRunner
Dim oIsGrouped = oRow.Item("IS_GROUPED") Dim oIsGrouped = oRow.Item("IS_GROUPED")
Dim oGroupScope = oRow.Item("GROUP_SCOPE") Dim oGroupScope = oRow.Item("GROUP_SCOPE")
Dim oSpecification = oRow.Item("SPECIFICATION") Dim oSpecification = oRow.Item("SPECIFICATION")
Dim oItemType = oRow.Item("ITEM_TYPE")
pArgs.PropertyMap.Add(oXmlPath, New XmlItemProperty() With { pArgs.PropertyMap.Add(oXmlPath, New XmlItemProperty() With {
.Description = oDescription, .Description = oDescription,
@@ -189,7 +193,9 @@ Public Class ThreadRunner
.IsRequired = oIsRequired, .IsRequired = oIsRequired,
.IsGrouped = oIsGrouped, .IsGrouped = oIsGrouped,
.GroupScope = oGroupScope, .GroupScope = oGroupScope,
.Specification = oSpecification .Specification = oSpecification,
.XMLPath = oXmlPath.Replace(".Value", ""),
.ItemType = oItemType
}) })
Next Next

View File

@@ -3,19 +3,30 @@
public class Config public class Config
{ {
public string Name { get; set; } public string Name { get; set; }
public string LogPath { get; set; } public string LogPath { get; set; }
public string MSSQLConnectionString { get; set; } public string MSSQLConnectionString { get; set; }
public string MaxFileSizeInMegabytes { get; set; } public string MaxFileSizeInMegabytes { get; set; }
public string GDPictureVersion { get; set; }
public ZugferdConfig Zugferd { get; set; } public ZugferdConfig Zugferd { get; set; }
} }
public class ZugferdConfig public class ZugferdConfig
{ {
public bool AllowFacturX { get; set; } = false; public bool AllowFacturX { get; set; } = false;
public bool AllowXRechnung { get; set; } = false; public bool AllowXRechnung { get; set; } = false;
public bool AllowZugferd10 { get; set; } = true; public bool AllowZugferd10 { get; set; } = true;
public bool AllowZugferd2x { get; set; } = true; public bool AllowZugferd2x { get; set; } = true;
public bool AllowPeppolBISBill3x { get; set; } = false;
} }
} }

View File

@@ -10,6 +10,7 @@ using static DigitalData.Modules.Interfaces.ZUGFeRDInterface;
using static DigitalData.Modules.Interfaces.PropertyValues; using static DigitalData.Modules.Interfaces.PropertyValues;
using System.Data.SqlClient; using System.Data.SqlClient;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using System.Xml.Linq;
namespace ZUGFeRDRESTService.Controllers namespace ZUGFeRDRESTService.Controllers
{ {
@@ -40,6 +41,9 @@ namespace ZUGFeRDRESTService.Controllers
private bool _AllowXRechnung; private bool _AllowXRechnung;
private bool _AllowZugferd2x; private bool _AllowZugferd2x;
private bool _AllowZugferd10; private bool _AllowZugferd10;
private bool _AllowPeppolBISBill3x;
private string _GDPictureVersion;
public ValidationController(ILogging logging, IDatabase database, IConfiguration Config) public ValidationController(ILogging logging, IDatabase database, IConfiguration Config)
{ {
@@ -49,21 +53,22 @@ namespace ZUGFeRDRESTService.Controllers
_logger.Debug("Validation Controller initializing"); _logger.Debug("Validation Controller initializing");
_database = database;
var oGDPictureKey = database.GetGDPictureKey();
var oPropertyMap = database.GetPropertyMap();
// Read config file and assign all option flags related to // Read config file and assign all option flags related to
// - Zugferd files // - Zugferd files
// - Filesizes // - Filesizes
ParseConfig(Config); ParseConfig(Config);
_database = database;
var oGDPictureKey = database.GetGDPictureKey();
var oPropertyMap = database.GetPropertyMap();
_zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions() _zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions()
{ {
AllowFacturX_Filename = _AllowFacturX, AllowFacturX_Filename = _AllowFacturX,
AllowXRechnung_Filename = _AllowXRechnung, AllowXRechnung_Filename = _AllowXRechnung,
AllowZugferd_1_0_Schema = _AllowZugferd10, AllowZugferd_1_0_Schema = _AllowZugferd10,
AllowZugferd_2_x_Schema = _AllowZugferd2x AllowZugferd_2_x_Schema = _AllowZugferd2x,
AllowPeppol_3017_Schema = _AllowPeppolBISBill3x
}); });
_props = new PropertyValues(_logConfig); _props = new PropertyValues(_logConfig);
@@ -115,6 +120,19 @@ namespace ZUGFeRDRESTService.Controllers
_AllowZugferd10 = true; _AllowZugferd10 = true;
} }
if (!bool.TryParse(oZugferdConfig["AllowPeppolBISBill3x"], out _AllowPeppolBISBill3x))
{
_logger.Info("Configuration AllowPeppolBISBill3x was not set. Using default value [{0}]", false);
_AllowPeppolBISBill3x = false;
}
_GDPictureVersion = oAppConfig["GDPictureVersion"];
if (string.IsNullOrEmpty(_GDPictureVersion))
{
_logger.Info("Configuration GDPictureVersion was not set. Using default value [string.Empty]");
_GDPictureVersion = string.Empty;
}
if (!int.TryParse(oAppConfig["MaxFileSizeInMegabytes"], out _MaxFileSizeInMegabytes)) if (!int.TryParse(oAppConfig["MaxFileSizeInMegabytes"], out _MaxFileSizeInMegabytes))
{ {
_logger.Info("Configuration MaxFileSizeInMegabytes was not set. Using default value [{0}]", MAX_FILE_SIZE_DEFAULT); _logger.Info("Configuration MaxFileSizeInMegabytes was not set. Using default value [{0}]", MAX_FILE_SIZE_DEFAULT);
@@ -151,7 +169,21 @@ namespace ZUGFeRDRESTService.Controllers
_logger.Info("Extracting ZUGFeRD Data from file [{0}]", file.FileName); _logger.Info("Extracting ZUGFeRD Data from file [{0}]", file.FileName);
oZugferdResult = _zugferd.ExtractZUGFeRDFileWithGDPicture(oStream); if (file.FileName.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase))
{
oZugferdResult = _zugferd.ExtractZUGFeRDFileWithGDPicture(oStream);
}
else if (file.FileName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
{
// Für die Verarbeitung von XML-Belegen
var oResult = new ZugferdResult()
{
DataFileName = file.FileName,
XElementObject = XElement.Load(oStream)
};
oZugferdResult = _zugferd.SerializeZUGFeRDDocument(oResult);
}
_logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification); _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
@@ -238,12 +270,17 @@ namespace ZUGFeRDRESTService.Controllers
}; };
// Determine if any errors should be sent in the response // Determine if any errors should be sent in the response
List<string> oErrors = ex.ErrorType switch var oErrors = new List<string>();
switch (ex.ErrorType)
{ {
// Errors contains the list of missing fields case ErrorType.MissingProperties:
ErrorType.MissingProperties => oPropertyResult.MissingProperties, oErrors.AddRange(from item in oPropertyResult.MissingProperties
_ => new List<string>() select item.Description);
}; break;
default:
break;
}
_logger.Info($"Responding with message: [{oMessage}]"); _logger.Info($"Responding with message: [{oMessage}]");
return new ValidationResponse() return new ValidationResponse()

View File

@@ -1,14 +1,10 @@
using System; using DigitalData.Modules.Database;
using DigitalData.Modules.Interfaces;
using DigitalData.Modules.Config;
using Microsoft.Extensions.Configuration;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient; using DigitalData.Modules.Logging;
using System.Linq;
using System.Threading.Tasks;
using DigitalData.Modules.Database;
using DigitalData.Modules.Interfaces;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace ZUGFeRDRESTService namespace ZUGFeRDRESTService
{ {
@@ -18,6 +14,11 @@ namespace ZUGFeRDRESTService
private string _gdPictureKey = null; private string _gdPictureKey = null;
private Dictionary<string, XmlItemProperty> _propertyMap = null; private Dictionary<string, XmlItemProperty> _propertyMap = null;
private LogConfig _logConfig = null;
private string _connString;
private string _GDPictureVersion;
private const string QUERY_GET_GDPICTURE_KEY = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"; private const string QUERY_GET_GDPICTURE_KEY = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'";
private const string QUERY_GET_PROPERTY_MAP = "SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH"; private const string QUERY_GET_PROPERTY_MAP = "SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH";
@@ -25,12 +26,14 @@ namespace ZUGFeRDRESTService
public Database(ILogging Logging, IConfiguration Config) public Database(ILogging Logging, IConfiguration Config)
{ {
var oLogConfig = Logging.LogConfig; _logConfig = Logging.LogConfig;
var oLogger = Logging.LogConfig.GetLogger(); var oLogger = Logging.LogConfig.GetLogger();
var oAppConfig = Config.GetSection("Config"); var oAppConfig = Config.GetSection("Config");
_connString = oAppConfig["MSSQLConnectionString"];
_GDPictureVersion = oAppConfig["GDPictureVersion"];
oLogger.Debug("Establishing MSSQL Database connection.."); oLogger.Debug("Establishing MSSQL Database connection..");
MSSQL = new MSSQLServer(oLogConfig, oAppConfig["MSSQLConnectionString"]); MSSQL = new MSSQLServer(_logConfig, _connString);
oLogger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString); oLogger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString);
@@ -39,8 +42,7 @@ namespace ZUGFeRDRESTService
public string GetGDPictureKey() public string GetGDPictureKey()
{ {
if (_gdPictureKey == null) _gdPictureKey = ConfigDbFunct.GetProductLicense("GDPICTURE", _GDPictureVersion, _logConfig, _connString);
_gdPictureKey = MSSQL.GetScalarValue(QUERY_GET_GDPICTURE_KEY).ToString();
return _gdPictureKey; return _gdPictureKey;
} }

View File

@@ -1,7 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace ZUGFeRDRESTService namespace ZUGFeRDRESTService
{ {

View File

@@ -1,14 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NLog.Web;
using DigitalData.Modules.Logging;
using System.Reflection;
namespace ZUGFeRDRESTService namespace ZUGFeRDRESTService
{ {

View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using System;
namespace ZUGFeRDRESTService namespace ZUGFeRDRESTService
{ {

View File

@@ -22,8 +22,10 @@
"AllowZugferd10": true, "AllowZugferd10": true,
"AllowZugferd2x": false, "AllowZugferd2x": false,
"AllowFacturX": false, "AllowFacturX": false,
"AllowXRechnung": false "AllowXRechnung": false,
"AllowPeppolBISBill3x": false
}, },
"MaxFileSizeInMegabytes": 25 "GDPictureVersion": "",
"MaxFileSizeInMegabytes": 25
} }
} }