Upgrade .NET8 ZugferdTest

.github/upgrades/dotnet-upgrade-plan.md

@@ -0,0 +1,29 @@
+# .NET 8.0 Upgrade Plan
+
+## Execution Steps
+
+Execute steps below sequentially one by one in the order they are listed.
+
+1. Validate that an .NET 8.0 SDK required for this upgrade is installed on the machine and if not, help to get it installed.
+2. Ensure that the SDK version specified in global.json files is compatible with the .NET 8.0 upgrade.
+3. Upgrade GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj
+
+## Settings
+
+This section contains settings and data used by execution steps.
+
+### Excluded projects
+
+Table below contains projects that do belong to the dependency graph for selected projects and should not be included in the upgrade.
+
+| Project name | Description |
+|:-------------|:-----------:|
+| –            | Keine Projekte ausgeschlossen |
+
+### Project upgrade details
+This section contains details about each project upgrade and modifications that need to be done in the project.
+
+#### GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj modifications
+
+Project properties changes:
+  - Keine Änderungen erforderlich. Das Projekt zielt bereits auf `net8.0-windows` und verwendet kompatible Pakete.

ConfigCreator/MonoRepoUtils.vbproj

@@ -66,15 +66,15 @@
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

Controls.ChatAddUser/ChatAddUser.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.ChatControl/ChatControl.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.ChatNewConv/ChatNewConv.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -64,7 +64,6 @@ Partial Class DocumentViewer
         Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
         Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         Me.lblInfo = New System.Windows.Forms.Label()
-        Me.GdViewer = New GdPicture14.GdViewer()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -347,7 +346,7 @@ Partial Class DocumentViewer
         '
         'SpreadsheetControl1
         '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(59, 181)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177)
         Me.SpreadsheetControl1.MenuManager = Me.BarManager1
         Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
         Me.SpreadsheetControl1.ReadOnly = True
@@ -378,94 +377,13 @@ Partial Class DocumentViewer
         '
         'RichEditControl1
         '
-        Me.RichEditControl1.Location = New System.Drawing.Point(385, 166)
+        Me.RichEditControl1.Location = New System.Drawing.Point(571, 238)
         Me.RichEditControl1.MenuManager = Me.BarManager1
         Me.RichEditControl1.Name = "RichEditControl1"
         Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
         Me.RichEditControl1.TabIndex = 5
         Me.RichEditControl1.Visible = False
         '
-        'lblInfo
-        '
-        Me.lblInfo.Location = New System.Drawing.Point(0, 0)
-        Me.lblInfo.Name = "lblInfo"
-        Me.lblInfo.Size = New System.Drawing.Size(100, 23)
-        Me.lblInfo.TabIndex = 0
-        '
-        'GdViewer
-        '
-        Me.GdViewer.AllowDropFile = False
-        Me.GdViewer.AnimateGIF = True
-        Me.GdViewer.AnnotationDropShadow = True
-        Me.GdViewer.AnnotationEnableMultiSelect = True
-        Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0!
-        Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0)
-        Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0)
-        Me.GdViewer.BackColor = System.Drawing.Color.Black
-        Me.GdViewer.BackgroundImage = Nothing
-        Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.GdViewer.ClipAnnotsToPageBounds = True
-        Me.GdViewer.ClipRegionsToPageBounds = True
-        Me.GdViewer.ContinuousViewMode = True
-        Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic
-        Me.GdViewer.DisplayQualityAuto = True
-        Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter
-        Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter
-        Me.GdViewer.DrawPageBorders = True
-        Me.GdViewer.EnableDeferredPainting = True
-        Me.GdViewer.EnabledProgressBar = True
-        Me.GdViewer.EnableFuzzySearch = False
-        Me.GdViewer.EnableICM = False
-        Me.GdViewer.EnableMenu = True
-        Me.GdViewer.EnableMouseWheel = True
-        Me.GdViewer.EnableTextSelection = True
-        Me.GdViewer.ForceScrollBars = False
-        Me.GdViewer.ForceTemporaryMode = False
-        Me.GdViewer.ForeColor = System.Drawing.Color.Black
-        Me.GdViewer.Gamma = 1.0!
-        Me.GdViewer.HQAnnotationRendering = True
-        Me.GdViewer.IgnoreDocumentResolution = False
-        Me.GdViewer.KeepDocumentPosition = False
-        Me.GdViewer.Location = New System.Drawing.Point(290, 372)
-        Me.GdViewer.LockViewer = False
-        Me.GdViewer.MagnifierHeight = 90
-        Me.GdViewer.MagnifierWidth = 160
-        Me.GdViewer.MagnifierZoomX = 2.0!
-        Me.GdViewer.MagnifierZoomY = 2.0!
-        Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
-        Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
-        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeVerticalScroll
-        Me.GdViewer.Name = "GdViewer"
-        Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
-        Me.GdViewer.PageBordersPenSize = 1
-        Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView
-        Me.GdViewer.PdfDisplayFormField = True
-        Me.GdViewer.PdfEnableFileLinks = True
-        Me.GdViewer.PdfEnableLinks = True
-        Me.GdViewer.PdfIncreaseTextContrast = False
-        Me.GdViewer.PdfShowDialogForPassword = True
-        Me.GdViewer.PdfShowOpenFileDialogForDecryption = True
-        Me.GdViewer.PdfVerifyDigitalCertificates = False
-        Me.GdViewer.PreserveViewRotation = True
-        Me.GdViewer.RectBorderColor = System.Drawing.Color.Black
-        Me.GdViewer.RectBorderSize = 1
-        Me.GdViewer.RectIsEditable = True
-        Me.GdViewer.RegionsAreEditable = True
-        Me.GdViewer.RenderGdPictureAnnots = True
-        Me.GdViewer.ScrollBars = True
-        Me.GdViewer.ScrollLargeChange = CType(50, Short)
-        Me.GdViewer.ScrollSmallChange = CType(1, Short)
-        Me.GdViewer.SilentMode = True
-        Me.GdViewer.Size = New System.Drawing.Size(128, 128)
-        Me.GdViewer.TabIndex = 0
-        Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
-        Me.GdViewer.Zoom = 1.0R
-        Me.GdViewer.ZoomCenterAtMousePosition = False
-        Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100
-        Me.GdViewer.ZoomStep = 25
-        '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

Controls.DocumentViewer/DocumentViewer.resx

@@ -164,6 +164,26 @@
         NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
         OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
         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>
   </data>
   <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -226,26 +246,6 @@
         ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
         LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
         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>
   </data>
   <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Controls.DocumentViewer/DocumentViewer.vb

@@ -596,9 +596,111 @@ Public Class DocumentViewer
             Return False
         End Try
     End Function
+    Private Function DoLoadFile(FilePath As String) As Boolean
+        Try
+            ' Ensure the embedded GdViewer control exists before using it
+            If Not EnsureViewerReady() Then
+                _logger?.Warn("GdViewer control is not initialized yet. Delaying load.")
+                Return False
+            End If
 
+            lblInfo.Visible = False
+            Dim oFileInfo = New FileInfo(FilePath)
+            Dim oExtension As String = oFileInfo.Extension.ToUpper
+
+            lbFileNotLoaded.Visible = False
+
+            SpreadsheetControl1.Visible = False
+            RichEditControl1.Visible = False
+
+            SpreadsheetControl1.Dock = DockStyle.None
+            RichEditControl1.Dock = DockStyle.None
+            Dim Override_SSheet_Filesize As Boolean = False
+            If oExtension.ToLower = ".xlsx" Then
+                If oFileInfo.Length > 100000 Then
+                    _logger.Info("Override Spreadsheet as xlsx is too big")
+                    Override_SSheet_Filesize = True
+                End If
+            End If
+            If Override_SSheet_Filesize Then
+                Dim oFormat = GetSpreadsheetFormat(oExtension)
+                SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                oRange.AutoFitColumns()
+
+                If ViewOverride = "Richtext" Then
+                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+                    RichEditControl1.Visible = True
+                    GdViewer.Visible = False
+                    RichEditControl1.Dock = DockStyle.Fill
+                    _ViewOverride = "Richtext"
+                    _ViewerMode = ViewerMode.Richtext
+                    lblInfo.Visible = True
+                    lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD"
+                Else
+                    _ViewOverride = ""
+                    Select Case oExtension.ToUpper
+                        Case ".CSV"
+                            Dim oFormat = GetSpreadsheetFormat(oExtension)
+                            SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                            Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                        oRange.AutoFitColumns()
+
+                        SpreadsheetControl1.Visible = True
+                        GdViewer.Visible = False
+                        SpreadsheetControl1.Dock = DockStyle.Fill
+                        Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                            RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+
+                            RichEditControl1.Visible = True
+                            GdViewer.Visible = False
+                            RichEditControl1.Dock = DockStyle.Fill
+                        Case Else
+                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                        GdViewer.ForceTemporaryMode = True
+                            GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                            If Viewer_ForceTemporaryMode = True Then
+                                GdViewer.ForceTemporaryMode = True
+                            End If
+
+                            GdViewer.AnnotationDropShadow = True
+                            GdViewer.BackColor = Color.White
+
+                            Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
+                            If oGDPState <> GdPictureStatus.OK Then
+                                _logger.Warn($"GdPictureStatus is [{oGDPState}]")
+                                If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
+                                    DoLoadFile(FilePath, "Richtext")
+                                Else
+                                    Dim oFileName = IO.Path.GetFileName(FilePath)
+                                    lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
+                                lbFileNotLoaded.Visible = True
+                            End If
+
+                        Else
+                            If GdViewer.Visible = False Then
+                                GdViewer.Visible = True
+                            End If
+                        End If
+
+                End Select
+
+
+                Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
 
     ' Ensures the embedded GdViewer control exists and is added to the visual tree
+    Private Function EnsureViewerReady() As Boolean
+        Try
+            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
+            If GdViewer Is Nothing Then
     Private Function EnsureViewerReady() As Boolean
         Try
             ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -265,7 +265,9 @@
     <Compile Include="DocumentViewer.Designer.vb">
       <DependentUpon>DocumentViewer.vb</DependentUpon>
     </Compile>
-    <Compile Include="DocumentViewer.vb" />
+    <Compile Include="DocumentViewer.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="frmViewerSettings.Designer.vb">
       <DependentUpon>frmViewerSettings.vb</DependentUpon>
     </Compile>

Controls.RegexEditor/RegexEditor.vb

@@ -1,6 +1,7 @@
 Imports System.ComponentModel
 Imports System.Drawing.Design
 Imports System.Windows.Forms.Design
+Imports DigitalData.Modules.Language
 
 Public Class RegexEditor
     Inherits UITypeEditor
@@ -11,7 +12,7 @@ Public Class RegexEditor
 
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
         Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim oRegexString As String = If(value IsNot Nothing, value.ToString(), String.Empty)
+        Dim oRegexString As String = Utils.NotNull(value, String.Empty)
 
         If oService IsNot Nothing Then
             Using oform As New frmRegexEditor(oRegexString)

Controls.RegexEditor/RegexEditor.vbproj

@@ -12,7 +12,7 @@
     <AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -60,8 +60,12 @@
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

DBCleaner/DBCleaner.vbproj

@@ -50,10 +50,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

DDMonorepo.sln

@@ -74,6 +74,12 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DBCleaner", "DBCleaner\DBCl
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMIService.Tests\EDMIService.Tests.vbproj", "{E3DA65CA-964D-4896-991A-B5426884E215}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "..\DDModules\Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Verknüpfte Projekte", "Verknüpfte Projekte", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Config", "..\DDModules\Config\Config.vbproj", "{7B7766E6-DC73-19CD-042F-6B95CE11A733}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -180,6 +186,14 @@ Global
 		{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.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
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -210,6 +224,8 @@ Global
 		{9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -66,31 +66,31 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=0.0.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Windows, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
+      <HintPath>..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.ZooFlow, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.ClipboardWatcher/ProfileSearches.vb

@@ -70,11 +70,7 @@ Public Class ProfileSearches
             .WindowGuid = oWindowGuid,
             .WindowTitle = pFormTitle,
             .OperationModeOverride = pOperationMode,
-            .ProfileGuid = pProfile.Guid,
+            .ProfileGuid = pProfile.Guid
-            .WM_SUFFIX = _Environment.Settings.WM_SUFFIX,
-            .MAP_SHAREDRIVE = _Environment.Settings.MAP_SHAREDRIVE,
-            .MAP_BLACKLIST = _Environment.Settings.MAP_BLACKLIST,
-            .SavetoDrive = _Environment.Settings.SavetoDrive
         }
 
         For Each oSearch In oSearches

GUIs.ClipboardWatcher/frmMatch.vb

@@ -53,19 +53,19 @@ Public Class frmMatch
         DATA_ONLY = 2
     End Enum
 
-    Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pParams As ClipboardWatcherParams)
+    Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As ClipboardWatcherParams)
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-        _LogConfig = pLogConfig
+        _LogConfig = LogConfig
-        _Logger = pLogConfig.GetLogger()
+        _Logger = LogConfig.GetLogger()
-        _Environment = pEnvironment
+        _Environment = Environment
-        _Params = pParams
+        _Params = Params
         _ProfileSearch = New ProfileSearches(_LogConfig, _Environment, _Params.ClipboardContents)
 
-        _Logger.Debug("ClipboardContents: [{0}]", pParams.ClipboardContents)
+        _Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents)
-        _Logger.Debug("OperationModeOverride: [{0}]", pParams.OperationModeOverride.ToString)
+        _Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString)
 
         _Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
         Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)

GUIs.Common/Common.vbproj

@@ -71,10 +71,7 @@
     </Reference>
     <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>
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Controls.LookupGrid">
-      <HintPath>..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
@@ -87,8 +84,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.EDMI.API, Version=1.6.1.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.EDMI.API">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -136,68 +132,68 @@
     <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">
+    <Reference Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\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>
+      <HintPath>..\packages\GdPicture.14.3.19\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">
@@ -213,6 +209,12 @@
     <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="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.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>
@@ -458,7 +460,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DocumentResultList\frmDocumentResultList.en.resx">
       <DependentUpon>frmDocumentResultList.vb</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DocumentResultList\frmDocumentResultList.fr.resx">
       <DependentUpon>frmDocumentResultList.vb</DependentUpon>
@@ -536,6 +537,12 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
+      <Project>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</Project>
+      <Name>LookupControl</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\txt.png" />
@@ -820,8 +827,8 @@
     </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'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.19\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')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" />
 </Project>

GUIs.Common/DocumentResultList/Params.vb

@@ -13,10 +13,6 @@ Namespace DocumentResultList
         Public ProfileGuid As Integer
         Public ShowBackNavigation As Boolean = True
         Public ShowFileList As Boolean = True
-        Public WM_SUFFIX As String = ""
-        Public MAP_SHAREDRIVE As String = ""
-        Public MAP_BLACKLIST As String
-        Public SavetoDrive As Boolean = False
     End Class
 
     Public Class DocumentResult

GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb

@@ -24,7 +24,7 @@ Partial Class frmDocumentResultList
         Dim FadeTransition1 As DevExpress.Utils.Animation.FadeTransition = New DevExpress.Utils.Animation.FadeTransition()
         Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
-        Me.GridViewResult = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
+        Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
         Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
@@ -68,13 +68,12 @@ Partial Class frmDocumentResultList
         Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem()
         Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem()
         Me.lblCurrentWorkspace = New DevExpress.XtraBars.BarStaticItem()
-        Me.bbtnitemExportFiles = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageRefresh = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupCheckInOut = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupWorkflow = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupAttribute = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -124,7 +123,7 @@ Partial Class frmDocumentResultList
         Me.SplitContainerControl1.Panel2.SuspendLayout()
         Me.SplitContainerControl1.SuspendLayout()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridViewResult, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -184,27 +183,27 @@ Partial Class frmDocumentResultList
         'GridControl1
         '
         resources.ApplyResources(Me.GridControl1, "GridControl1")
-        Me.GridControl1.MainView = Me.GridViewResult
+        Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.MenuManager = Me.RibbonControl
         Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResult})
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
-        'GridViewResult
+        'GridView1
         '
-        Me.GridViewResult.Appearance.FocusedCell.BackColor = System.Drawing.Color.Gainsboro
+        Me.GridView1.Appearance.FocusedCell.BackColor = System.Drawing.Color.Gainsboro
-        Me.GridViewResult.Appearance.FocusedCell.Options.UseBackColor = True
+        Me.GridView1.Appearance.FocusedCell.Options.UseBackColor = True
-        Me.GridViewResult.Appearance.FocusedRow.BackColor = System.Drawing.Color.Gainsboro
+        Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Gainsboro
-        Me.GridViewResult.Appearance.FocusedRow.Options.UseBackColor = True
+        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridViewResult.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1})
+        Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1})
-        Me.GridViewResult.GridControl = Me.GridControl1
+        Me.GridView1.GridControl = Me.GridControl1
-        Me.GridViewResult.Name = "GridViewResult"
+        Me.GridView1.Name = "GridView1"
-        Me.GridViewResult.OptionsBehavior.Editable = False
+        Me.GridView1.OptionsBehavior.Editable = False
-        Me.GridViewResult.OptionsBehavior.ReadOnly = True
+        Me.GridView1.OptionsBehavior.ReadOnly = True
-        Me.GridViewResult.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridViewResult.OptionsView.ShowAutoFilterRow = True
+        Me.GridView1.OptionsView.ShowAutoFilterRow = True
-        Me.GridViewResult.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewResult.OptionsView.ShowIndicator = False
+        Me.GridView1.OptionsView.ShowIndicator = False
-        Me.GridViewResult.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False]
         '
         'GridBand1
         '
@@ -222,9 +221,9 @@ Partial Class frmDocumentResultList
         Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         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.bbtnitemExportFiles})
+        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 = 63
+        Me.RibbonControl.MaxItemId = 61
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
         Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize})
@@ -258,6 +257,7 @@ Partial Class frmDocumentResultList
         Me.BarButtonItemExportGrid1.Id = 3
         Me.BarButtonItemExportGrid1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItemExportGrid1.Name = "BarButtonItemExportGrid1"
+        Me.BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'BarStaticItem1
         '
@@ -530,16 +530,9 @@ Partial Class frmDocumentResultList
         Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}"
         '
-        'bbtnitemExportFiles
-        '
-        resources.ApplyResources(Me.bbtnitemExportFiles, "bbtnitemExportFiles")
-        Me.bbtnitemExportFiles.Id = 61
-        Me.bbtnitemExportFiles.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitemExportFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtnitemExportFiles.Name = "bbtnitemExportFiles"
-        '
         'RibbonPageStart
         '
-        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupExport, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
+        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
         Me.RibbonPageStart.Name = "RibbonPageStart"
         resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart")
         '
@@ -550,6 +543,13 @@ Partial Class frmDocumentResultList
         Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation"
         resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation")
         '
+        'RibbonPageGroupExport
+        '
+        Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1)
+        Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
+        resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
+        '
         'RibbonPageRefresh
         '
         Me.RibbonPageRefresh.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
@@ -572,13 +572,6 @@ Partial Class frmDocumentResultList
         Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem"
         resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem")
         '
-        'RibbonPageGroupExport
-        '
-        Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1)
-        Me.RibbonPageGroupExport.ItemLinks.Add(Me.bbtnitemExportFiles)
-        Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
-        resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
-        '
         'RibbonPageGroupCheckInOut
         '
         Me.RibbonPageGroupCheckInOut.ItemLinks.Add(Me.MenuItemCheckOutFile)
@@ -751,7 +744,6 @@ Partial Class frmDocumentResultList
         resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
         Me.DocumentViewer1.FileLoaded = False
         Me.DocumentViewer1.Name = "DocumentViewer1"
-        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
         '
         'XtraSaveFileDialog
         '
@@ -942,7 +934,7 @@ Partial Class frmDocumentResultList
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerControl1.ResumeLayout(False)
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridViewResult, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1010,7 +1002,7 @@ Partial Class frmDocumentResultList
     Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
     Friend WithEvents labelCriticalError As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents labelWarning As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents GridViewResult As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView
     Friend WithEvents GridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
     Friend WithEvents MenuItemFileOpen As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents MenuItemPropertiesIDB As DevExpress.XtraBars.BarButtonItem
@@ -1078,5 +1070,4 @@ Partial Class frmDocumentResultList
     Friend WithEvents btnSaveAsMySearch As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents lblCurrentWorkspace As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents bbtnitemExportFiles As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.Common/DocumentResultList/frmDocumentResultList.resx

@@ -230,28 +230,29 @@
   <data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAESSURB
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB
-        VDhPpVMxSkNREPx9rNIEFMQmRW4gNkmVbq4gCN4jMHXSp7f0AtNahVS5QToFG0mp1ZcJm/D+5iloioH9
+        VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8
-        uzPzd/e914BqEqagFqBWoHYBx8651uGXHzeg5qBeQM1AjUH1A46dc80cczsGTjyBWoIatm3b1OBacMzd
+        tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI
-        mxwM7OpCL4syzAmuNXsDz+XWOn8GNQC1BtWC+gT1kDqxZuoPL2eWxCNQ2xC/grqtdOKdLBx4w+OiMAH1
+        8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr
-        EWLXLrM4eF7syoGPqR/Je1BfIa6iMPDp7GoGnvdE+JtBHuEO1HsIvMSr3H4eobbEa1CbMHmzacXguMSf
+        avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC
-        jvEC1HOYeKzHotY5RuOsi2ScfZUPJv9+TCX+9Jy/AcUnQlOuZReWAAAAAElFTkSuQmCC
+        a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJHSURB
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB
-        VFhHxZe9ihVBEIXXSDYUFUQw28zM0MxU9iQismhgpGgi7BOsVLxs7Cv4BgW7byD+ggiCsJmBiSC4KOqV
+        VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY
-        79K1zJY9Mz1XZYJzuVNddepMd3V1z9pisVibE8sfmbfgosy3ZL4n8wOZH8r8qID/2BjDB98c/wdaBVyW
+        zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x
-        +WOZv5b5ohH4EkNs5msWcErmD2T+vJD+kvm+zHdkvinzDZmvF/AfG2P44EsMsXDAlfkHBVyQ+W7njZ7K
+        QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5
-        /EZevz7gW2IiHi44mwTg+KQEfpD5tsxP5yRjIKbEwgEXnCdE1AQwVfHmL2V+MxNPBRyFK2bieDkYD6cA
+        yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25
-        6xVv/tfJA0VEzAQ5qgKo2Ci47UySCCXzb6ny38v8UvbtxLAcUZjL3ZEFsG2i4HrXvBRYTv6OvZ99Uxw1
+        Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1
-        EYVJrhMCaBzsXbZPb7XL/JbMv6fkbymu7FtDEU8Oci0FxwDdC7L9HNQJvi3zHyk5ROez7xBKnyB2i+cw
+        arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER
-        0kIx7uSAMn63kvyFzM9m3zGUZkX8Hs9hpI9j3KwE3JP5z5T8mczPZN8WlI4JxwHPYeQwwbiRnB922urK
+        inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi
-        SJy0beyHXQGcaBjXO46P/kVykARwdmA/GhNwvzL1K6FFQN8S3KkU32QkzuoSDBVhrfGstAMKX7UIx7bh
+        kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR
-        dZl/TSI4YCaL6NuGLY3omsy/VEScy75D6GtEra34qsw/JxGvWrvhUCsGrYfRFZl/mipi7DACU45jfD8m
+        DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF
-        EW+GRLQcx2DWCwmY/UoGZr2UdkXMdi0PzPph0sVsn2YZ/+/jdE78BmdK1op4DTduAAAAAElFTkSuQmCC
+        RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe
+        9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BarButtonResetGridLayout.Caption" xml:space="preserve">
@@ -521,7 +522,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.6.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>DockPanel1_Container</value>
@@ -587,7 +588,7 @@
     <value>CtrlObjectPropertyDialog</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
-    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.5.8.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
     <value>DockPanel3_Container</value>
@@ -933,10 +934,10 @@
   <data name="$this.Text" xml:space="preserve">
     <value>Dokumenten Suche</value>
   </data>
-  <data name="&gt;&gt;GridViewResult.Name" xml:space="preserve">
+  <data name="&gt;&gt;GridView1.Name" xml:space="preserve">
-    <value>GridViewResult</value>
+    <value>GridView1</value>
   </data>
-  <data name="&gt;&gt;GridViewResult.Type" xml:space="preserve">
+  <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridBand1.Name" xml:space="preserve">
@@ -1191,12 +1192,6 @@
   <data name="&gt;&gt;lblCurrentWorkspace.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;bbtnitemExportFiles.Name" xml:space="preserve">
-    <value>bbtnitemExportFiles</value>
-  </data>
-  <data name="&gt;&gt;bbtnitemExportFiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -1209,6 +1204,12 @@
   <data name="&gt;&gt;RibbonPageGroup_Navigation.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroupExport.Name" xml:space="preserve">
+    <value>RibbonPageGroupExport</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupExport.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageRefresh.Name" xml:space="preserve">
     <value>RibbonPageRefresh</value>
   </data>
@@ -1227,12 +1228,6 @@
   <data name="&gt;&gt;RibbonPageGroupFilesystem.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroupExport.Name" xml:space="preserve">
-    <value>RibbonPageGroupExport</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroupExport.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;RibbonPageGroupCheckInOut.Name" xml:space="preserve">
     <value>RibbonPageGroupCheckInOut</value>
   </data>
@@ -1389,32 +1384,15 @@
   <data name="btnSaveAsMySearch.Caption" xml:space="preserve">
     <value>Als meine Suche speichern</value>
   </data>
-  <data name="bbtnitemExportFiles.Caption" xml:space="preserve">
-    <value>Export</value>
-  </data>
-  <data name="bbtnitemExportFiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IkV4cG9ydCI+DQogICAgPHBhdGgg
-        ZD0iTTEwLDEySDZWNmg0VjEyeiBNMjIsMTJ2NnY5YzAsMC42LTAuNCwxLTEsMUgxYy0wLjYsMC0xLTAu
-        NC0xLTFWN2MwLTAuNiwwLjQtMSwxLTFoM3Y4aDE0di0ySDIyeiBNMTgsMThINCAgIHY2aDE0VjE4eiIg
-        Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMTAgMjQsMTAgMjQsMTQgMzIs
-        OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="RibbonPageGroup_Navigation.Text" xml:space="preserve">
     <value>Navigation</value>
   </data>
+  <data name="RibbonPageGroupExport.Text" xml:space="preserve">
+    <value>Export</value>
+  </data>
   <data name="RibbonPageRefresh.Text" xml:space="preserve">
     <value>Aktualisieren</value>
   </data>
@@ -1424,9 +1402,6 @@
   <data name="RibbonPageGroupFilesystem.Text" xml:space="preserve">
     <value>Dateien und Ordner</value>
   </data>
-  <data name="RibbonPageGroupExport.Text" xml:space="preserve">
-    <value>Export</value>
-  </data>
   <data name="RibbonPageGroupCheckInOut.Text" xml:space="preserve">
     <value>Bearbeiten</value>
   </data>

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -29,11 +29,9 @@ Public Class frmDocumentResultList
 
     ' Interface implementations
     Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
+    Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger
     Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
 
-    Private Const CopyWM2Temp As Boolean = False
-
     ' Helper Classes
     Private EDMI_API_Client As Client
     Private Documentloader As Loader
@@ -52,12 +50,6 @@ Public Class frmDocumentResultList
     Private ReadOnly Workspace As Workspace(Of Config)
     Private WithEvents Watcher As Watcher
 
-    Private CopyWMFile2Temp As Boolean = False
-    Private WM_SUFFIX As String = "\\WINDREAM\OBJECTS"
-    Private MAP_SHAREDRIVE As String = ""
-    Private MAP_BLACKLIST As String = ""
-    Private SavetoDrive As Boolean = False
-
     ' Runtime variables
     Private Property ResultLists As List(Of DocumentResult)
 
@@ -87,7 +79,6 @@ Public Class frmDocumentResultList
     Private Property GridList As List(Of GridControl)
     Private Property ViewList As List(Of BandedGridView)
     Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
-    Private _documentPathHandler As DocumentPathHandler
 
     Public ReadOnly Property Config1 As ConfigManager(Of Config)
         Get
@@ -121,32 +112,21 @@ Public Class frmDocumentResultList
         ResultLists = pParams.Results
 
         LogConfig = pLogConfig
-        _Logger = pLogConfig.GetLogger()
+        Logger = pLogConfig.GetLogger()
-
-        SavetoDrive = pParams.SavetoDrive
-        _Logger.Debug("SavetoDrive setting is set to [{0}]", SavetoDrive)
-
-
         FormHelper = New FormHelper(pLogConfig, Me)
-        _documentPathHandler = New DocumentPathHandler(pLogConfig)
 
         UserLanguage = ObjectEx.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
-        LanguageEx.LogApplicationLanguage(_Logger)
+        LanguageEx.LogApplicationLanguage(Logger)
-        LanguageEx.SetApplicationLanguage(_Logger, UserLanguage)
+        LanguageEx.SetApplicationLanguage(Logger, UserLanguage)
 
         Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath)
         Helpers = New DocumentResultList.Helpers(pLogConfig)
         Filesystem = New FilesystemEx(pLogConfig)
-        GridBuilder = New GridBuilder(New List(Of GridView) From {GridViewResult, GridView2, GridView3})
+        GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
         FileEx = New Modules.Windows.File(pLogConfig)
-        LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridViewResult, GridView2, GridView3}, pEnvironment)
+        LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment)
         Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage)
 
-        CopyWMFile2Temp = Environment.Settings.CopyWMFile2Temp
-        WM_SUFFIX = Environment.Settings.WM_SUFFIX
-        MAP_SHAREDRIVE = Environment.Settings.MAP_SHAREDRIVE
-        MAP_BLACKLIST = Environment.Settings.MAP_BLACKLIST
-        _Logger.Info($"Initialisierung frmDocumentResultList mit WM_SUFFIX=[{WM_SUFFIX}], MAP_SHAREDRIVE=[{MAP_SHAREDRIVE}], MAP_BLACKLIST=[{MAP_BLACKLIST}], CopyWMFile2Temp=[{CopyWMFile2Temp}], SavetoDrive = [{SavetoDrive}]")
     End Sub
 
     Private Function GetOperationMode() As OperationMode
@@ -159,18 +139,18 @@ Public Class frmDocumentResultList
                 oOperationMode = OperationMode.NoAppServer
             End If
 
-            _Logger.Debug("OperationMode set to [{0}]", oOperationMode)
+            Logger.Debug("OperationMode set to [{0}]", oOperationMode)
 
             If Params.OperationModeOverride <> OperationMode.None Then
-                _Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride)
+                Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride)
                 oOperationMode = Params.OperationModeOverride
             End If
 
-            _Logger.Debug("OperationMode is now [{0}]", oOperationMode)
+            Logger.Debug("OperationMode is now [{0}]", oOperationMode)
 
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
-            _Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
+            Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
         End Try
 
         Return oOperationMode
@@ -186,7 +166,7 @@ Public Class frmDocumentResultList
 
             End If
 
-            LanguageEx.LogApplicationLanguage(_Logger)
+            LanguageEx.LogApplicationLanguage(Logger)
 
             Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User)
 
@@ -235,12 +215,7 @@ Public Class frmDocumentResultList
             Else
                 RibbonPageGroupFilesystem.Visible = False
             End If
-            'If SavetoDrive = True Then
+
-            bbtnitemExportFiles.Visibility = BarItemVisibility.Always
-            'Else
-            '    _Logger.Debug("SavetoDrive is set to False, hiding export button")
-            '    bbtnitemExportFiles.Visibility = BarItemVisibility.Never
-            'End If
             chkGridShowQuickfilter.Checked = LayoutManager.GetFilterRowVisible()
             chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible()
             chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
@@ -288,14 +263,13 @@ Public Class frmDocumentResultList
 
             ' This loads the default workspace, for now
             Workspace.LoadWorkspace(Config.Config.SelectedWorkspace)
-            ' Selektion zuverlässig setzen
+
-            SelectFirstRowInGrid1()
 
             ' This needs to done be after loading the grid
             ' so we can set the row handle and start loading the (only) file
             If Params.ShowFileList = False Then
                 DockPanelFileList.HideImmediately()
-                GridViewResult.FocusedRowHandle = 0
+                GridView1.FocusedRowHandle = 0
             Else
                 DockPanelFileList.Show()
             End If
@@ -324,13 +298,7 @@ Public Class frmDocumentResultList
 
         End Try
     End Sub
-    Private Sub SelectFirstRowInGrid1()
+
-        If GridViewResult.RowCount > 0 Then
-            GridViewResult.FocusedRowHandle = 0
-        Else
-            GridViewResult.FocusedRowHandle = GridControl.InvalidRowHandle
-        End If
-    End Sub
     Private Sub Workspace_WorkspaceLoaded(sender As Object, e As String)
         lblCurrentWorkspace.Caption = String.Format(lblCurrentWorkspace.Tag, e)
     End Sub
@@ -348,23 +316,12 @@ Public Class frmDocumentResultList
             End If
 
             DocumentViewer1.Done()
-            If _documentPathHandler IsNot Nothing Then
-                _documentPathHandler.Cleanup()
-            End If
-            Try
-                If CopyWM2Temp = True Then
-                    _Logger.Debug("🗑️ Bereinige Temp-Ordner beim Schließen...")
-                    _documentPathHandler.CleanupTempFolder()
-                End If
-            Catch cleanupEx As Exception
-                _Logger.Warn($"⚠️ Fehler beim Bereinigen des Temp-Ordners: {cleanupEx.Message}")
-            End Try
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 
-    Private Async Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridViewResult.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged
+    Private Async Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged
         Helpers.SetRowHandle(e)
 
         Try
@@ -384,46 +341,19 @@ Public Class frmDocumentResultList
                 End If
 
                 UpdateRibbonActions(oDocument)
-                If IsNothing(oDocument) Then
+
-                    DocumentViewer1.CloseDocument()
-                    FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged")
-                    Exit Sub
-                End If
                 ' Save reference to current document
                 _CurrentDocument = oDocument
 
                 ' Load Document in Document Viewer
                 Dim oFileName = $"{oObjectId}.{oDocument.Extension}"
-                If Not IsNothing(oDocument.Contents) And CopyWM2Temp = False Then
+                DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
-                    _Logger.Debug("Loading document into viewer with MemoryStream handler (LoadFile_FromStream). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
+                If IsNothing(oDocument) Then
-                    DocumentViewer1.LoadFile_FromStream(oFileName, New MemoryStream(oDocument.Contents))
+                    DocumentViewer1.CloseDocument()
-                Else
+                    FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged")
-                    Dim oResolvedFilename As String = oFullPath
+
-                    If CopyWM2Temp = True AndAlso Not String.IsNullOrWhiteSpace(oResolvedFilename) Then
+                    Exit Sub
-                        Dim options As New DocumentPathHandler.DocumentPathOptions With {
-                            .EnableMapping = True,
-                            .WMSuffix = WM_SUFFIX,
-                            .SpecificDrive = If(Len(MAP_SHAREDRIVE) = 1, MAP_SHAREDRIVE, ""),
-                            .DriveBlacklist = MAP_BLACKLIST,
-                            .CopyToTemp = True,
-                            .TempFolder = TEMP_DOCUMENT_FOLDER,
-                            .UnmapAfterCopy = True
-                        }
-                        Dim result = _documentPathHandler.ProcessDocumentPath(oResolvedFilename, options)
-                        If result.Success AndAlso Not String.IsNullOrWhiteSpace(result.FinalPath) AndAlso File.Exists(result.FinalPath) Then
-                            _Logger.Info($"✓ Zusatzdokument via Temp aufgelöst: [{result.FinalPath}]")
-                            oResolvedFilename = result.FinalPath
-                        Else
-                            _Logger.Warn($"⚠️ Temp-Auflösung fehlgeschlagen für [{oResolvedFilename}]: {result.ErrorMessage} - Fallback auf Originalpfad")
-                            oResolvedFilename = oFullPath
                 End If
-                    Else
-                        _Logger.Debug("Keine Temp-Kopie für Dokument erforderlich oder möglich. Originalpfad wird verwendet. ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
-                    End If
-                    _Logger.Debug("Loading document into viewer from filepath (LoadFile_FromPath). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oResolvedFilename)
-                    DocumentViewer1.LoadFile_FromPath(oResolvedFilename)
-                End If
-                'End If
 
                 If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
                     Await CtrlObjectPropertyDialog.LoadObject(oObjectId)
@@ -468,12 +398,16 @@ Public Class frmDocumentResultList
             ' Hide Export and filesystem options for view only right
             If pDocument.AccessRight = Rights.AccessRight.VIEW_ONLY Then
                 DocumentViewer1.SetViewOnly(True)
+                RibbonPageGroupExport.Visible = False
+
                 If OperationMode = OperationMode.NoAppServer Then
                     RibbonPageGroupFilesystem.Visible = False
                     MenuItemProperties.Visibility = BarItemVisibility.Never
                 End If
             Else
                 DocumentViewer1.SetViewOnly(False)
+                RibbonPageGroupExport.Visible = True
+
                 If OperationMode = OperationMode.NoAppServer Then
                     RibbonPageGroupFilesystem.Visible = True
                     MenuItemProperties.Visibility = BarItemVisibility.Always
@@ -482,7 +416,7 @@ Public Class frmDocumentResultList
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -597,7 +531,7 @@ Public Class frmDocumentResultList
         CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client)
 
         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
         End If
 
@@ -615,8 +549,8 @@ Public Class frmDocumentResultList
             IsLoading = True
             Try
                 ' Save current row handle and unset it
-                Dim oCurrentRowHandle As Integer = GridViewResult.FocusedRowHandle
+                Dim oCurrentRowHandle As Integer = GridView1.FocusedRowHandle
-                GridViewResult.FocusedRowHandle = GridControl.InvalidRowHandle
+                GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
 
                 ' Save the new results
                 ResultLists = pResults
@@ -628,18 +562,13 @@ Public Class frmDocumentResultList
                 UpdateTotalResults()
                 LoadGridDataAndLayout()
 
-                ' Restore old selection only if still valid; otherwise select first row
+                ' After the new results are loaded, set the old row handle
-                If GridViewResult.IsValidRowHandle(oCurrentRowHandle) Then
+                ' to trigger the row change events and load object properties
-                    GridViewResult.FocusedRowHandle = oCurrentRowHandle
+                GridView1.FocusedRowHandle = oCurrentRowHandle
-                ElseIf GridViewResult.RowCount > 0 Then
-                    GridViewResult.FocusedRowHandle = 0
-                Else
-                    GridViewResult.FocusedRowHandle = GridControl.InvalidRowHandle
-                End If
 
                 Return True
             Catch ex As Exception
-                _Logger.Error(ex)
+                Logger.Error(ex)
 
                 MessageBox.Show("Error while refreshing results:" & vbNewLine & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
                 Return False
@@ -651,12 +580,12 @@ Public Class frmDocumentResultList
 
     Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult)
         If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then
-            _Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
+            Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
             'Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
         End If
 
         If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then
-            _Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
+            Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
             'Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
         End If
 
@@ -685,9 +614,9 @@ Public Class frmDocumentResultList
                 Case 0
                     Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(0)
 
-                    LoadGridData(GridViewResult, oResult)
+                    LoadGridData(GridView1, oResult)
                     'LayoutManager.GridView_RestoreLayout(GridView1)
-                    CreateDocumentGrid(GridViewResult, oResult)
+                    CreateDocumentGrid(GridView1, oResult)
                     UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count)
 
                 Case 1
@@ -852,9 +781,9 @@ Public Class frmDocumentResultList
             GridView.BestFitColumns()
         Catch ex As ApplicationException
             MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text)
-            _Logger.Error(ex)
+            Logger.Error(ex)
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 
@@ -910,7 +839,7 @@ Public Class frmDocumentResultList
         SetActiveGridBand()
     End Sub
 
-    Private Sub GridView1_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridViewResult.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged
+    Private Sub GridView1_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged
         Dim oGrid As GridControl = sender.GridControl
         _ActiveGrid = oGrid
     End Sub
@@ -927,7 +856,7 @@ Public Class frmDocumentResultList
         End If
     End Sub
 
-    Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridViewResult.ColumnFilterChanged
+    Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView1.ColumnFilterChanged
         Dim oRowCount = sender.RowCount
         UpdateGridHeader(ResultLists, 0, oRowCount)
     End Sub
@@ -953,7 +882,7 @@ Public Class frmDocumentResultList
                 Await Watcher.OpenDocument(_CurrentDocument)
             End If
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 
@@ -1019,7 +948,7 @@ Public Class frmDocumentResultList
         Try
             Await Watcher.OpenDocument(_CurrentDocument)
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 
@@ -1079,7 +1008,7 @@ Public Class frmDocumentResultList
 #End Region
 #Region "Drag to Export"
 
-    Private Sub GridView1_MouseDown(sender As GridView, e As MouseEventArgs) Handles GridViewResult.MouseDown
+    Private Sub GridView1_MouseDown(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseDown
         If sender.FocusedRowHandle >= 0 Then
             Dim oDragSize As Size = SystemInformation.DragSize
 
@@ -1090,11 +1019,11 @@ Public Class frmDocumentResultList
         End If
     End Sub
 
-    Private Sub GridView1_MouseUp(sender As GridView, e As MouseEventArgs) Handles GridViewResult.MouseUp
+    Private Sub GridView1_MouseUp(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseUp
         _DragBoxFromMouseDown = Rectangle.Empty
     End Sub
 
-    Private Sub GridView1_MouseMove(sender As GridView, e As MouseEventArgs) Handles GridViewResult.MouseMove
+    Private Sub GridView1_MouseMove(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseMove
         If e.Button AndAlso e.Button = MouseButtons.Left Then
             If _DragBoxFromMouseDown <> Rectangle.Empty And Not _DragBoxFromMouseDown.Contains(e.X, e.Y) Then
 
@@ -1127,7 +1056,7 @@ Public Class frmDocumentResultList
                 End If
             End If
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
 
     End Sub
@@ -1169,7 +1098,7 @@ Public Class frmDocumentResultList
     End Sub
 
     Private Sub BarButtonItem11_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem11.ItemClick
-        GridViewResult.ShowCustomization()
+        GridView1.ShowCustomization()
     End Sub
 
     Private Sub CtrlObjectPropertyDialog_Enter(sender As Object, e As EventArgs) Handles CtrlObjectPropertyDialog.Enter
@@ -1180,7 +1109,7 @@ Public Class frmDocumentResultList
         RibbonPageGroupAttribute.Enabled = False
     End Sub
 
-    Private Sub GridView1_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridViewResult.RowStyle
+    Private Sub GridView1_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridView1.RowStyle
         Dim oGridView As BandedGridView = sender
         Dim oRow As DataRowView = oGridView.GetRow(e.RowHandle)
 
@@ -1243,100 +1172,7 @@ Public Class frmDocumentResultList
 
     End Sub
 
-    Private Sub bbtnitemExportFiles_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtnitemExportFiles.ItemClick
+    Private Sub GridView_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged, GridView2.FocusedRowChanged, GridView1.FocusedRowChanged
-        Try
-            ' Zielordner wählen
-            Using oFolderDialog As New FolderBrowserDialog()
-                oFolderDialog.Description = "Choose folder for filexport"
-                oFolderDialog.ShowNewFolderButton = True
 
-                If oFolderDialog.ShowDialog() <> DialogResult.OK Then
-                    Exit Sub
-                End If
-
-                Dim oTargetFolder As String = oFolderDialog.SelectedPath
-                Dim oActiveView As BandedGridView = DirectCast(If(GetActiveGridControl()?.DefaultView, GridViewResult), BandedGridView)
-
-                Dim oCopied As Integer = 0
-                Dim oSkipped As Integer = 0
-                Dim oErrors As New List(Of String)
-
-                ' Alle sichtbaren (nicht gefilterten) Zeilen durchlaufen
-                For oRowHandle As Integer = 0 To oActiveView.RowCount - 1
-                    Try
-                        Dim oRow = oActiveView.GetDataRow(oRowHandle)
-                        If oRow Is Nothing Then
-                            Continue For
-                        End If
-
-                        Dim oFilePath = oRow.ItemEx(ColumnFilepath, "")
-                        If String.IsNullOrWhiteSpace(oFilePath) Then
-                            oSkipped += 1
-                            Continue For
-                        End If
-
-                        ' Pfadauflösung via CopyWM2Temp – analog zu GridView_FocusedRowChanged
-                        Dim oResolvedPath As String = oFilePath
-                        If CopyWM2Temp = True AndAlso Not String.IsNullOrWhiteSpace(oResolvedPath) Then
-                            Dim oOptions As New DocumentPathHandler.DocumentPathOptions With {
-                                .EnableMapping = True,
-                                .WMSuffix = WM_SUFFIX,
-                                .SpecificDrive = If(Len(MAP_SHAREDRIVE) = 1, MAP_SHAREDRIVE, ""),
-                                .DriveBlacklist = MAP_BLACKLIST,
-                                .CopyToTemp = True,
-                                .TempFolder = TEMP_DOCUMENT_FOLDER,
-                                .UnmapAfterCopy = True
-                            }
-                            Dim oResult = _documentPathHandler.ProcessDocumentPath(oResolvedPath, oOptions)
-                            If oResult.Success AndAlso Not String.IsNullOrWhiteSpace(oResult.FinalPath) AndAlso File.Exists(oResult.FinalPath) Then
-                                _Logger.Info($"✓ Exportpfad via Temp aufgelöst: [{oResult.FinalPath}]")
-                                oResolvedPath = oResult.FinalPath
-                            Else
-                                _Logger.Warn($"⚠️ Temp-Auflösung fehlgeschlagen für [{oFilePath}]: {oResult.ErrorMessage} - Fallback auf Originalpfad")
-                                oResolvedPath = oFilePath
-                            End If
-                        End If
-
-                        If Not File.Exists(oResolvedPath) Then
-                            _Logger.Warn($"Datei nicht gefunden, wird übersprungen: [{oResolvedPath}]")
-                            oErrors.Add(oResolvedPath)
-                            Continue For
-                        End If
-
-                        Dim oDestFileName = Path.GetFileName(oResolvedPath)
-                        Dim oDestPath = Path.Combine(oTargetFolder, oDestFileName)
-
-                        ' Bei Namenskollision Suffix anhängen
-                        If File.Exists(oDestPath) Then
-                            Dim oBaseName = Path.GetFileNameWithoutExtension(oDestFileName)
-                            Dim oExt = Path.GetExtension(oDestFileName)
-                            oDestPath = Path.Combine(oTargetFolder, $"{oBaseName}_{oRowHandle}{oExt}")
-                        End If
-
-                        File.Copy(oResolvedPath, oDestPath)
-                        oCopied += 1
-                        _Logger.Debug($"Datei exportiert: [{oResolvedPath}] → [{oDestPath}]")
-
-                    Catch ex As Exception
-                        _Logger.Error(ex)
-                        oErrors.Add(ex.Message)
-                    End Try
-                Next
-
-                ' Ergebnismeldung
-                Dim oMsg As String = $"{oCopied} Datei(en) erfolgreich exportiert."
-                If oSkipped > 0 Then
-                    oMsg &= $"{vbNewLine}{oSkipped} Zeile(n) ohne Dateipfad übersprungen."
-                End If
-                If oErrors.Count > 0 Then
-                    oMsg &= $"{vbNewLine}{oErrors.Count} Fehler:{vbNewLine}{String.Join(vbNewLine, oErrors)}"
-                    FormHelper.ShowErrorMessage(New IOException(oMsg), "Dateiexport")
-                Else
-                    FormHelper.ShowSuccessMessage(oMsg, "Dateiexport")
-                End If
-            End Using
-        Catch ex As Exception
-            FormHelper.ShowErrorMessage(ex, "bbtnitemExportFiles_ItemClick")
-        End Try
     End Sub
 End Class

GUIs.Common/GridBuilder.vb

@@ -82,7 +82,7 @@ Public Class GridBuilder
             ToList()
 
         For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol, "g")
+            SetDateTimeColumn(oDateCol)
         Next
     End Sub
 
@@ -96,61 +96,19 @@ Public Class GridBuilder
             ToList()
 
         For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol, "g")
+            SetDateTimeColumn(oDateCol)
         Next
     End Sub
 
-    ''' <summary>
+    Private Sub SetDateTimeColumn(pColumn As GridColumn)
-    ''' Applies a proper datetime format string to all columns of the view. 
-    ''' </summary>
-    ''' <remarks>The view's columns need to be loaded for this to work!</remarks>
-    Public Sub SetDateTimeColumns(pView As GridView, pFormatString As String)
-        If pView.Columns Is Nothing Then
-            Exit Sub
-        End If
-
-        Dim oDateColumns = pView.Columns.AsEnumerable.
-            Where(Function(column As GridColumn) column.ColumnType = GetType(Date)).
-            ToList()
-
-        For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol, pFormatString)
-        Next
-    End Sub
-
-    Public Sub SetDateTimeColumns(pTreeList As TreeList, pFormatString As String)
-        If pTreeList.Columns Is Nothing Then
-            Exit Sub
-        End If
-
-        Dim oDateColumns = pTreeList.Columns.AsEnumerable.
-            Where(Function(column As TreeListColumn) column.ColumnType = GetType(Date)).
-            ToList()
-
-        For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol, pFormatString)
-        Next
-    End Sub
-
-    Private Sub SetDateTimeColumn(pColumn As GridColumn, pFormatString As String)
-
-        If String.IsNullOrEmpty(pFormatString) Then
-            pFormatString = "g"
-        End If
-
         pColumn.DisplayFormat.FormatType = FormatType.Custom
-        pColumn.DisplayFormat.FormatString = pFormatString
+        pColumn.DisplayFormat.FormatString = "g"
         pColumn.DisplayFormat.Format = DateTimeFormatInfo.CurrentInfo
     End Sub
 
-    Private Sub SetDateTimeColumn(pColumn As TreeListColumn, pFormatString As String)
+    Private Sub SetDateTimeColumn(pColumn As TreeListColumn)
-
-        If String.IsNullOrEmpty(pFormatString) Then
-            pFormatString = "g"
-        End If
-
         pColumn.Format.FormatType = FormatType.Custom
-        pColumn.Format.FormatString = pFormatString
+        pColumn.Format.FormatString = "g"
         pColumn.Format.Format = DateTimeFormatInfo.CurrentInfo
     End Sub
 

GUIs.Common/IBaseForm.vb

@@ -2,5 +2,5 @@
 
 Public Interface IBaseForm
     ReadOnly Property LogConfig As LogConfig
-    ReadOnly Property _Logger As Logger
+    ReadOnly Property Logger As Logger
 End Interface

GUIs.Common/My Project/AssemblyInfo.vb

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

GUIs.Common/NNfrmNotification_Startup.vb

@@ -119,7 +119,7 @@ Public Class NNfrmNotification_Startup
                 RichEditControl1.Dock = Windows.Forms.DockStyle.Fill
             Else
                 If IO.File.Exists(oMSG_STRING) Then
-                    DocumentViewer1.LoadFile_FromPath(oMSG_STRING)
+                    DocumentViewer1.LoadFile(oMSG_STRING)
                     DocumentViewer1.Visible = True
                     DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill
                 Else

GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb

@@ -12,7 +12,7 @@ Public Class ctrlObjectPropertyDialog
     Implements IBaseForm
 
     Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private Property _Logger As Logger Implements IBaseForm._Logger
+    Private Property Logger As Logger Implements IBaseForm.Logger
     Private Property ControlManager As AttributeControls
     Private Property GridBuilder As GridBuilder
     Private Property Client As Client
@@ -38,7 +38,7 @@ Public Class ctrlObjectPropertyDialog
 
     Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment)
         LogConfig = pLogConfig
-        _Logger = pLogConfig.GetLogger()
+        Logger = pLogConfig.GetLogger()
         HostForm = pHostForm
         ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
         Helper = New FormHelper(pLogConfig, pHostForm)
@@ -58,7 +58,7 @@ Public Class ctrlObjectPropertyDialog
     Public Async Function SaveChanges() As Task(Of Boolean)
         Try
             For Each oChange As KeyValuePair(Of String, Object) In Changes
-                _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
+                Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
                 Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
                     .Language = Environment.User.Language,
                     .Username = Environment.User.UserName
@@ -131,7 +131,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         Finally
             Enabled = True
@@ -145,7 +145,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -156,7 +156,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -176,14 +176,14 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
 
     Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
         Try
-            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
+            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}"
             Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
             If oResult.OK = False Then
@@ -202,7 +202,7 @@ Public Class ctrlObjectPropertyDialog
                 Return oEntities
             End If
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return New List(Of Long)
         End Try
     End Function
@@ -230,7 +230,7 @@ Public Class ctrlObjectPropertyDialog
     End Function
 
     Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
-        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
+        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}"
         Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
         Return oResult.Table
@@ -246,7 +246,7 @@ Public Class ctrlObjectPropertyDialog
             ControlManager.LoadControlsForAttributes(oAttributes, Root)
             Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 

GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb

@@ -19,7 +19,7 @@ Public Class frmObjectPropertyDialog
     Private Property FormHelper As FormHelper
 
     Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
+    Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger
 
     Private ReadOnly Changes As New Dictionary(Of String, Object)
 
@@ -29,7 +29,7 @@ Public Class frmObjectPropertyDialog
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         LogConfig = pLogConfig
-        _Logger = pLogConfig.GetLogger()
+        Logger = pLogConfig.GetLogger()
         Environment = pEnvironment
         Client = pClient
         ObjectId = pObjectId
@@ -75,7 +75,7 @@ Public Class frmObjectPropertyDialog
 
     Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
         Try
-            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
+            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}"
             Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
             If oResult.OK = False Then
@@ -94,7 +94,7 @@ Public Class frmObjectPropertyDialog
                 Return oEntities
             End If
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return New List(Of Long)
         End Try
     End Function
@@ -122,7 +122,7 @@ Public Class frmObjectPropertyDialog
     End Function
 
     Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
-        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
+        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}"
         Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
         Return oResult.Table
@@ -136,7 +136,7 @@ Public Class frmObjectPropertyDialog
             Dim oEntityId As Long
 
             If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then
-                __Logger.Warn("Could not Parse Entity from cmbBusinessEntity")
+                _Logger.Warn("Could not Parse Entity from cmbBusinessEntity")
                 Exit Sub
             End If
 
@@ -149,7 +149,7 @@ Public Class frmObjectPropertyDialog
             ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout)
             Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout)
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
         End Try
     End Sub
 
@@ -173,7 +173,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -184,7 +184,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -204,7 +204,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -212,7 +212,7 @@ Public Class frmObjectPropertyDialog
     Private Async Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
         Try
             For Each oChange As KeyValuePair(Of String, Object) In Changes
-                _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
+                Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
 
                 Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
                     .Language = Environment.User.Language,

GUIs.Common/SQLEditor/frmSQLEditor.Designer.vb

@@ -23,7 +23,6 @@ Partial Class frmSQLEditor
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor))
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.GalleryPlaceholders = New DevExpress.XtraBars.RibbonGalleryBarItem()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
@@ -50,7 +49,6 @@ Partial Class frmSQLEditor
         Me.ViewPlaceholders = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colPattern = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colValue = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -67,9 +65,9 @@ Partial Class frmSQLEditor
         '
         Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 21
+        Me.RibbonControl1.MaxItemId = 20
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -207,16 +205,15 @@ Partial Class frmSQLEditor
         Me.RibbonPageGroup1.ItemLinks.Add(Me.chkShowPlaceholders)
         Me.RibbonPageGroup1.ItemLinks.Add(Me.chkClearPlaceholders)
         Me.RibbonPageGroup1.ItemLinks.Add(Me.btnClearPlaceholders)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem6)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "Platzhalter"
         '
         'RibbonStatusBar1
         '
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 668)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 666)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1056, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1056, 24)
         '
         'RibbonPage2
         '
@@ -230,7 +227,7 @@ Partial Class frmSQLEditor
         Me.txtSQLCommand.MenuManager = Me.RibbonControl1
         Me.txtSQLCommand.Name = "txtSQLCommand"
         Me.txtSQLCommand.Options.CopyPaste.InsertOptions = DevExpress.XtraRichEdit.API.Native.InsertOptions.KeepTextOnly
-        Me.txtSQLCommand.Size = New System.Drawing.Size(802, 536)
+        Me.txtSQLCommand.Size = New System.Drawing.Size(802, 534)
         Me.txtSQLCommand.TabIndex = 2
         '
         'SplitContainerControl1
@@ -249,7 +246,7 @@ Partial Class frmSQLEditor
         '
         Me.SplitContainerControl1.Panel2.Controls.Add(Me.GridPlaceholders)
         Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(1056, 536)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1056, 534)
         Me.SplitContainerControl1.SplitterPosition = 802
         Me.SplitContainerControl1.TabIndex = 4
         '
@@ -260,7 +257,7 @@ Partial Class frmSQLEditor
         Me.GridPlaceholders.MainView = Me.ViewPlaceholders
         Me.GridPlaceholders.MenuManager = Me.RibbonControl1
         Me.GridPlaceholders.Name = "GridPlaceholders"
-        Me.GridPlaceholders.Size = New System.Drawing.Size(244, 536)
+        Me.GridPlaceholders.Size = New System.Drawing.Size(244, 534)
         Me.GridPlaceholders.TabIndex = 0
         Me.GridPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewPlaceholders})
         '
@@ -290,13 +287,6 @@ Partial Class frmSQLEditor
         Me.colValue.Visible = True
         Me.colValue.VisibleIndex = 1
         '
-        'BarButtonItem6
-        '
-        Me.BarButtonItem6.Caption = "Platzhalter für Zelle einfügen"
-        Me.BarButtonItem6.Id = 20
-        Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem6.Name = "BarButtonItem6"
-        '
         'frmSQLEditor
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -352,5 +342,4 @@ Partial Class frmSQLEditor
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.Common/SQLEditor/frmSQLEditor.resx

@@ -120,26 +120,7 @@
   <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>17, 17</value>
-    <value>
+  </metadata>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAB0DAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iQWRkUGFyYWdyYXBoVG9UYWJsZU9mQ29udGVudHMiIHN0eWxlPSJlbmFi
-        bGUtYmFja2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5C
-        bGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMx
-        Qzt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0xNiwxNkg2di0yaDEwVjE2eiBNMTYsMThINnYyaDEwVjE4
-        eiIgY2xhc3M9IlJlZCIgLz4NCiAgPHBhdGggZD0iTTI2LDI2djNjMCwwLjYtMC40LDEtMSwxSDFjLTAu
-        NiwwLTEtMC40LTEtMVYxYzAtMC42LDAuNC0xLDEtMWgyNGMwLjYsMCwxLDAuNCwxLDF2N2gtMlYySDJ2
-        MjZoMjJ2LTJIMjZ6ICAgTTIwLDZINnYyaDE0VjZ6IE0xNiwxMEg2djJoMTBWMTB6IE0xNiwyMkg2djJo
-        MTBWMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0zMSwxMEgxOWMtMC42LDAtMSwwLjQt
-        MSwxdjEyYzAsMC42LDAuNCwxLDEsMWgxMmMwLjYsMCwxLTAuNCwxLTFWMTFDMzIsMTAuNCwzMS42LDEw
-        LDMxLDEweiBNMzAsMThoLTR2NGgtMiAgdi00aC00di0yaDR2LTRoMnY0aDRWMTh6IiBjbGFzcz0iR3Jl
-        ZW4iIC8+DQo8L3N2Zz4L
-</value>
-  </data>
 </root>

GUIs.Common/SQLEditor/frmSQLEditor.vb

@@ -172,7 +172,7 @@ Public Class frmSQLEditor
 
     Private Function LoadConnections() As GalleryItemGroup
         Try
-            Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WITH (NOLOCK) WHERE AKTIV = 1"
+            Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WHERE AKTIV = 1"
             Dim oTable = Database.GetDatatable(oSql)
             Dim oConnections = New List(Of Connection)
 
@@ -373,8 +373,4 @@ Public Class frmSQLEditor
 
         SplitContainerControl1.SplitterPosition = oSplitterPosition
     End Sub
-
-    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick
-
-    End Sub
 End Class

GUIs.Common/frmNotification_Startup.vb

@@ -112,7 +112,7 @@ Public Class frmNotification_Startup
                 RichEditControl1.Dock = Windows.Forms.DockStyle.Fill
             Else
                 If IO.File.Exists(oMSG_STRING) Then
-                    DocumentViewer1.LoadFile_FromPath(oMSG_STRING)
+                    DocumentViewer1.LoadFile(oMSG_STRING)
                     DocumentViewer1.Visible = True
                     DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill
                 Else

GUIs.Common/packages.config

@@ -6,8 +6,8 @@
   <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" version="14.3.19" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" 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" />

GUIs.GlobalIndexer/GlobalIndexer.vbproj

@@ -60,7 +60,7 @@
     <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.Test.ADSyncTest/ADSyncTest.vbproj

@@ -49,19 +49,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.Test.EDMIBenchmark/App.config

@@ -54,46 +54,6 @@
         <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="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.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-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>
     </assemblyBinding>
   </runtime>
 </configuration>

GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj

@@ -14,8 +14,6 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,9 +48,6 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <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.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -69,120 +64,23 @@
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+    <Reference Include="GdPicture.NET.14">
-      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.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="Independentsoft.Msg">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
     </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 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=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
     </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.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.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -190,49 +88,15 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <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.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.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.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -297,11 +161,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <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>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</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>

GUIs.Test.EDMIBenchmark/packages.config

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

GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj

@@ -56,22 +56,22 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns">
-      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

GUIs.Test.TestGUI/frmObjectProperties.vb

@@ -11,10 +11,10 @@ Public Class frmObjectProperties
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         LogConfig = pLogConfig
-        _Logger = pLogConfig.GetLogger()
+        Logger = pLogConfig.GetLogger()
     End Sub
 
     Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
 
-    Public ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
+    Public ReadOnly Property Logger As Logger Implements IBaseForm.Logger
 End Class

GUIs.Test.ZUGFeRDTest/App.config

@@ -163,6 +163,26 @@
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.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="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

@@ -24,225 +24,261 @@ Partial Class Form1
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
-        Me.btRunJob = New System.Windows.Forms.Button()
+        OpenFileDialog1 = New OpenFileDialog()
-        Me.ListBox1 = New System.Windows.Forms.ListBox()
+        btRunJob = New Button()
-        Me.btValidateSerializePDF = New System.Windows.Forms.Button()
+        ListBox1 = New ListBox()
-        Me.btValidateSerializeParseProps = New System.Windows.Forms.Button()
+        btValidateSerializePDF = New Button()
-        Me.btCreateMD5Checksum = New System.Windows.Forms.Button()
+        btValidateSerializeParseProps = New Button()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        btCreateMD5Checksum = New Button()
-        Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button()
+        GroupBox1 = New GroupBox()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        ButtonValidateXMLOnly = New Button()
-        Me.btExtractPDFAttachments = New System.Windows.Forms.Button()
+        GroupBox2 = New GroupBox()
-        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        btExtractPDFAttachments = New Button()
-        Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
+        GroupBox3 = New GroupBox()
-        Me.txtPropName = New System.Windows.Forms.TextBox()
+        txtMD5Checksum = New TextBox()
-        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+        txtPropName = New TextBox()
-        Me.btFindExtractXMLValue = New System.Windows.Forms.Button()
+        GroupBox4 = New GroupBox()
-        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
+        btFindExtractXMLValue = New Button()
-        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        FolderBrowserDialog1 = New FolderBrowserDialog()
-        Me.btWriteBinary = New System.Windows.Forms.Button()
+        GroupBox5 = New GroupBox()
-        Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
+        btWriteBinary = New Button()
-        Me.Button1 = New System.Windows.Forms.Button()
+        OpenFileDialog2 = New OpenFileDialog()
-        Me.GroupBox1.SuspendLayout()
+        Button1 = New Button()
-        Me.GroupBox2.SuspendLayout()
+        Button2 = New Button()
-        Me.GroupBox3.SuspendLayout()
+        GroupBox1.SuspendLayout()
-        Me.GroupBox4.SuspendLayout()
+        GroupBox2.SuspendLayout()
-        Me.GroupBox5.SuspendLayout()
+        GroupBox3.SuspendLayout()
-        Me.SuspendLayout()
+        GroupBox4.SuspendLayout()
+        GroupBox5.SuspendLayout()
+        SuspendLayout()
         ' 
-        'OpenFileDialog1
+        ' OpenFileDialog1
         ' 
-        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        OpenFileDialog1.FileName = "OpenFileDialog1"
         ' 
-        'btRunJob
+        ' btRunJob
         ' 
-        Me.btRunJob.Location = New System.Drawing.Point(6, 19)
+        btRunJob.Location = New System.Drawing.Point(7, 22)
-        Me.btRunJob.Name = "btRunJob"
+        btRunJob.Margin = New Padding(4, 4, 4, 4)
-        Me.btRunJob.Size = New System.Drawing.Size(221, 23)
+        btRunJob.Name = "btRunJob"
-        Me.btRunJob.TabIndex = 0
+        btRunJob.Size = New System.Drawing.Size(258, 26)
-        Me.btRunJob.Text = "Run Job"
+        btRunJob.TabIndex = 0
-        Me.btRunJob.UseVisualStyleBackColor = True
+        btRunJob.Text = "Run Job"
+        btRunJob.UseVisualStyleBackColor = True
         ' 
-        'ListBox1
+        ' ListBox1
         ' 
-        Me.ListBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+        ListBox1.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right
-            Or System.Windows.Forms.AnchorStyles.Left) _
+        ListBox1.FormattingEnabled = True
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        ListBox1.ItemHeight = 15
-        Me.ListBox1.FormattingEnabled = True
+        ListBox1.Location = New System.Drawing.Point(441, 9)
-        Me.ListBox1.Location = New System.Drawing.Point(430, 7)
+        ListBox1.Margin = New Padding(4, 4, 4, 4)
-        Me.ListBox1.Name = "ListBox1"
+        ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(498, 433)
+        ListBox1.Size = New System.Drawing.Size(317, 499)
-        Me.ListBox1.TabIndex = 1
+        ListBox1.TabIndex = 1
         ' 
-        'btValidateSerializePDF
+        ' btValidateSerializePDF
         ' 
-        Me.btValidateSerializePDF.Location = New System.Drawing.Point(6, 19)
+        btValidateSerializePDF.Location = New System.Drawing.Point(7, 22)
-        Me.btValidateSerializePDF.Name = "btValidateSerializePDF"
+        btValidateSerializePDF.Margin = New Padding(4, 4, 4, 4)
-        Me.btValidateSerializePDF.Size = New System.Drawing.Size(246, 23)
+        btValidateSerializePDF.Name = "btValidateSerializePDF"
-        Me.btValidateSerializePDF.TabIndex = 2
+        btValidateSerializePDF.Size = New System.Drawing.Size(287, 26)
-        Me.btValidateSerializePDF.Text = "Validate and Serialize PDF"
+        btValidateSerializePDF.TabIndex = 2
-        Me.btValidateSerializePDF.UseVisualStyleBackColor = True
+        btValidateSerializePDF.Text = "Validate and Serialize PDF"
+        btValidateSerializePDF.UseVisualStyleBackColor = True
         ' 
-        'btValidateSerializeParseProps
+        ' btValidateSerializeParseProps
         ' 
-        Me.btValidateSerializeParseProps.Location = New System.Drawing.Point(6, 48)
+        btValidateSerializeParseProps.Location = New System.Drawing.Point(7, 56)
-        Me.btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
+        btValidateSerializeParseProps.Margin = New Padding(4, 4, 4, 4)
-        Me.btValidateSerializeParseProps.Size = New System.Drawing.Size(246, 23)
+        btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
-        Me.btValidateSerializeParseProps.TabIndex = 3
+        btValidateSerializeParseProps.Size = New System.Drawing.Size(287, 26)
-        Me.btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
+        btValidateSerializeParseProps.TabIndex = 3
-        Me.btValidateSerializeParseProps.UseVisualStyleBackColor = True
+        btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
+        btValidateSerializeParseProps.UseVisualStyleBackColor = True
         ' 
-        'btCreateMD5Checksum
+        ' btCreateMD5Checksum
         ' 
-        Me.btCreateMD5Checksum.Location = New System.Drawing.Point(6, 19)
+        btCreateMD5Checksum.Location = New System.Drawing.Point(7, 22)
-        Me.btCreateMD5Checksum.Name = "btCreateMD5Checksum"
+        btCreateMD5Checksum.Margin = New Padding(4, 4, 4, 4)
-        Me.btCreateMD5Checksum.Size = New System.Drawing.Size(221, 23)
+        btCreateMD5Checksum.Name = "btCreateMD5Checksum"
-        Me.btCreateMD5Checksum.TabIndex = 4
+        btCreateMD5Checksum.Size = New System.Drawing.Size(258, 26)
-        Me.btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
+        btCreateMD5Checksum.TabIndex = 4
-        Me.btCreateMD5Checksum.UseVisualStyleBackColor = True
+        btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
+        btCreateMD5Checksum.UseVisualStyleBackColor = True
         ' 
-        'GroupBox1
+        ' GroupBox1
         ' 
-        Me.GroupBox1.Controls.Add(Me.ButtonValidateXMLOnly)
+        GroupBox1.Controls.Add(ButtonValidateXMLOnly)
-        Me.GroupBox1.Controls.Add(Me.btRunJob)
+        GroupBox1.Controls.Add(btRunJob)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
+        GroupBox1.Location = New System.Drawing.Point(14, 14)
-        Me.GroupBox1.Name = "GroupBox1"
+        GroupBox1.Margin = New Padding(4, 4, 4, 4)
-        Me.GroupBox1.Size = New System.Drawing.Size(239, 75)
+        GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.TabIndex = 7
+        GroupBox1.Padding = New Padding(4, 4, 4, 4)
-        Me.GroupBox1.TabStop = False
+        GroupBox1.Size = New System.Drawing.Size(279, 87)
-        Me.GroupBox1.Text = "Run Job like in eInvoice Service"
+        GroupBox1.TabIndex = 7
+        GroupBox1.TabStop = False
+        GroupBox1.Text = "Run Job like in eInvoice Service"
         ' 
-        'ButtonValidateXMLOnly
+        ' ButtonValidateXMLOnly
         ' 
-        Me.ButtonValidateXMLOnly.Location = New System.Drawing.Point(6, 48)
+        ButtonValidateXMLOnly.Location = New System.Drawing.Point(7, 56)
-        Me.ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
+        ButtonValidateXMLOnly.Margin = New Padding(4, 4, 4, 4)
-        Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(221, 23)
+        ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
-        Me.ButtonValidateXMLOnly.TabIndex = 4
+        ButtonValidateXMLOnly.Size = New System.Drawing.Size(258, 26)
-        Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
+        ButtonValidateXMLOnly.TabIndex = 4
-        Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True
+        ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
+        ButtonValidateXMLOnly.UseVisualStyleBackColor = True
         ' 
-        'GroupBox2
+        ' GroupBox2
         ' 
-        Me.GroupBox2.Controls.Add(Me.btValidateSerializePDF)
+        GroupBox2.Controls.Add(btValidateSerializePDF)
-        Me.GroupBox2.Controls.Add(Me.btExtractPDFAttachments)
+        GroupBox2.Controls.Add(btExtractPDFAttachments)
-        Me.GroupBox2.Controls.Add(Me.btValidateSerializeParseProps)
+        GroupBox2.Controls.Add(btValidateSerializeParseProps)
-        Me.GroupBox2.Location = New System.Drawing.Point(12, 94)
+        GroupBox2.Location = New System.Drawing.Point(14, 108)
-        Me.GroupBox2.Name = "GroupBox2"
+        GroupBox2.Margin = New Padding(4, 4, 4, 4)
-        Me.GroupBox2.Size = New System.Drawing.Size(360, 109)
+        GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.TabIndex = 8
+        GroupBox2.Padding = New Padding(4, 4, 4, 4)
-        Me.GroupBox2.TabStop = False
+        GroupBox2.Size = New System.Drawing.Size(420, 125)
-        Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
+        GroupBox2.TabIndex = 8
+        GroupBox2.TabStop = False
+        GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
         ' 
-        'btExtractPDFAttachments
+        ' btExtractPDFAttachments
         ' 
-        Me.btExtractPDFAttachments.Location = New System.Drawing.Point(6, 77)
+        btExtractPDFAttachments.Location = New System.Drawing.Point(7, 88)
-        Me.btExtractPDFAttachments.Name = "btExtractPDFAttachments"
+        btExtractPDFAttachments.Margin = New Padding(4, 4, 4, 4)
-        Me.btExtractPDFAttachments.Size = New System.Drawing.Size(246, 23)
+        btExtractPDFAttachments.Name = "btExtractPDFAttachments"
-        Me.btExtractPDFAttachments.TabIndex = 3
+        btExtractPDFAttachments.Size = New System.Drawing.Size(287, 26)
-        Me.btExtractPDFAttachments.Text = "Extract PDF Attachments"
+        btExtractPDFAttachments.TabIndex = 3
-        Me.btExtractPDFAttachments.UseVisualStyleBackColor = True
+        btExtractPDFAttachments.Text = "Extract PDF Attachments"
+        btExtractPDFAttachments.UseVisualStyleBackColor = True
         ' 
-        'GroupBox3
+        ' GroupBox3
         ' 
-        Me.GroupBox3.Controls.Add(Me.btCreateMD5Checksum)
+        GroupBox3.Controls.Add(btCreateMD5Checksum)
-        Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
+        GroupBox3.Controls.Add(txtMD5Checksum)
-        Me.GroupBox3.Location = New System.Drawing.Point(12, 209)
+        GroupBox3.Location = New System.Drawing.Point(14, 241)
-        Me.GroupBox3.Name = "GroupBox3"
+        GroupBox3.Margin = New Padding(4, 4, 4, 4)
-        Me.GroupBox3.Size = New System.Drawing.Size(360, 85)
+        GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.TabIndex = 9
+        GroupBox3.Padding = New Padding(4, 4, 4, 4)
-        Me.GroupBox3.TabStop = False
+        GroupBox3.Size = New System.Drawing.Size(420, 98)
-        Me.GroupBox3.Text = "Open PDF and calculate Checksum"
+        GroupBox3.TabIndex = 9
+        GroupBox3.TabStop = False
+        GroupBox3.Text = "Open PDF and calculate Checksum"
         ' 
-        'txtMD5Checksum
+        ' txtMD5Checksum
         ' 
-        Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
+        txtMD5Checksum.Location = New System.Drawing.Point(7, 56)
-        Me.txtMD5Checksum.Name = "txtMD5Checksum"
+        txtMD5Checksum.Margin = New Padding(4, 4, 4, 4)
-        Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
+        txtMD5Checksum.Name = "txtMD5Checksum"
-        Me.txtMD5Checksum.TabIndex = 5
+        txtMD5Checksum.Size = New System.Drawing.Size(406, 23)
+        txtMD5Checksum.TabIndex = 5
         ' 
-        'txtPropName
+        ' txtPropName
         ' 
-        Me.txtPropName.Location = New System.Drawing.Point(6, 48)
+        txtPropName.Location = New System.Drawing.Point(7, 56)
-        Me.txtPropName.Name = "txtPropName"
+        txtPropName.Margin = New Padding(4, 4, 4, 4)
-        Me.txtPropName.Size = New System.Drawing.Size(348, 20)
+        txtPropName.Name = "txtPropName"
-        Me.txtPropName.TabIndex = 10
+        txtPropName.Size = New System.Drawing.Size(406, 23)
+        txtPropName.TabIndex = 10
         ' 
-        'GroupBox4
+        ' GroupBox4
         ' 
-        Me.GroupBox4.Controls.Add(Me.btFindExtractXMLValue)
+        GroupBox4.Controls.Add(btFindExtractXMLValue)
-        Me.GroupBox4.Controls.Add(Me.txtPropName)
+        GroupBox4.Controls.Add(txtPropName)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 300)
+        GroupBox4.Location = New System.Drawing.Point(14, 346)
-        Me.GroupBox4.Name = "GroupBox4"
+        GroupBox4.Margin = New Padding(4, 4, 4, 4)
-        Me.GroupBox4.Size = New System.Drawing.Size(360, 76)
+        GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.TabIndex = 11
+        GroupBox4.Padding = New Padding(4, 4, 4, 4)
-        Me.GroupBox4.TabStop = False
+        GroupBox4.Size = New System.Drawing.Size(420, 88)
-        Me.GroupBox4.Text = "GroupBox4"
+        GroupBox4.TabIndex = 11
+        GroupBox4.TabStop = False
+        GroupBox4.Text = "GroupBox4"
         ' 
-        'btFindExtractXMLValue
+        ' btFindExtractXMLValue
         ' 
-        Me.btFindExtractXMLValue.Location = New System.Drawing.Point(6, 19)
+        btFindExtractXMLValue.Location = New System.Drawing.Point(7, 22)
-        Me.btFindExtractXMLValue.Name = "btFindExtractXMLValue"
+        btFindExtractXMLValue.Margin = New Padding(4, 4, 4, 4)
-        Me.btFindExtractXMLValue.Size = New System.Drawing.Size(221, 23)
+        btFindExtractXMLValue.Name = "btFindExtractXMLValue"
-        Me.btFindExtractXMLValue.TabIndex = 11
+        btFindExtractXMLValue.Size = New System.Drawing.Size(258, 26)
-        Me.btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
+        btFindExtractXMLValue.TabIndex = 11
-        Me.btFindExtractXMLValue.UseVisualStyleBackColor = True
+        btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
+        btFindExtractXMLValue.UseVisualStyleBackColor = True
         ' 
-        'GroupBox5
+        ' GroupBox5
         ' 
-        Me.GroupBox5.Controls.Add(Me.btWriteBinary)
+        GroupBox5.Controls.Add(btWriteBinary)
-        Me.GroupBox5.Location = New System.Drawing.Point(10, 383)
+        GroupBox5.Location = New System.Drawing.Point(11, 442)
-        Me.GroupBox5.Name = "GroupBox5"
+        GroupBox5.Margin = New Padding(4, 4, 4, 4)
-        Me.GroupBox5.Size = New System.Drawing.Size(360, 57)
+        GroupBox5.Name = "GroupBox5"
-        Me.GroupBox5.TabIndex = 12
+        GroupBox5.Padding = New Padding(4, 4, 4, 4)
-        Me.GroupBox5.TabStop = False
+        GroupBox5.Size = New System.Drawing.Size(420, 65)
-        Me.GroupBox5.Text = "GroupBox5"
+        GroupBox5.TabIndex = 12
+        GroupBox5.TabStop = False
+        GroupBox5.Text = "GroupBox5"
         ' 
-        'btWriteBinary
+        ' btWriteBinary
         ' 
-        Me.btWriteBinary.Location = New System.Drawing.Point(6, 19)
+        btWriteBinary.Location = New System.Drawing.Point(7, 22)
-        Me.btWriteBinary.Name = "btWriteBinary"
+        btWriteBinary.Margin = New Padding(4, 4, 4, 4)
-        Me.btWriteBinary.Size = New System.Drawing.Size(221, 23)
+        btWriteBinary.Name = "btWriteBinary"
-        Me.btWriteBinary.TabIndex = 11
+        btWriteBinary.Size = New System.Drawing.Size(258, 26)
-        Me.btWriteBinary.Text = "Write Binary to PDF"
+        btWriteBinary.TabIndex = 11
-        Me.btWriteBinary.UseVisualStyleBackColor = True
+        btWriteBinary.Text = "Write Binary to PDF"
+        btWriteBinary.UseVisualStyleBackColor = True
         ' 
-        'OpenFileDialog2
+        ' OpenFileDialog2
         ' 
-        Me.OpenFileDialog2.FileName = "OpenFileDialog2"
+        OpenFileDialog2.FileName = "OpenFileDialog2"
-        Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
+        OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
         ' 
-        'Button1
+        ' Button1
         ' 
-        Me.Button1.Location = New System.Drawing.Point(257, 31)
+        Button1.Location = New System.Drawing.Point(316, 35)
-        Me.Button1.Name = "Button1"
+        Button1.Margin = New Padding(3, 2, 3, 2)
-        Me.Button1.Size = New System.Drawing.Size(115, 23)
+        Button1.Name = "Button1"
-        Me.Button1.TabIndex = 13
+        Button1.Size = New System.Drawing.Size(82, 22)
-        Me.Button1.Text = "Open Log"
+        Button1.TabIndex = 5
-        Me.Button1.UseVisualStyleBackColor = True
+        Button1.Text = "Log Folder"
+        Button1.UseVisualStyleBackColor = True
         ' 
-        'Form1
+        ' Button2
         ' 
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Button2.Location = New System.Drawing.Point(316, 62)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Button2.Margin = New Padding(3, 2, 3, 2)
-        Me.ClientSize = New System.Drawing.Size(937, 448)
+        Button2.Name = "Button2"
-        Me.Controls.Add(Me.Button1)
+        Button2.Size = New System.Drawing.Size(82, 22)
-        Me.Controls.Add(Me.GroupBox5)
+        Button2.TabIndex = 13
-        Me.Controls.Add(Me.GroupBox4)
+        Button2.Text = "AppFolder"
-        Me.Controls.Add(Me.GroupBox3)
+        Button2.UseVisualStyleBackColor = True
-        Me.Controls.Add(Me.GroupBox2)
+        ' 
-        Me.Controls.Add(Me.GroupBox1)
+        ' Form1
-        Me.Controls.Add(Me.ListBox1)
+        ' 
-        Me.Name = "Form1"
+        AutoScaleDimensions = New System.Drawing.SizeF(7F, 15F)
-        Me.Text = "E-Invoice-TEST-Tool"
+        AutoScaleMode = AutoScaleMode.Font
-        Me.GroupBox1.ResumeLayout(False)
+        ClientSize = New System.Drawing.Size(769, 518)
-        Me.GroupBox2.ResumeLayout(False)
+        Controls.Add(Button2)
-        Me.GroupBox3.ResumeLayout(False)
+        Controls.Add(Button1)
-        Me.GroupBox3.PerformLayout()
+        Controls.Add(GroupBox5)
-        Me.GroupBox4.ResumeLayout(False)
+        Controls.Add(GroupBox4)
-        Me.GroupBox4.PerformLayout()
+        Controls.Add(GroupBox3)
-        Me.GroupBox5.ResumeLayout(False)
+        Controls.Add(GroupBox2)
-        Me.ResumeLayout(False)
+        Controls.Add(GroupBox1)
+        Controls.Add(ListBox1)
+        Icon = CType(resources.GetObject("$this.Icon"), Drawing.Icon)
+        Margin = New Padding(4, 4, 4, 4)
+        Name = "Form1"
+        Text = "E-Invoice-TEST-Tool"
+        GroupBox1.ResumeLayout(False)
+        GroupBox2.ResumeLayout(False)
+        GroupBox3.ResumeLayout(False)
+        GroupBox3.PerformLayout()
+        GroupBox4.ResumeLayout(False)
+        GroupBox4.PerformLayout()
+        GroupBox5.ResumeLayout(False)
+        ResumeLayout(False)
 
     End Sub
 
@@ -266,4 +302,5 @@ Partial Class Form1
     Friend WithEvents ButtonValidateXMLOnly As Button
     Friend WithEvents OpenFileDialog2 As OpenFileDialog
     Friend WithEvents Button1 As Button
+    Friend WithEvents Button2 As Button
 End Class

GUIs.Test.ZUGFeRDTest/Form1.resx

@@ -129,4 +129,480 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAwAEBAQAAEABAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAQEAAAAQAgAGgEAABWBwAAICAQAAEA
+        BADoAgAAvgsAACAgAAABAAgAqAgAAKYOAAAgIAAAAQAgAKgQAABOFwAAMDAQAAEABABoBgAA9icAADAw
+        AAABAAgAqA4AAF4uAAAwMAAAAQAgAKglAAAGPQAAAAAQAAEABADbAwAArmIAAAAAAAABAAgA3QMAAIlm
+        AAAAAAAAAQAgAN0DAABmagAAKAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP//
+        /wD///////////d3d3f3d3d/93d3d/d3d3/3d3d393d3f/d3/////3d/93f3d3d/d3/3d/d3d393f/d3
+        93d3f///93f3d3d/d3/3d/d3d393f/d393d3f/d/93f/////93/3d3d/d//3f/d3d393d3d/93d3f3d3
+        d3///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAoAAAAEAAAACAAAAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJC
+        QgD29vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAIC
+        AgICAgICAgICAgICAgICAQEBAQEBAQIBAQEBAQECAgEBAQEBAQECAQEBAQEBAgIBAQEBAQEBAgEBAQEB
+        AQICAQEBAgICAgICAgIBAQECAgEBAQIBAQEBAQECAQEBAgIBAQECAQEBAQEBAgEBAQICAQEBAgEBAQEB
+        AQICAgICAgEBAQIBAQEBAQECAQEBAgIBAQECAQEBAQEBAgEBAQICAQEBAgEBAQEBAQICAQECAgEBAQIC
+        AgICAgICAgEBAgIBAQEBAQECAQECAgIBAQICAQEBAQEBAgEBAQEBAQECAgEBAQEBAQIBAQEBAQEBAgIC
+        AgICAgICAgICAgICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAKAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAKAAAACAAAABAAAAAAQAEAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wD/////////////
+        //////////////////////////////93d3d3d3d/93d3d3d3d///d3d3d3d3f/d3d3d3d3f//3d3d3d3
+        d3/3d3d3d3d3//93d3d3d3d/93d3d3d3d///d3d3d3d3f/d3d3d3d3f//3d3d3d3d3/3d3d3d3d3//93
+        d3f//////////3d3d///d3d3//////////93d3f//3d3d/93d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3
+        d///d3d3/3d3d3d3d/93d3f//3d3d/93d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3
+        d////////3d3d/93d3d3d3f///////93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3d/93d3f//3d3d/93
+        d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3d///d3f//3d3d////////////3d3//93
+        d3f///////////93d///d3d3d3d3f/d3f///d3f//3d3d3d3d3/3d3///3d3//93d3d3d3d/93d3d3d3
+        d///d3d3d3d3f/d3d3d3d3f//3d3d3d3d3/3d3d3d3d3//93d3d3d3d/93d3d3d3d///////////////
+        /////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAACAAAABAAAAAAQAIAAAAAAAABAAAAAAAAAAA
+        AAAAAQAAAAEAAAAAAABCQkIA9vb2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAP///wACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgIBAQEBAQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEB
+        AQEBAQECAgEBAQEBAQEBAQEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEB
+        AQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEBAQEBAQECAgEBAQEBAQEBAQEBAQECAgIC
+        AQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEBAQECAgICAgICAgICAgICAgICAQEBAQEB
+        AgICAgEBAQEBAQICAgICAgICAgICAgICAgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEB
+        AQEBAQICAgIBAQEBAQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEB
+        AgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEBAQEBAQICAgIBAQEBAQECAgEBAQEBAQEB
+        AQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEBAgICAgICAgICAgICAQEBAQEBAgIBAQEB
+        AQEBAQEBAQECAgICAgICAgICAgIBAQEBAQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQIC
+        AQEBAQEBAQEBAQEBAgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEBAQEBAQICAgIBAQEB
+        AQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEBAgICAgEBAQECAgIC
+        AQEBAQEBAgICAgICAgICAgICAgICAgICAQEBAQICAgIBAQEBAQECAgICAgICAgICAgICAgICAgIBAQEB
+        AgICAgEBAQEBAQEBAQEBAQECAgEBAQECAgICAgEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQICAgIC
+        AQEBAQICAgIBAQEBAQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEBAQEBAQECAgEBAQEB
+        AQEBAQEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEBAQEBAQEBAQEBAgIB
+        AQEBAQEBAQEBAQEBAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAA
+        AAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAADAAAABgAAAAAQAEAAAAAACABAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8A
+        AAD/AP8A//8AAP///wD/////////////////////////////////////////////////////////////
+        ////////////////////////////////////93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3
+        d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3
+        f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3
+        d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3
+        f///93d3d3f///////////////93d3d3f///93d3d3f///////////////93d3d3f///93d3d3f/////
+        //////////93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3
+        f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f///////
+        ////93d3d3f/93d3d3d3d3d3f///////////93d3d3f/93d3d3d3d3d3f///////////93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3
+        f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f///93d3f///93d3d3f/93d3d3d3d3d3f///93d3
+        f///93d3d3f/93d3d3d3d3d3f///93d3f///93d3d3f/////////////////93d3f///93d3d3f/////
+        ////////////93d3f///93d3d3f/////////////////93d3f///93d3d3d3d3d3f/93d3f/////93d3
+        f///93d3d3d3d3d3f/93d3f/////93d3f///93d3d3d3d3d3f/93d3f/////93d3f///93d3d3d3d3d3
+        f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3
+        f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3
+        f/93d3d3d3d3d3d3f///////////////////////////////////////////////////////////////
+        //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAMAAAAGAA
+        AAABAAgAAAAAAAAJAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgD29vYAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgICAgICAgICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgIC
+        AgEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgICAgEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAwAAAAYAAAAAEAIAAAAAAAgCUAAAAAAAAAAAAAAAAAAAAA
+        AAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AACJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxyqGYAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAON
+        SURBVHic7d1BbgJBDADBEO2/R/PyzQ84ZIIc6Ko7yAKp5cNiHvd9319A0vf0AMAcAYAwAYAwAYAwAYAw
+        AYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYCw6/QN9t5/MQcvstY6er3v9387/X5tABAmABAmABAm
+        ABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAm
+        ABAmABAmABAmABAmABAmABAmABAmABB2TQ8Az6y1pkd4au89PcIRGwCECQCECQCECQCECQCECQCECQCE
+        CQCECQCECQCECQCECQCECQCECQCECQCE5e8B/Pffm0/z+Xw2GwCECQCECQCECQCECQCECQCECQCECQCE
+        CQCECQCECQCECQCECQCECQCECQCE5e8BnHr3/4d/d+4VnLEBQJgAQJgAQJgAQJgAQJgAQJgAQJjnAEir
+        P8dhA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYCwa3oAmLTWmh5hlA0AwgQAwgQAwgQAwgQA
+        wgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwtwDIG3vPT3CkdN7BjYACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACLumB3h3a63pEeDXbAAQJgAQJgAQ
+        JgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQlr8HsPeeHuGlTu8VfPrnU2cDgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDAB
+        gDABgDABgDABgDABgLDHfd/39BDADBsAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkA
+        hAkAhAkAhP0AOIQlA0VHQvQAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxy
+        qGYAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOPSURBVHic7d1BbgJBDADBEPG8ee68ba/kBxwyiQx01R1k
+        gdTyYTG367oeX0DS9/QAwBwBgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgLD7
+        6Rustf5iDv7J3vvo9b7f13b6/doAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwA
+        IEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIOw+PQA8s/ee
+        HuGptdb0CEdsABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABCWvwfw6r83
+        n+bz+Ww2AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAjL3wM49e7/D//u
+        3Cs4YwOAMAGAMAGAMAGAMAGAMAGAMAGAMM8BkFZ/jsMGAGECAGECAGECAGECAGECAGECAGECAGECAGEC
+        AGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGEC
+        AGECAGH36QFg0t57eoRRNgAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        cw+AtLXW9AhHTu8Z2AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAg7D49wLvbe0+PAL9mA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYCw/D2Atdb0CP/q9F7Bp38+dTYACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACLtd1/WYHgKYYQOAMAGAMAGA
+        MAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAsB+06SYLLG5ISgAAAABJRU5ErkJggolQ
+        TkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAAAlwSFlzAAAOwwAADsMBx2+oZAAAA49JREFU
+        eJzt3UFuAkEMAMEQ8bx57rxtr+QHHDKJDHTVHWSB1PJhMbfruh5fQNL39ADAHAGAMAGAMAGAMAGAMAGA
+        MAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAsPvpG6y1/mIO/sne++j1vt/Xdvr92gAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAg7D49ADyz954e4am11vQIR2wAECYAECYAECYAECYAECYAECYAECYA
+        ECYAECYAECYAECYAECYAECYAECYAEJa/B/Dqvzef5vP5bDYACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACMvfAzj17v8P/+7cKzhjA4AwAYAwAYAwAYAwAYAwAYAwAYAwzwGQVn+O
+        wwYAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIA
+        YQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYffpAWDS3nt6hFE2AAgTAAgTAAgTAAgTAAgT
+        AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAhzD4C0tdb0CEdO7xnYACBMACBMACBMACBMACBMACBM
+        ACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBM
+        ACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACDsPj3Au9t7T48Av2YDgDABgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgLD8PYC11vQI/+r0XsGnfz51NgAIEwAIEwAI
+        EwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        EwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        EwAIEwAIEwAIEwAIu13X9ZgeAphhA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYCwH7TpJgssbkhKAAAAAElFTkSuQmCC
+</value>
+  </data>
 </root>

GUIs.Test.ZUGFeRDTest/Form1.vb

@@ -216,12 +216,6 @@ Public Class Form1
             oResult = FolderBrowserDialog1.ShowDialog()
             oInputPath = FolderBrowserDialog1.SelectedPath
         End If
-        Dim xmlFiles = Directory.GetFiles(oInputPath, "*.xml")
-        Dim pdfFiles = Directory.GetFiles(oInputPath, "*.pdf")
-        If xmlFiles.Length = 0 AndAlso pdfFiles.Length = 0 Then
-            MessageBox.Show($"Keine XML- oder PDF-Dateien in {oInputPath} gefunden!")
-            Return
-        End If
 
         If oResult = DialogResult.OK Then
             Dim args As New WorkerArgs() With {
@@ -244,7 +238,6 @@ Public Class Form1
             Dim job As New ImportZUGFeRDFiles(_logConfig, _mssql)
 
             job.Start(args)
-
         End If
     End Sub
 
@@ -425,11 +418,7 @@ Public Class Form1
         Process.Start("explorer.exe", _logConfig.LogDirectory)
     End Sub
 
-    'Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-    '    Process.Start("explorer.exe", _logConfig.LogDirectory)
+        Process.Start("explorer.exe", System.Windows.Forms.Application.UserAppDataPath())
-    'End Sub
+    End Sub
-
-    'Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-    '    Process.Start("explorer.exe", System.Windows.Forms.Application.UserAppDataPath())
-    'End Sub
 End Class

GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>ZUGFeRDTest</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <StartupObject>ZUGFeRDTest.My.MyApplication</StartupObject>
     <MyType>WindowsForms</MyType>
@@ -16,44 +16,183 @@
     <Product>$(AssemblyName)</Product>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <BaseOutputPath>$(MSBuildProjectDirectory)\bin\</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(MSBuildProjectDirectory)\obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>$(BaseOutputPath)Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>$(BaseOutputPath)Release\</OutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="GdPicture" Version="14.4.4" />
+    <PackageReference Include="GdPicture" Version="14.3.22" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
-    <PackageReference Include="NLog" Version="5.0.5" />
+    <PackageReference Include="NLog" Version="6.0.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="DigitalData.Modules.Config">
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database">
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Jobs">
+    <Reference Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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.19\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 Include="Microsoft.CSharp" />
+    <Reference Include="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.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">
+      <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
+    </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.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.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.Data" />
     <Reference Include="System.Deployment" />
     <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.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.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.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.6\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.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.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
@@ -71,4 +210,8 @@
       <Generator>SettingsSingleFileGenerator</Generator>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\DDModules\Jobs\Jobs.vbproj" />
+    <ProjectReference Include="..\..\DDModules\Config\Config.vbproj" />
+  </ItemGroup>
 </Project>

Service.JobRunner/JobRunner.vbproj

@@ -53,19 +53,19 @@
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">

Services.LicenseService/DDEDMLicenseService.vbproj

@@ -50,11 +50,11 @@
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Services.ZUGFeRDService/DDZUGFeRDService.vbproj

@@ -60,7 +60,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
+    <Reference Include="DigitalData.Modules.Interfaces, Version=2.2.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs, Version=2.8.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -105,6 +106,9 @@
   <ItemGroup>
     <Compile Include="Config.vb" />
     <Compile Include="Constants.vb" />
+    <Compile Include="..\\..\\DDModules\\Jobs\\ZUGFeRD\\WorkerArgs.vb">
+      <Link>ZUGFeRD\\WorkerArgs.vb</Link>
+    </Compile>
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>

Services.ZUGFeRDService/packages.config

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

WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs

@@ -1,21 +1,18 @@
-using DigitalData.Modules.Interfaces;
+using System;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Extensions.Configuration;
-using Microsoft.VisualStudio.Web.CodeGeneration.Contracts.Messaging;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
+using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
-using System.Xml.Linq;
+using Microsoft.AspNetCore.Mvc;
+using DigitalData.Modules.Interfaces;
 using static DigitalData.Modules.Interfaces.Exceptions;
-using static DigitalData.Modules.Interfaces.PropertyValues;
 using static DigitalData.Modules.Interfaces.ZUGFeRDInterface;
+using static DigitalData.Modules.Interfaces.PropertyValues;
+using System.Data.SqlClient;
+using Microsoft.Extensions.Configuration;
+using System.Xml.Linq;
+using Newtonsoft.Json.Linq;
+using System.Text.RegularExpressions;
 
 namespace ZUGFeRDRESTService.Controllers
 {
@@ -29,37 +26,6 @@ namespace ZUGFeRDRESTService.Controllers
         public const string ADDED_WHO = "ZUGFeRD REST Service";
         public const string MESSAGEID_DOMAIN = "test.wisag.de";
 
-        public const string VALIDATION_SUCCESS = "VALIDATION SUCCESS";
-        public const string REFERENCES_Rejection_30001 = "REFERENCES_Rejection_30001";
-        public const string REFERENCES_Rejection_30002 = "REFERENCES_Rejection_30002";
-        public const string REFERENCES_Rejection_30002_1 = "REFERENCES_Rejection_30002_1";
-        public const string REFERENCES_Rejection_30003_1 = "REFERENCES_Rejection_30003_1";
-        public const string REFERENCES_Rejection_30003_2 = "REFERENCES_Rejection_30003_2";
-        public const string REFERENCES_Rejection_30003_3 = "REFERENCES_Rejection_30003_3";
-        public const string REFERENCES_Rejection_30004_1 = "REFERENCES_Rejection_30004_1";
-        public const string REFERENCES_Rejection_30004_2 = "REFERENCES_Rejection_30004_2";
-        public const string REFERENCES_Rejection_30004_3 = "REFERENCES_Rejection_30004_3";
-        public const string REFERENCES_Rejection_30005_1 = "REFERENCES_Rejection_30005_1";
-        public const string REFERENCES_Rejection_30005_2 = "REFERENCES_Rejection_30005_2";
-        public const string REFERENCES_Rejection_30006 = "REFERENCES_Rejection_30006";
-        public const string REFERENCES_Rejection_30007 = "REFERENCES_Rejection_30007";
-        public const string REFERENCES_Rejection_30007_1 = "REFERENCES_Rejection_30007_1";
-        public const string REFERENCES_Rejection_30008 = "REFERENCES_Rejection_30008";
-        public const string REFERENCES_Rejection_30009 = "REFERENCES_Rejection_30009";
-        public const string REFERENCES_Rejection_30010 = "REFERENCES_Rejection_30010";
-        public const string REFERENCES_Rejection_30011 = "REFERENCES_Rejection_30011";
-        public const string REFERENCES_Rejection_30012 = "REFERENCES_Rejection_30012";
-        public const string AMOUNT_CALC_REJECTION = "AMOUNT_CALC_REJECTION";
-
-        public const string GERMAN = "de-DE";
-        public const string ENGLISH = "en-US";
-        public const string FRENCH = "fr-FR";
-        public const string SPAIN = "es-ES";
-
-        private List<string> _ValidationErrors;
-        private List<string> _AllowedLanguageCodes;
-        private string _UserLanguageCode = GERMAN;
-
         private const int MAX_FILE_SIZE_DEFAULT = 25;
 
         private readonly ZUGFeRDInterface _zugferd;
@@ -67,9 +33,10 @@ namespace ZUGFeRDRESTService.Controllers
 
         private readonly DigitalData.Modules.Logging.LogConfig _logConfig;
         private readonly DigitalData.Modules.Logging.Logger _logger;
-        //private readonly DigitalData.Modules.Filesystem.File _file;
+        private readonly DigitalData.Modules.Filesystem.File _file;
 
         private readonly PropertyValues _props;
+        //private readonly Dictionary<string, XmlItemProperty> _propertyMap = new Dictionary<string, XmlItemProperty>();
         private readonly List<XmlItemProperty> _propertyMapList = new List<XmlItemProperty>();
         private readonly List<RejectionStringRow> _RecjectionMessageList = new List<RejectionStringRow>();
 
@@ -87,6 +54,8 @@ namespace ZUGFeRDRESTService.Controllers
         {
             _logConfig = logging.LogConfig;
             _logger = _logConfig.GetLogger();
+            _file = new DigitalData.Modules.Filesystem.File(_logConfig);
+
             _logger.Debug("Validation Controller initializing");
 
             // Read config file and assign all option flags related to
@@ -114,36 +83,6 @@ namespace ZUGFeRDRESTService.Controllers
 
             _RecjectionMessageList = database.GetRejectionMessageList();
             
-            _ValidationErrors = new List<String>() {
-                REFERENCES_Rejection_30001,
-                REFERENCES_Rejection_30002,
-                REFERENCES_Rejection_30003_1,
-                REFERENCES_Rejection_30003_2,
-                REFERENCES_Rejection_30003_3,
-                REFERENCES_Rejection_30004_1,
-                REFERENCES_Rejection_30004_2,
-                REFERENCES_Rejection_30004_3,
-                REFERENCES_Rejection_30005_1,
-                REFERENCES_Rejection_30005_2,
-                REFERENCES_Rejection_30006,
-                REFERENCES_Rejection_30007,
-                REFERENCES_Rejection_30007_1,
-                REFERENCES_Rejection_30008,
-                REFERENCES_Rejection_30009,
-                REFERENCES_Rejection_30010,
-                REFERENCES_Rejection_30011,
-                REFERENCES_Rejection_30012,
-                AMOUNT_CALC_REJECTION
-            };
-
-            _AllowedLanguageCodes = new List<string>()
-            {
-                GERMAN,
-                ENGLISH,
-                FRENCH,
-                SPAIN,
-            };
-
             _logger.Debug("Validation Controller initialized!");
         }
 
@@ -207,58 +146,14 @@ namespace ZUGFeRDRESTService.Controllers
         /// </summary>
         /// <param name="file">This parameter's name needs to correspond to the html form's file-input name</param>
         /// <param name="user_id">This is the email address which the user supplied</param>
-        /// <param name="language_id">This is language code which the user supplied (en-US, de-DE)</param>
         [HttpPost]
-        public ValidationResponse Post(IFormCollection collection)
+        public ValidationResponse Post(IFormFile file, string user_id)
         {
             _logger.Info("Start processing request to ValidationController");
 
             ZugferdResult oZugferdResult = null;
             CheckPropertyValuesResult oPropertyResult = new CheckPropertyValuesResult();
 
-            var oUserId = string.Empty; 
-            var oLanguageId = GERMAN; 
-            
-            IFormFile file = collection.Files[0];
-
-            foreach (var keyItem in collection.Keys)
-            {
-                if (keyItem == "user_id")
-                {
-                    oUserId = collection[keyItem];
-                }
-                else if (keyItem == "language_id")
-                {
-                    oLanguageId = collection[keyItem];
-                }
-            }
-            
-            if (!string.IsNullOrEmpty(oUserId))
-            {
-                _logger.Info("UserID set to [{0}].", oUserId);
-            } 
-            else
-            {
-                _logger.Info("UserID is empty!");
-            }
-
-            if (string.IsNullOrEmpty(oLanguageId))
-            {
-                _logger.Info("Language code was empty. Set to default 'de-DE'");
-                // DEFAULT-Sprache = Deutsch de-DE
-                _UserLanguageCode = GERMAN;
-            }
-            else if (_AllowedLanguageCodes.Where(i => i.Equals(oLanguageId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault() != null)
-            {
-                _logger.Info("Language code is allowed. Set to [{0}].", oLanguageId);
-                _UserLanguageCode = oLanguageId;
-            }
-            else
-            {
-                _logger.Info("Language code was unknown: [{0}]. Set to default 'de-DE'", oLanguageId);
-                _UserLanguageCode = GERMAN;
-            }
-
             try
             {
                 using Stream oStream = file.OpenReadStream();
@@ -270,6 +165,7 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oFileSizeIsOK == false)
                     {
+                        //throw new ZUGFeRDExecption(ErrorType.FileTooBig, "FileTooBig");
                         throw new ZUGFeRDExecption(ErrorCodes.FileSizeLimitReachedException, _MaxFileSizeInMegabytes.ToString(), string.Empty, "FileTooBig");
                     }
 
@@ -278,7 +174,6 @@ namespace ZUGFeRDRESTService.Controllers
                     if (file.FileName.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase))
                     {
                         oZugferdResult = _zugferd.ExtractZUGFeRDFileWithGDPicture(oStream);
-                        oZugferdResult.ReceiptFileType = "PDF";
                     }
                     else if (file.FileName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
                     {
@@ -290,7 +185,6 @@ namespace ZUGFeRDRESTService.Controllers
                         };
 
                         oZugferdResult = _zugferd.SerializeZUGFeRDDocument(oResult);
-                        oZugferdResult.ReceiptFileType = "XML";
                     }
 
                     _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
@@ -300,6 +194,7 @@ namespace ZUGFeRDRESTService.Controllers
                     if (oFilteredPropertyMap.Count == 0)
                     {
                         _logger.Warn("No properties found in property map for specification [{0}]", oZugferdResult.Specification);
+                        //throw new ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Unsupported Format");
                         throw new ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Unsupported Format");
                     } 
                     else
@@ -324,21 +219,24 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oPropertyResult.MissingProperties.Count > 0)
                     {
+                        //throw new ZUGFeRDExecption(ErrorType.MissingProperties, "Missing Properties");
                         throw new ZUGFeRDExecption(ErrorCodes.MissingValueException, "Missing Properties");
                     }                   
 
-                    Tuple<bool, string> oValidateResult = ValidateBuyerOrderReference(oPropertyResult.ValidProperties, oZugferdResult);
+                    Tuple<bool, string> oValidateResult = ValidateBuyerOrderReference(oPropertyResult.ValidProperties);
 
                     if (oValidateResult.Item1 == false)
                     {
+                        //throw new ZUGFeRDExecption(ErrorType.UnknownError, "Unknown Error");
                         throw new ZUGFeRDExecption(ErrorCodes.UnhandledException, "Unknown Error");
                     }
 
                     string oValidateResultString = oValidateResult.Item2;
 
-                    if (oValidateResultString.Equals(VALIDATION_SUCCESS))
+                    if (oValidateResultString == "ALL REFERENCES CHECKED POSITIVE")
                     {
                         string oMessage = "Die hochgeladene Datei ist eine gültige-ZUGFeRD Rechnung";
+
                         _logger.Info($"Responding with message: [{oMessage}]");
 
                         return new ValidationResponse()
@@ -346,10 +244,10 @@ namespace ZUGFeRDRESTService.Controllers
                             status = RESPONSE_OK,
                             message = oMessage
                         };
-                    }
+                    } else
-                    else
                     {
                         string oMessage = oValidateResultString;
+
                         _logger.Info($"Responding with message: [{oMessage}]");
 
                         return new ValidationResponse()
@@ -358,8 +256,7 @@ namespace ZUGFeRDRESTService.Controllers
                             message = oMessage
                         };
                     }
-                }
+                };
-
             }
             catch (ZUGFeRDExecption ex)
             {
@@ -385,16 +282,18 @@ namespace ZUGFeRDRESTService.Controllers
                         oMessage = Regex.Replace(oMessage, "@REPLACE_PARAM2", ex.Param2, RegexOptions.IgnoreCase);
                     }
 
+                    // Der REJECTION-Code wird in alle Meldungen eingefügt.
+                    if (!string.IsNullOrEmpty(rejectionCodeNumber) && oMessage.Contains("@REJECTION_CODE", StringComparison.OrdinalIgnoreCase))
+                    {
+                        oMessage = Regex.Replace(oMessage, "@REJECTION_CODE", "Ablehnungscode: " + rejectionCodeNumber, RegexOptions.IgnoreCase);
+                    }
+
                     // Determine if any errors should be sent in the response
                     switch (ex.ErrorCode)
                     {
                         case ErrorCodes.MissingValueException:
-
+                            oErrors.AddRange(from item in oPropertyResult.MissingProperties
-                            var oErrorsText = GetMissingValuesListString(oPropertyResult.MissingProperties);
+                                             select (item.EN16931_ID + " (" + item.Description + ")"));
-                            if (!string.IsNullOrEmpty(oErrorsText) && oMessage.Contains("@REPLACE_PARAM3", StringComparison.OrdinalIgnoreCase))
-                            {
-                                oMessage = Regex.Replace(oMessage, "@REPLACE_PARAM3", oErrorsText, RegexOptions.IgnoreCase);
-                            }
                             break;
                         default:
                             break;
@@ -416,61 +315,21 @@ namespace ZUGFeRDRESTService.Controllers
             }
             catch (ValidationException ex)
             {
-                _logger.Error(ex);
-
                 var rejectionCodeNumber = this.GetRejectionCodeNumber(ex.ErrorCode);
 
                 // Der gesamte Ausgabetext muss anhand des ErrorCodes ermittelt werden 
                 string oMessage = this.GetRejectionMessage(rejectionCodeNumber);
 
-                // Wenn es ValidationErrors gibt, werden diese nun übersetzt und in eine Liste übertragen werden
+                List<string> oErrors = ex.ValidationErrors.Select(e =>
-
-                var mainText = GetTextByToken("ItemValueText");
-                var resultList = new List<string>();
-                foreach (var errorItem in ex.ValidationErrors)
                 {
-                    var resultString = mainText;
+                    return $"Element '{e.ElementName}' mit Wert '{e.ElementValue}': {e.ErrorMessageDE}";
-
+                }).ToList();
-                    if (!string.IsNullOrEmpty(errorItem.ElementName))
-                    {
-                        // replace @ITEM_NAME => e.ElementName
-                        resultString = resultString.Replace("@ITEM_NAME", errorItem.ElementName, StringComparison.OrdinalIgnoreCase);
-                    }
-
-                    if (!string.IsNullOrEmpty(errorItem.ElementValue))
-                    {
-                        // replace ITEM_VALUE => e.ElementValue
-                        resultString = resultString.Replace("@ITEM_VALUE", errorItem.ElementValue, StringComparison.OrdinalIgnoreCase);
-                    }
-
-                    var itemErrorText = GetTextByToken(errorItem.ErrorMessageToken);
-                    if (!string.IsNullOrEmpty(itemErrorText))
-                    {
-                        // attach itemErrorText
-                        resultString += " " + itemErrorText;
-                    }
-
-                    _logger.Debug($"resultString: [{resultString}]");
-                    resultList.Add(resultString);
-                }
-
-                // wenn ergebnisse vorliegen, in html transformieren und anhängen
-                if (resultList.Count > 0)
-                {
-                    var htmlResultString = "<ul>";
-                    foreach (var resultItem in resultList)
-                    {
-                        htmlResultString += " <li>" + resultItem + "</li>" + Environment.NewLine;
-                    }
-                    htmlResultString += " </ul>";
-
-                    oMessage += " " + htmlResultString;
-                }
 
                 return new ValidationResponse()
                 {
                     status = RESPONSE_ERROR,
-                    message = oMessage
+                    message = oMessage,
+                    errors = oErrors
                 };
             }
             catch (Exception ex)
@@ -489,73 +348,20 @@ namespace ZUGFeRDRESTService.Controllers
             }
         }
 
-        private string GetMissingValuesListString(List<MissingProperty> missingProperties)
+        private Tuple<bool, string> ValidateBuyerOrderReference(List<ValidProperty> pProperties)
-        {
-            if (missingProperties == null || missingProperties.Count == 0)
-            {
-                return string.Empty;
-            }
-
-            string retValue = "<ul>";
-            foreach (var missingProperty in missingProperties) 
-            {
-                var searchToken = missingProperty.EN16931_ID + "_Description";
-                var descriptionTranslated = GetTextByToken(searchToken);
-                var rowString = "<li>" + missingProperty.EN16931_ID + " (" + descriptionTranslated + ")</li>";
-                retValue += rowString;
-            }
-            retValue += "</ul>";
-
-            return retValue;
-        }
-
-        /// <summary>
-        /// Holt sprachgenauen Text anhand eines Titel-Tokens
-        /// </summary>
-        /// <returns></returns>
-        private string GetTextByToken(string tokenValue)
-        {
-            RejectionStringRow stringRow = null;
-
-            if (!string.IsNullOrEmpty(tokenValue))
-            {
-                stringRow = _RecjectionMessageList.Where(i => i.Title.Equals(tokenValue, StringComparison.OrdinalIgnoreCase) &&
-                                                        i.Language.Equals(_UserLanguageCode, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-                if (stringRow == null &&
-                    !_UserLanguageCode.Equals(GERMAN, StringComparison.OrdinalIgnoreCase))
-                {
-                    // Wenn kein sprachgenauer Text vorliegt, hole den deutschen Text.
-                    stringRow = _RecjectionMessageList.Where(i => i.Title.Equals(tokenValue, StringComparison.OrdinalIgnoreCase) &&
-                                                                i.Language.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-                }
-            }
-
-            string retValue = string.Empty;
-
-            if (stringRow != null)
-            {
-               retValue = !string.IsNullOrEmpty(stringRow.String1) ? stringRow.String1.Trim() : string.Empty;
-            }
-
-            _logger.Debug($"Token [{tokenValue}] - String1 [{retValue}]");
-            return retValue;
-        }
-
-        /// <summary>
-        /// Hier wird eine externe Prozedur gerufen, PRCUST_INV_CHECK_FROM_PORTAL,
-        /// die das Ergebnis der Referenzpruefung liefert.
-        /// </summary>
-        private Tuple<bool, string> ValidateBuyerOrderReference(List<ValidProperty> pProperties, ZugferdResult pZugferdResult)
         {
             var oMessageId = GetMessageId();
             _logger.Debug("Created new MessageId: [{0}]", oMessageId);          
 
             _logger.Debug("Inserting properties into database.");
-            if (!BulkInsertDataToDatabase(oMessageId, pProperties, pZugferdResult))
+            foreach (var oItem in pProperties)
             {
-                _logger.Warn("Error while Inserting properties into database!");
+                var oResult = InsertPropertyMap(oItem, oMessageId);
-                return new Tuple<bool, string>(false, string.Empty);
+
+                if (oResult == false)
+                {
+                    _logger.Warn("Error while inserting the Property [{0}] into the Database!", oItem.Description);
+                }
             }
 
             _logger.Debug("Calling validation prodecure.");
@@ -571,57 +377,6 @@ namespace ZUGFeRDRESTService.Controllers
                 if (_database.MSSQL.ExecuteNonQuery(oCommand))
                 {
                     string oReturnValue = (string)oCommand.Parameters["@MSG_OUTPUT"].Value;
-
-                    _logger.Debug("Validation Result message from DB: " + oReturnValue);
-
-                    if (oReturnValue.Equals("ALL REFERENCES CHECKED POSITIVE", StringComparison.OrdinalIgnoreCase))
-                    {
-                        _logger.Debug("Validation Success");
-                        oReturnValue = VALIDATION_SUCCESS;
-                    }
-                    else
-                    {
-                        // Gehe durch die möglichen Fehler, und ermittle Rückmeldung
-                        foreach (var oRejectionItem in _ValidationErrors)
-                        {
-                            if (oReturnValue.Contains(oRejectionItem, StringComparison.OrdinalIgnoreCase))
-                            {
-                                _logger.Debug("oRejectionItem match: " + oRejectionItem);
-
-                                var oDbMessage = this.GetRejectionMessage(oRejectionItem);
-
-                                //Jetzt müssen ggf Platzhalter ersetzt werden.
-                                if (oRejectionItem == REFERENCES_Rejection_30003_2) 
-                                {
-                                    string oReplaceParam1 = GetReplaceText1_30003_2(pProperties);
-                                    string oReplaceParam2 = GetReplaceText2_30003_2(pProperties);
-
-                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", oReplaceParam1);
-                                    oReturnValue = oReturnValue.Replace("@REPLACE_PARAM2", oReplaceParam2);
-
-                                }
-                                else if (oRejectionItem == REFERENCES_Rejection_30003_3)
-                                {
-                                    string oReplaceParam1 = GetReplaceText1_30003_3(pProperties);
-
-                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", oReplaceParam1);
-                                }
-                                else if (oRejectionItem == REFERENCES_Rejection_30001)
-                                {
-                                    // TODO - BUKR?
-                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", "9999"); 
-                                }
-                                else
-                                {
-                                    oReturnValue = oDbMessage;
-                                }
-
-                                break;
-                            }
-                        }
-                    }
-
-                    _logger.Debug("Validation terminal Result message: " + oReturnValue);
                     return new Tuple<bool, string>(true, oReturnValue);
 
                 }
@@ -638,175 +393,57 @@ namespace ZUGFeRDRESTService.Controllers
             }          
         }
 
-        private string GetReplaceText1_30003_3(List<ValidProperty> pProperties)
+        public string GetMessageId()
-        {
-            string oReplaceParam1 = string.Empty;
-
-            // BuyerOrderReferencedDocument
-            var itemBT13 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE").FirstOrDefault();
-            string valueBt13 = "-";
-            if (itemBT13 != null)
-            {
-                valueBt13 = string.IsNullOrEmpty(itemBT13.Value) ? "-" : itemBT13.Value;
-            }
-            oReplaceParam1 += "<li>[BuyerOrderReferencedDocument] (BT-13) = [" + valueBt13 + "]</li>";
-
-
-            // BuyerReference
-            var itemBT10 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE3").FirstOrDefault();
-            string valueBt10 = "-";
-            if (itemBT10 != null)
-            {
-                valueBt10 = string.IsNullOrEmpty(itemBT10.Value) ? "-" : itemBT10.Value;
-            }
-            oReplaceParam1 += "<li>[BuyerReference] (BT-10) = [" + valueBt10 + "]</li>";
-
-
-            // CostCenter
-            var itemBT19 = pProperties.Where(i => i.TableColumn == "INVOICE_COST_CENTER").FirstOrDefault();
-            string valueBt19 = "-";
-            if (itemBT19 != null)
-            {
-                valueBt19 = string.IsNullOrEmpty(itemBT19.Value) ? "-" : itemBT19.Value;
-            }
-            oReplaceParam1 += "<li>[CostCenter] (BT-19) = [" + valueBt19 + "]</li>";
-
-            // BuyerID
-            var itemBT46 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_ID").FirstOrDefault();
-            string valueBt46 = "-";
-            if (itemBT46 != null)
-            {
-                valueBt46 = string.IsNullOrEmpty(itemBT46.Value) ? "-" : itemBT46.Value;
-            }
-            oReplaceParam1 += "<li>[BuyerTradeParty] (BT-46) = [" + valueBt46 + "]</li>";
-
-            oReplaceParam1 = "<ul>" + oReplaceParam1 + "</ul>";
-            _logger.Debug("oReplaceParam1-Text: " + oReplaceParam1);
-
-            return oReplaceParam1;
-        }
-
-        private string GetReplaceText2_30003_2(List<ValidProperty> pProperties)
-        {
-            string oReplaceParam2 = string.Empty;
-
-            // BuyerTradeParty.Name
-            var itemBT44 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_NAME").FirstOrDefault();
-            string valueBt44 = "-";
-            if (itemBT44 != null)
-            {
-                valueBt44 = string.IsNullOrEmpty(itemBT44.Value) ? "-" : itemBT44.Value;
-            }
-            oReplaceParam2 += "<li>[BuyerTradeParty.Name] (BT-44) = [" + valueBt44 + "]</li>";
-
-            // BuyerTradeParty.PostalTradeAddress.LineTwo
-            var itemBT51 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_ADRESS2").FirstOrDefault();
-            string valueBt51 = "-";
-            if (itemBT51 != null)
-            {
-                valueBt51 = string.IsNullOrEmpty(itemBT51.Value) ? "-" : itemBT51.Value;
-            }
-            oReplaceParam2 += "<li>[BuyerTradeParty.PostalTradeAddress.LineTwo] (BT-51) = [" + valueBt51 + "]</li>";
-
-            oReplaceParam2 = "<ul>" + oReplaceParam2 + "</ul>";
-            _logger.Debug("oReplaceParam2-Text: " + oReplaceParam2);
-
-            return oReplaceParam2;
-        }
-
-        private string GetReplaceText1_30003_2(List<ValidProperty> pProperties)
-        {
-            string oReplaceParam1 = string.Empty;
-
-            // BuyerOrderReferencedDocument
-            var itemBT13 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE").FirstOrDefault();
-            string valueBt13 = "-";
-            if (itemBT13 != null)
-            {
-                valueBt13 = string.IsNullOrEmpty(itemBT13.Value) ? "-" : itemBT13.Value;
-            }
-            oReplaceParam1 += "<li>[BuyerOrderReferencedDocument] (BT-13) = [" + valueBt13 + "]</li>";
-
-
-            // BuyerReference
-            var itemBT10 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE3").FirstOrDefault();
-            string valueBt10 = "-";
-            if (itemBT10 != null)
-            {
-                valueBt10 = string.IsNullOrEmpty(itemBT10.Value) ? "-" : itemBT10.Value;
-            }
-            oReplaceParam1 += "<li>[BuyerReference] (BT-10) = [" + valueBt10 + "]</li>";
-
-
-            // CostCenter
-            var itemBT19 = pProperties.Where(i => i.TableColumn == "INVOICE_COST_CENTER").FirstOrDefault();
-            string valueBt19 = "-";
-            if (itemBT19 != null)
-            {
-                valueBt19 = string.IsNullOrEmpty(itemBT19.Value) ? "-" : itemBT19.Value;
-            }
-            oReplaceParam1 += "<li>[CostCenter] (BT-19) = [" + valueBt19 + "]</li>";
-
-            oReplaceParam1 = "<ul>" + oReplaceParam1 + "</ul>";
-            _logger.Debug("oReplaceParam1-Text: " + oReplaceParam1);
-
-            return oReplaceParam1;
-        }
-
-        private string GetMessageId()
         {
             return $"{Guid.NewGuid()}@{MESSAGEID_DOMAIN}";
         }
 
-        private bool BulkInsertDataToDatabase(string pMessageId, List<ValidProperty> pProperties, ZugferdResult pZugferdResult)
+        public bool InsertPropertyMap(ValidProperty pProperty, string pMessageId)
         {
-            if (string.IsNullOrEmpty(pMessageId)) 
+            try
             {
-                return false;
+                if (pProperty.ItemType == 3)
+                {
+                    // Wir speichern keine Attachment-Werte in die DB
+                    return true;
                 }
 
-            if (!DeleteExistingPropertyValues(pMessageId)) 
+                if (pProperty.ItemType == 0 && string.IsNullOrEmpty(pProperty.Value.ToString()))
                 {
-                return false;
+                    // Leere Texte speichern wir nicht in der DB
+                    return true;
                 }
 
-            DataTable oDataTable = PrepareDataTable(pMessageId, pProperties, pZugferdResult);
+                var oSql = $"INSERT INTO {pProperty.TableName} " +
+                    "(REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, CREATEDWHO, SPEC_NAME, GROUP_COUNTER, IS_REQUIRED) VALUES " +
+                    "(@REFERENCE_GUID, @ITEM_DESCRIPTION, @ITEM_VALUE, @CREATEDWHO, @SPEC_NAME, @GROUP_COUNTER, @IS_REQUIRED)";
 
-            // ColumnList initialisieren
+                string itemValue = string.Empty;
-            List<string> oColumnNames = new List<string> {
+                if (pProperty.Value.Length > 4000)
-                    "REFERENCE_GUID",
+                {
-                    "ITEM_DESCRIPTION",
+                    itemValue = pProperty.Value.Substring(1, 4000);
-                    "ITEM_VALUE",
+                    _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", pProperty.TableColumn);
-                    "GROUP_COUNTER",
+                }
-                    "SPEC_NAME",
+                else
-                    "IS_REQUIRED"
+                {
+                    itemValue = pProperty.Value;
+                }
+                
+                var oParams = new SqlParameter[]
+                {
+                    new SqlParameter("@REFERENCE_GUID", pMessageId),
+                    new SqlParameter("@ITEM_DESCRIPTION", pProperty.Description),
+                    new SqlParameter("@ITEM_VALUE", itemValue.Replace("'", "''")),
+                    new SqlParameter("@CREATEDWHO", ADDED_WHO),
+                    new SqlParameter("@GROUP_COUNTER", pProperty.GroupCounter),
+                    new SqlParameter("@SPEC_NAME", pProperty.TableColumn),
+                    new SqlParameter("@IS_REQUIRED", pProperty.IsRequired)
                 };
 
-            bool oBulkResult = BulkInsert(oDataTable, "TBEDMI_ITEM_VALUE", oColumnNames);
+                var oCommand = new SqlCommand(oSql);
+                oCommand.Parameters.AddRange(oParams);
 
-            if (!oBulkResult)
+                return _database.MSSQL.ExecuteNonQuery(oCommand);
-            {
-                _logger.Error("Bulk Insert for MessageId [{0}] failed!", pMessageId);
-                return false;
-            }
-
-            _logger.Info("Bulk Insert finished. [{0}] rows inserted for MessageId [{1}].", oDataTable.Rows.Count, pMessageId);
-            return true;
-        }
-
-        private bool BulkInsert(DataTable pDataTable, string pDestinationTable, List<string> pColumnNames)
-        {
-            using (var oSqlBulkCopy = new SqlBulkCopy(_database.MSSQL.GetConnection()))
-            {
-                oSqlBulkCopy.DestinationTableName = pDestinationTable;
-                foreach (var columnItem in pColumnNames)
-                {
-                    oSqlBulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(columnItem, columnItem));
-                }
-
-                try
-                {
-                    oSqlBulkCopy.WriteToServer(pDataTable);
             }
             catch (Exception ex)
             {
@@ -815,211 +452,24 @@ namespace ZUGFeRDRESTService.Controllers
             }    
         }
 
-            return true;
-        }
-
-        private DataTable PrepareDataTable(string pMessageId, List<ValidProperty> pProperties, ZugferdResult pDocument)
-        {
-            DataTable oDataTable = new DataTable();
-            oDataTable.Columns.Add(new DataColumn("REFERENCE_GUID", typeof(string)));
-            oDataTable.Columns.Add(new DataColumn("ITEM_DESCRIPTION", typeof(string)));
-            oDataTable.Columns.Add(new DataColumn("ITEM_VALUE", typeof(string)));
-            oDataTable.Columns.Add(new DataColumn("GROUP_COUNTER", typeof(Int32)));
-            oDataTable.Columns.Add(new DataColumn("SPEC_NAME", typeof(string)));
-            oDataTable.Columns.Add(new DataColumn("IS_REQUIRED", typeof(bool)));
-
-            // Erste Zeile enthält die Spezifikation
-            DataRow oFirstRow = oDataTable.NewRow();
-            oFirstRow["REFERENCE_GUID"] = pMessageId;
-            oFirstRow["ITEM_DESCRIPTION"] = "Verwendete Spezifikation der E-Rechnung";
-            oFirstRow["ITEM_VALUE"] = pDocument.Specification;
-            oFirstRow["GROUP_COUNTER"] = 0;
-            oFirstRow["SPEC_NAME"] = "ZUGFERD_SPECIFICATION";
-            oFirstRow["IS_REQUIRED"] = false;
-
-            _logger.Debug("Mapping Property [ZUGFERD_SPECIFICATION] with value [{0}]", pDocument.Specification);
-            oDataTable.Rows.Add(oFirstRow);
-
-            //' Zweite Zeile enthält das verwendete XML Schema
-            DataRow oSecondRow = oDataTable.NewRow();
-            oSecondRow["REFERENCE_GUID"] = pMessageId;
-            oSecondRow["ITEM_DESCRIPTION"] = "Verwendetes XML-Schema (XSD) der E-Rechnung";
-            oSecondRow["ITEM_VALUE"] = pDocument.UsedXMLSchema;
-            oSecondRow["GROUP_COUNTER"] = 0;
-            oSecondRow["SPEC_NAME"] = "ZUGFERD_XML_SCHEMA";
-            oSecondRow["IS_REQUIRED"] = false;
-
-            _logger.Debug("Mapping Property [ZUGFERD_XML_SCHEMA] with value [{0}]", pDocument.UsedXMLSchema);
-            oDataTable.Rows.Add(oSecondRow);
-
-            //' Dritte Zeile enthält das verwendete Datei-Format des Belegs (PDF/XML)
-            if (pDocument.ReceiptFileType != null)
-            {
-                DataRow oThirdRow = oDataTable.NewRow();
-                oThirdRow["REFERENCE_GUID"] = pMessageId;
-                oThirdRow["ITEM_DESCRIPTION"] = "Dateityp der E-Rechnung";
-                oThirdRow["ITEM_VALUE"] = pDocument.ReceiptFileType;
-                oThirdRow["GROUP_COUNTER"] = 0;
-                oThirdRow["SPEC_NAME"] = "RECEIPT_FILE_TYPE";
-                oThirdRow["IS_REQUIRED"] = false;
-
-                _logger.Debug("Mapping Property [RECEIPT_FILE_TYPE] with value [{0}]", pDocument.ReceiptFileType);
-                oDataTable.Rows.Add(oThirdRow);
-            }
-
-            foreach (var propertyItem in pProperties)
-            {
-
-                // ItemType = 3 => eingebettete Datei, nicht den base64 speichern
-                if (propertyItem.ItemType == 3)
-                {
-                    continue;
-                }
-
-                // ItemType = 0 (normale texte) dürfen nicht leer sein - leere Werte werden überlesen
-                if (propertyItem.ItemType == 0 && string.IsNullOrEmpty(propertyItem.Value))
-                {
-                    continue;
-                }
-
-                // If GroupCounter is -1, it means this is a default property that can only occur once.
-                // Set the actual inserted value to 0
-                var oGroupCounterValue = propertyItem.GroupCounter < 0 ? 0 : propertyItem.GroupCounter;
-
-                if (propertyItem.Value.Length > 4000)
-                {
-                    _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", propertyItem.TableColumn);
-                    propertyItem.Value = propertyItem.Value.Substring(0, 4000);
-                }
-
-                // Description mit BT-Feld aufbereiten
-                var betterDescription = propertyItem.Description;
-                if (!string.IsNullOrEmpty(propertyItem.EN16931_ID))
-                {
-                    betterDescription = propertyItem.EN16931_ID + " (" + propertyItem.Description + ")";
-                }
-
-                DataRow newRow = oDataTable.NewRow();
-                newRow["REFERENCE_GUID"] = pMessageId;
-                newRow["ITEM_DESCRIPTION"] = betterDescription;
-                newRow["ITEM_VALUE"] = propertyItem.Value;
-                newRow["GROUP_COUNTER"] = oGroupCounterValue;
-                newRow["SPEC_NAME"] = propertyItem.TableColumn;
-                newRow["IS_REQUIRED"] = propertyItem.IsRequired;
-
-                _logger.Debug("Mapping Property [{0}] with value [{1}]", propertyItem.TableColumn, propertyItem.Value);
-                oDataTable.Rows.Add(newRow);
-            }
-
-            return oDataTable;
-        }
-
-        private bool DeleteExistingPropertyValues(string pMessageId)
-        {
-            try
-            {
-                var delItemValueSQL = "DELETE FROM TBEDMI_ITEM_VALUE WHERE REFERENCE_GUID = '" + pMessageId + "';";
-                var oCommand = new SqlCommand(delItemValueSQL);
-                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
-
-                if (!retValue)
-                {
-                    _logger.Warn("DELETE FROM TBEDMI_ITEM_VALUE NOT successfull");
-                    return false;
-                }
-
-                _logger.Debug("DELETE FROM TBEDMI_ITEM_VALUE successfull");
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex);
-                return false;
-            }
-
-            try
-            {
-                var delItemFilesSQL = "DELETE FROM TBEDMI_ITEM_FILES WHERE REFERENCE_GUID = '" + pMessageId + "';";
-                var oCommand = new SqlCommand(delItemFilesSQL);
-                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
-
-                if (!retValue)
-                {
-                    _logger.Warn("DELETE FROM TBEDMI_ITEM_FILES NOT successfull");
-                    return false;
-                }
-                _logger.Debug("DELETE FROM TBEDMI_ITEM_FILES successfull");
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex);
-                return false;
-            }
-
-            return true;
-        }
-
         /// <summary>
         /// Ermittelt die Ausgabe-nachricht für einen Fehlercode 
         /// </summary>
-        private string GetRejectionMessage(string pErrorCode)
+        public string GetRejectionMessage(string pErrorCode)
         {
             _logger.Info("GetRejectionMessage() - errorCode.ToString(): '" + pErrorCode.ToString() + "'");
 
             if (_RecjectionMessageList == null) return string.Empty;
 
-            var searchTitle = string.Empty;
+            // Sprache wird man vielleicht mal auswählen können
+            var language = "de-DE";
+            var searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web";
 
-            if (pErrorCode.Contains("2000"))
+            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language.Equals(language, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            if (messageItem != null)
             {
-                searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web";
+                _logger.Info("GetRejectionMessage() - messageItem: '" + messageItem.String1 + "'");
-            }
+                return messageItem.String1;
-            else if (pErrorCode.Contains("REFERENCES_Rejection_3000"))
-            {
-                searchTitle = pErrorCode + "_Web";
-            }
-            else if (pErrorCode.Contains("AMOUNT_CALC"))
-            {
-                searchTitle = "AMOUNT_CALC_REJECTION_Web";
-            }
-            else
-            {
-                searchTitle = "ZUGFERD_Rejection_20006_Web";
-            }
-
-            // Sprachgenauen Text suchen.
-            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) &&
-                                                                i.Language.Equals(_UserLanguageCode, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-            if (messageItem == null && 
-                !_UserLanguageCode.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)) {
-
-                _logger.Info("GetRejectionMessage() - Es wurde kein passender Text für die Sprache [{0}] gefunden.", _UserLanguageCode);
-
-                // Wenn kein sprachgenauer Text vorliegt, hole den deutschen Text.
-                messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) &&
-                                                                i.Language.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-            }
-
-            if (messageItem != null && !string.IsNullOrEmpty(pErrorCode))
-            {
-                var resultText = string.Empty;
-
-                // Der REJECTION-Code wird in allen Meldungen ausgetauscht.
-                if (messageItem.String1.Contains("@REJECTION_CODE", StringComparison.OrdinalIgnoreCase))
-                {
-                    var substituteText = this.GetLabelText("Ablehnungscode", _UserLanguageCode);
-                    substituteText = string.IsNullOrEmpty(substituteText) ? "Ablehnungscode" : substituteText;
-                    substituteText = substituteText + ": " + pErrorCode;
-
-                    resultText = Regex.Replace(messageItem.String1, "@REJECTION_CODE", substituteText, RegexOptions.IgnoreCase);
-                } 
-                else
-                {
-                    resultText = messageItem.String1;
-                }
-
-                _logger.Info("GetRejectionMessage() - messageItem: '" + resultText + "'");
-                return resultText;
             }
             else
             {
@@ -1028,15 +478,6 @@ namespace ZUGFeRDRESTService.Controllers
             }
         }
 
-        private string GetLabelText(string pLabel, string pLanguage)
-        {
-            // Sprachgenauen Text suchen.
-            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(pLabel, StringComparison.OrdinalIgnoreCase) &&
-                                                                i.Language.Equals(pLanguage, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-            return messageItem != null ? messageItem.String1 : string.Empty;
-        }
-
         private string GetRejectionCodeNumber(ErrorCodes rejectionCode)
         {
             switch (rejectionCode)

WEBSERVICES/ZUGFeRDRESTService/Pages/Index.cshtml

@@ -16,11 +16,6 @@
         <input type="email" name="user_id" required />
     </p>
     
-    <p>
-        <label>Sprachcode (de-DE etc.):</label>
-        <input type="text" name="language_id" value="de-DE" required />
-    </p>
-
     <button type="submit">Submit</button>
 </form>
 

WEBSERVICES/ZUGFeRDRESTService/appsettings.Development.json

@@ -20,11 +20,11 @@
     },
 	"Zugferd": {
       "AllowZugferd10": true,
-      "AllowZugferd2x": true,
+      "AllowZugferd2x": false,
-      "AllowZugferd23x": true,
+      "AllowZugferd23x": false,
-      "AllowFacturX": true,
+      "AllowFacturX": false,
-      "AllowXRechnung": true,
+      "AllowXRechnung": false,
-      "AllowPeppolBISBill3x": true
+      "AllowPeppolBISBill3x": false
     },
     "GDPictureVersion": "",
     "MaxFileSizeInMegabytes": 25