rename EDMIAPI to EDMI.API, Rename IDBService to EDMIService

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class DocumentViewer
     Inherits System.Windows.Forms.UserControl
 
     'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,14 +20,12 @@ Partial Class DocumentViewer
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer))
         Me.GdViewer = New GdPicture14.GdViewer()
         Me.mainToolStrip = New System.Windows.Forms.ToolStrip()
-        Me.btnOpen = New System.Windows.Forms.ToolStripButton()
         Me.btnPrint = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
         Me.btnFitWidth = New System.Windows.Forms.ToolStripButton()
         Me.btnFitPage = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
@@ -55,12 +53,11 @@ Partial Class DocumentViewer
         Me.btnFlipY = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.btnSettings = New System.Windows.Forms.ToolStripButton()
-        Me.statusbar = New System.Windows.Forms.StatusStrip()
-        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.statusLabel = New System.Windows.Forms.ToolStripStatusLabel()
         Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
+        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
+        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
+        Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
         Me.mainToolStrip.SuspendLayout()
-        Me.statusbar.SuspendLayout()
         Me.SuspendLayout()
         '
         'GdViewer
@@ -104,7 +101,7 @@ Partial Class DocumentViewer
         Me.GdViewer.MagnifierZoomY = 2.0!
         Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
         Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
-        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom
+        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeVerticalScroll
         Me.GdViewer.Name = "GdViewer"
         Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
         Me.GdViewer.PageBordersPenSize = 1
@@ -126,7 +123,7 @@ Partial Class DocumentViewer
         Me.GdViewer.ScrollLargeChange = CType(50, Short)
         Me.GdViewer.ScrollSmallChange = CType(1, Short)
         Me.GdViewer.SilentMode = True
-        Me.GdViewer.Size = New System.Drawing.Size(1015, 537)
+        Me.GdViewer.Size = New System.Drawing.Size(1015, 559)
         Me.GdViewer.TabIndex = 0
         Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
         Me.GdViewer.Zoom = 1.0R
@@ -139,25 +136,13 @@ Partial Class DocumentViewer
         Me.mainToolStrip.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
         Me.mainToolStrip.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnOpen, Me.btnPrint, Me.ToolStripSeparator3, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings})
+        Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings})
         Me.mainToolStrip.Location = New System.Drawing.Point(0, 0)
         Me.mainToolStrip.Name = "mainToolStrip"
         Me.mainToolStrip.Size = New System.Drawing.Size(1015, 31)
         Me.mainToolStrip.TabIndex = 6
         Me.mainToolStrip.Text = "ToolStrip1"
         '
-        'btnOpen
-        '
-        Me.btnOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnOpen.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnOpen.Image = CType(resources.GetObject("btnOpen.Image"), System.Drawing.Image)
-        Me.btnOpen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.btnOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnOpen.Margin = New System.Windows.Forms.Padding(10, 1, 0, 2)
-        Me.btnOpen.Name = "btnOpen"
-        Me.btnOpen.Size = New System.Drawing.Size(28, 28)
-        Me.btnOpen.Text = "Open document"
-        '
         'btnPrint
         '
         Me.btnPrint.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -168,12 +153,6 @@ Partial Class DocumentViewer
         Me.btnPrint.Size = New System.Drawing.Size(28, 28)
         Me.btnPrint.Text = "Print document"
         '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
-        '
         'btnFitWidth
         '
         Me.btnFitWidth.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -401,43 +380,44 @@ Partial Class DocumentViewer
         Me.btnSettings.Size = New System.Drawing.Size(28, 28)
         Me.btnSettings.Text = "Viewer settings"
         '
-        'statusbar
-        '
-        Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1, Me.statusLabel})
-        Me.statusbar.Location = New System.Drawing.Point(0, 568)
-        Me.statusbar.Name = "statusbar"
-        Me.statusbar.Size = New System.Drawing.Size(1015, 22)
-        Me.statusbar.SizingGrip = False
-        Me.statusbar.TabIndex = 7
-        Me.statusbar.Text = "StatusStrip1"
-        '
-        'ToolStripStatusLabel1
-        '
-        Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1"
-        Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(0, 17)
-        '
-        'statusLabel
-        '
-        Me.statusLabel.Name = "statusLabel"
-        Me.statusLabel.Size = New System.Drawing.Size(0, 17)
-        '
         'OpenFileDialog
         '
         Me.OpenFileDialog.FileName = "OpenFileDialog1"
         '
+        'RichEditControl1
+        '
+        Me.RichEditControl1.Location = New System.Drawing.Point(735, 377)
+        Me.RichEditControl1.Name = "RichEditControl1"
+        Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
+        Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
+        Me.RichEditControl1.ReadOnly = True
+        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
+        Me.RichEditControl1.TabIndex = 8
+        Me.RichEditControl1.Text = "RichEditControl1"
+        Me.RichEditControl1.Visible = False
+        '
+        'SpreadsheetControl1
+        '
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377)
+        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
+        Me.SpreadsheetControl1.ReadOnly = True
+        Me.SpreadsheetControl1.Size = New System.Drawing.Size(268, 161)
+        Me.SpreadsheetControl1.TabIndex = 9
+        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
+        Me.SpreadsheetControl1.Visible = False
+        '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.SpreadsheetControl1)
+        Me.Controls.Add(Me.RichEditControl1)
         Me.Controls.Add(Me.GdViewer)
-        Me.Controls.Add(Me.statusbar)
         Me.Controls.Add(Me.mainToolStrip)
         Me.Name = "DocumentViewer"
         Me.Size = New System.Drawing.Size(1015, 590)
         Me.mainToolStrip.ResumeLayout(False)
         Me.mainToolStrip.PerformLayout()
-        Me.statusbar.ResumeLayout(False)
-        Me.statusbar.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -445,9 +425,7 @@ Partial Class DocumentViewer
 
     Friend WithEvents GdViewer As GdPicture14.GdViewer
     Friend WithEvents mainToolStrip As ToolStrip
-    Friend WithEvents btnOpen As ToolStripButton
     Friend WithEvents btnPrint As ToolStripButton
-    Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
     Friend WithEvents btnFitWidth As ToolStripButton
     Friend WithEvents btnFitPage As ToolStripButton
     Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
@@ -475,8 +453,8 @@ Partial Class DocumentViewer
     Friend WithEvents btnFlipY As ToolStripButton
     Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
     Friend WithEvents btnSettings As ToolStripButton
-    Friend WithEvents statusbar As StatusStrip
-    Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel
-    Friend WithEvents statusLabel As ToolStripStatusLabel
     Friend WithEvents OpenFileDialog As OpenFileDialog
+    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
+    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
+    Friend WithEvents PrintDocument1 As Printing.PrintDocument
 End Class

Controls.DocumentViewer/DocumentViewer.resx

@@ -121,34 +121,16 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALYSURBVEhLzVTdSxRRFN/Syh6EqP6C/oDoIQhfMqKPdWd1
-        JVqqhwhrZ6p9KDX3o7RuMTNbwhr0UvgQPoQP7s6saXqHIvIl6K1gW8iHyr4WdzYQCjTdr+me68w0Xlwx
-        NOjAj3vOuXN/v3POnRnXf20IoY1NqnjQq4idnCJfaVLlw/5EosbcXpt5U7EGTpUnCYwlSMrvPYq433zM
-        5YpGo4ORSKRiwiCxYcXgmxg0H6cG5EdUNOcbvmM0p2I2+ckndxf9R2ieS4oH6MNOwmoCZp6KwFgIySSQ
-        A9nLb+8MX+q2LWIjKU41TqBaKrBKgGAcZg4ELYQUyMFe5z4YrabgQqloi3hUiVvSQRXf6gAQh8u0CFgR
-        yFUqlT8CityzGgHbBwGPIoUsAoBTpFQu09Vr70vX/2ZEAMwp0lE47B+J2yKAueICJQezLt6ryK1MB6H7
-        vaFQfV9fx9ahZTCAUJ3Q378JLtAini3MG4VyyUaRAC69KSll3fjeFqfAT/KG1GYSwT1p3FLOa4KRHuAr
-        AMuHNYcDvZwiHuJUVLBEWOxVUQkuWB/nbzpGFHkGr+GnUf4SEFXDW81X1jXhGIwKqmTJ3UmU8ypScx6f
-        93zVAj/sDq5Fw7dAIDsuDDmrZjuANYP5EqlObE3FdhDS4+TiZQD5ZZyAXB4LKDvaUpgeCzy1O0DdXe5E
-        wl+j47bPVrVrhY6FKBUIBoMLcdS5M61c3MVW7fSdOTZezp8e4/eZHUQyhuHa8HH4wumVDjhzbMz6Odw2
-        MzVxps4UCD+k8x/jH8Dm+oDMHwwEbnSHefB1fC5drSI2x8asn9MCPZZARUZdu98MXN6W0YRStQNsjo1Z
-        P4/5RirQ3t4+Qz6wzZOq4KYb64JTs98fn62nAuQbeA7rlxFBgs1qFbE5Nmb8V5QcrPtqRII1Ox54scIB
-        6jtzbOz0dcz3UXIwhDq2w6rjRYE1Y1j4ldOEBkr+783l+g2Z7twS24tpVgAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="btnPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFfSURBVEhLvVUxTsQwEAwgGv4Ev0ifKg+IFCUN8i9OIBSo
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVWxToRAEEWNjf+kf0FBRccHkBBozH6CjSHa
-        +ECuoEA8hDJKkf4ESnHBZsfn5RwHK747wkgjz652d7x3iRL5UBSFJCqcZVmOTiZipmkLgxDinAaoUBxs
+        aGVvuNL4IRIKvuFyFwpx13l7O96ySNi7E1/ysm8mM/N27iAEU8jzXBIVzqIoBicTMdO0+UEIcU4DlC8O
-        kKbp5bIGQlwtvMG93kBKqQfYJ5Nj4CCDm3KtTqEZswe5vyVJ8oWnYhgGdV3UxAeJYpy2tnNuDA12Xaef
+        NkiS5HJZAyGuFt7gUW8gpdQD7JPJMXCQwU2xUqfQjNmD3N+jKPrCU9H3vbrOK+K9RDFOW9s5N4YG27bV
-        Lpq5zfP8GQY/j95fGpiZgzZgwoALjyX/J8ylN5Ajg77vlVi9UEOti3dme23n3BgavW3b+g3qulZN00jc
+        T1ccx59Zlr3A4OfR+0sDM7PXBkwYcOGx5P+EufQGcmDQdZ0Sd6/UUOnindle2zk3hkZv0zTTBlVVqbqu
-        AqvitLWdc2No9FZVNTVYkqMN5rSdc2Of/p8NtDCA9t3IzrmxT2OgTtjkolC4Q1njbcaHZU2JiQkYit96
+        JW6BVXHa2s65MTR6y7IcGyzJwQZz2s658ZT+nw20MICeupGdc+MpjYE6YZOLfOEOZY23GR+WFSVGJqAv
-        iQPxzvwwU6CI8fT6rh4dIsfAbfGRMq1hsA3mcLLB3AaojeP4wrSGwd3AfXM5Bo7dYGP6Z5Fl2Se1nO06
+        fusl9sQH88OMgSLG89uHenKIHAO3xUfKtPrBNpjDyQZzG6A2DMML0+oHdwP3zeUYOHaDtemfRZqmW2o5
-        A0G3Io9yg01m+EG8NW0OougbGXHgW8q3sOgAAAAASUVORK5CYII=
+        23V6gm5FHsUam8xwQ7w1bQ6C4BuAm93DSGjZ/gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnFitWidth.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -172,87 +154,87 @@
   <data name="btnMouseMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZPPKwRhHMa3/Dq5+AcclYuDC5oZcfIHcFO4
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AFqjUKDzIxQ+QE0IqHS
-        uEgidkYODsRFSa6KI0th3k1+HLhQpOXgrHDkRhTxep/x3Zq8z5pZn/r0Nu/3fZ7Znd3JlKKnJ1fh+Ple
+        iAhhZ0ShIDQSEVFTsiSYuxEfBQ0JkaVQS1DSERLCdc94N5m4Z82sJ3lyM/e958zu7E6mFD09uQrHz/e5
-        N1Chl1X3DQOrH16g9FzuSmONrs0+5jiH8xJNpmV0v87JqjMU/Xbr9NbagziPnFT8jflUe6yke/5Iz24U
+        gQq9rLpv6F/98AKl53JXGmt0bfYxxzmcl2gyLaP7dU5WnaHot1unt9YexHnkpOJvzKfaYyXd80d6dqMQ
-        opXNkZOK0niTymVh+Pz2rgFWNo80eanieH64TIPGOGweafJSxXEm1AUNGuOwOUReqjjOmHpiQRiHzSHy
+        rWyOnFSUxptULgvD57d3DbCyeaTJSxXH88NlGjTGYfNIk5cqjjOhLmjQGIfNIfJSxXHG1BMLwjhsDpGX
-        UsXxBtQnC8I4bB5p8lJl0z59XElDxs6pvL6+fdIv5gfGimt2DkqdTfPgZRULxM2untP9ou1GqbMp3uCg
+        Ko7Xqz5ZEMZh80iTlyqb9unjShoydk7l9fXtk34xPzBWXLNzUOpsmgcvq1ggbnb1nO4XbTdKnU3xBgeF
-        8PAv8xd30U2kzoZ9AzyKvsUT7a+d65n1gp7fvIpWXGOfPSqps0nziNIodTaN07lqFihXqbPpGt6rYYFy
+        h3+Zv7iLbiJ1Nuwb4FH0L55of+1cz6wX9PzmVbTiGvvsUUmdTZpHlEaps2mczlWzQLlKnU3X8F4NC5Sr
-        lTqbn7/pyhcLpXflS+o4f73JaUx8k51AHbJgWpGXKo7rh0MsmFbkpYrTNrFT2xqoRxZOEjnkpao0rr/b
+        1Nn8/E1XvlgovStfUsf5601OY+Kb7ATqkAXTirxUcVw/HGLBtCIvVZy2iZ3a1kA9snCSyCEvVaVx/d0B
-        zwqSRE4qknF9tcRKSonzEk2PG4TjTSPbb6ywKOY4J5Hy6ZjK1ztBuGDKboyvMW+wj7kcJWQy34QJuKYJ
+        VpAkclKRjOurJVZSSpyXaHrcIBxvGtl+Y4VFMcc5iZRPx1S+3gnCBVN2Y3yNeYN9zOUoIZP5Bl9auHhV
-        Zco/AAAAAElFTkSuQmCC
+        DRJiAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnFirstPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIJ28iQVHE
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmof0CkKIp4
-        W8++mt0iEgQt+hM8eRfFZreI4ME/IAqK+h8En1efmXaiyzapSWn0gyGTeXzfzpAsyQKjJX8A3fYCiCkT
+        69lXs1tEgiCiP8GTd1FsdksRPPgHREFR/4Pg8+oz005w2KY1Ka1+MGQyj+/bGZJlncB4MRhCt70AYi7U
-        29Q9eMYQIRaXn6oNzu++Yiox7CXRR7nYMrh4CnkwRQhlmx9gEIRnGgGzdNRvMlEOel90HixpTQCIKZMb
+        LveOXjDEmCP1F7Xhxf03TCWGu6IGuFQ7llTPEQ+mGOPC/wSDIDzTCNjFyqAt1HbY+2ryYElrAkDMhd4a
-        w0w8qr2qj6XpVmTyag8QWwv7D3qfbtiSbIKRxeNe6vrrBqvvWK2P87G1uUDtxFyuUebf63WJBSCgWihg
+        FeqJ9lIfS9OtyJblPiB2lg4fzT7TsCXZBGPLJ/3cCzYtUdsxrW/kY2tzgeqJpd7gIngw6xILQIBaJOBI
-        cbFqLVfu9HxSq5EDGk4xLt5hxw1x7V2NR/lIHyHQxFfff6tH+j8QgEAWhvT/MMEQl2/BnXKpx9Ma0kf/
+        te6slu7NfFKrkgPqTjGhPmDHdXHjncbjfKSPEWji0/ff6pH+DwQg0AlD+n+YYETq9/BOuTLjaQ3p4/+D
-        B2PspNtgcsIoinOLl79Pr9aFzzgf6aMFMEUcZ68zuH4ngx/tQq9LLAAB1aKuCts77bJ51UmzOmxtPkED
+        SXHaawk9ZRXUhSN/Tk/romcjH+njBTDFcrmD7vD6nQ5/tEuzLrEABKjFXRWuf9bjynIuzeqwtfkEdfD9
-        PK8juPenjBUQ+lld2Kv62JFSAAETma6cNt3Kldqr+liabEVxyBfOcpYrZgzu3+g8WNLaBDpqH0NRzlJX
+        rvDen7HWQKjWR3upjx0pBRAwke3pWdsrXdNe6mNpshU1QjZ/nnE8NWfJ4NbkwZLWJjBR/RgKep576iZa
-        XIerw1R7kS/s5Gwu5szi4S2GsgGsru4R8gWEZC4psffHngAAAABJRU5ErkJggg==
+        Habai2x+L+NKtWAXju8w1BnA6moeY9/IuSrpVj3aVAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnPreviousPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g
-        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW/9BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
+        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLa//BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
-        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yx9dr0
+        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxdd70
-        F9kAiiwIDV3FbFuxKdymdPMpO+/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
+        F9kAiiwIDV3FbFuxKdymdPMpO5fNf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
-        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0q2sCS1MRgC0DAI3cbu33Fplib
+        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qIJLUxGALQMAjdxu7fcWmWJuy
-        sg2X8bkImY9LDTIbajwCAMsTFpvKTQHAjHQEpJBSDDUWO7Ar3eBoXb5xh3z8/N8wFyG7EEbjY0ONwg/s
+        DZfxuQiZj0sNMhtqPAIAyxMWm8pNAcCMdASkkFIMNRY7sCvd4GhdvnGHfPz83zAXIbsQRuNjQ43CD+zK
-        yjcY2pRtXGGbteknsgFUswAGgEWFum355qn6+eu/gwwhBkO1kgZsq7ZLgkpRu4qNb7G5GpkN1UIesKnY
+        NxjalG1cYZu16SeyAVSzAAaARYW6bfnmqfr567+DDCEGQ7WSBmyrtkuCSlG7io1vsbkamQ3VQh6wqdgi
-        ImhbtrESVA/QxAIYABUvoLxkV7LhLshwZAxVQh0ASuK2pZujgbXbWar6AAMAi3ig672sSzcdhIrQCvxn
+        aFu2sRJUD9DEAhgAFS+gvGRXsuEuyHBkDFVCHQBK4ralm6OBtdtZqvoAAwCLeKDrvaxLNx2EitAK/Gdk
-        ZGBgYAAAx7aKXPsltNoAAAAASUVORK5CYII=
+        YGBgAABSZ4fXERBsXgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnNextPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2
-        FZv/Q/EN2/JNKfb1+zmgUtQBtuWt/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
+        FZv/Q/EN2/JNKfb1+zmgUtQBtuX1/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
-        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMa9Nf23L
+        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMedNf23L
-        N+yxr9jiQlQSB2kkC3tv/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
+        N+yxr9jiQlQSB2kkC7ts/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
-        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHbP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
+        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXH9P+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
         YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam
         nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2
-        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEApL+K
+        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEA5X2H
-        XHJ8GzIAAAAASUVORK5CYII=
+        142IlcMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFxSURBVEhLY4ABp8qN4lAmbYBt2dqPtuWbOmlmkV3F5v8g
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFwSURBVEhLY4ABp8qN4lAmbYBt2dqPtuWbOmlmkV3F5v8g
-        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF56z+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
+        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF5/T+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
         27x803vb8s0txFiE1wKQIF5csOYd2KKKLYJQLRiA1CDCYINo63JgHJVtbLQo3CEE1QoHZAURMhtZzLZ8
-        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOPLa9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
+        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOHLe9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
-        Ja2KzX/QxaHGk+uDtn/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
+        Ja2KzX/QxaHGk+uD+n/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
-        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggavtnW7bp
+        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggAtpatumq
-        qm3p5mjkyCMW4PWBTen66/YVm2KN02YS7WKSAClBQTxgYAAAJSouKVFt3MsAAAAASUVORK5CYII=
+        benmaOTIIxbg9YFN6frr9hWbYo3TZhLtYpIAKUFBPGBgAAB8byrpVSoE5AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMHSURBVEhLtVXfS5NRGA6KLuqiKCSCqIsi6Da69qL+Bm/S
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMESURBVEhLtVVdS1RRFA2KHuqhKCSCqIci6DV69qF+gy9p
-        kOnUObWJc6Dl9lmDwLAwKbFQK60M6qIfhCPKkiAQzGisiZlON8sSKzWpZes7Pe++93yeb1PUpAde3/Pj
+        iDrqfDiNOA5oOXMtQTAsTEos1Eorg3rog1CiLAkC0TGKSaeZUaaMKLFSk5psuqe15+5zPXdGUZMWbPf5
-        Oc/zvke/47ql4HQ69xQWFnoKCgoeIQ8VFRVNYjyMeIx5jd1u38/U1cFms2VA4Ep2dnYcojqFw+EQauaY
+        WGetvY/e47ql4HQ695SUlPiKi4sfIkdLS0snMR5DPMK8xmaz7Wfq6lBQUJAFgcu5ubkJiOoUdrtdqJlj
-        R9yE0S4+ujwgfAgiYyS00sjLy/uMfJgllgZaP4hqZmSFdJjznKadGT13sSlWV9fwkeapHOoWxR1hqXTk
+        HnEDRrv46PKA8CGIvCOhlUZhYeFn5MMssTTQ+kFUMyMrpMOc5zStPn72QstEQ0PTR5qnc6hbFHeEpTJR
-        5+dvA3FEHqAoLS2det7T82l0bEwXCsbHP+iht2Hhcrl+qnzEJEx2s6QVIDYQWYbH4xkfHBxMkODExITF
+        VFS0DcRxeYCirKxs6ll//6e3kYguFIyNjeuhNyPC4/H8VPmISZjsZkkrQGwisgyfz/chFAolSTAej1sM
-        QM6j0aje3Nz8Rz2HuM2SCygrK8uAe7JtIpWUlEyHw+EECS0XsVhM1zTNvK7c3NzfxcXFB1jaADbs3GKS
+        5Dwajeqtra1/1HOIWyy5ALfbnQX3VNtEcrlc0yROQstFLBbTNU0zrys/P/+3w+E4wNIGsGHjFlOkuz29
-        dK8rMEmHk+UC6pgg5zK/G3pvdkAauCaNpQ1goV0S4P5r9vucRXQ5Ax0/a0+dNk2g95SlDWDxpeygoqJ6
+        k3Q4VS6gjglyLnMkGjM7IA1ck8bSBrDQKQlw/zX7fc4iupyBjp+1p06bJtB7wtIGsPhCdlBRUT1FB7Or
-        ig5mVj0QmVUPEZTVsbpmzInfdv2G2QEixtIG4PhGGuA+p6iqdLGlDQidd++rBt9Y2gA2XkiD6hMnZ/+l
+        7ovsqgcIyupYXTPmxO+4dt3sADHB0gbg+Eoa4D6nqKpMsaUNCN137qkG31jaADaeS4PqEydn/6WD9qud
-        g9Zr7aYBvqcoSxvARgttUuD9SUzPzFruXR0T5FxmHb8Er09Lnud4wtIGsHBUdkCErkBgVQbhgQFTnDRw
+        pgG+p/csbQAbbbRJgfcnOT0za7l3dUyQc5l1/BL8AS11nuMxSxvAwlHZARF6entXZTAyOmqKkwauvIal
-        5TUsbQALW7D5RZLKy8sTwWBwRQbxeFz4/X7TADGPW9jH0guAs092QNnr9eqhUGjRj0tGJBLRGxsbzco5
+        DWBhCza/SFJ5eXlycHBwRQaJRELU1dWZBoh53MI+ll4AnAOyA8p+v18PBoOLflwywuGw3tzcbFbOuYsl
-        d7CkFehiE/01STKF2+0W3d3PxPBIxNJBFF9v36t+4fP5THFpgF9wL16C7SxrBTb3gkSvpdqyOO5yibqz
+        rUAXm+ivSZIpvF6v6Ot7iisIWzqI4usdCg6LQCBgiksD/IIH8BJsZ1krsLkXJHot1ZbFcY9HNJxpFBcv
-        9eLS5RZRf/6CcFdW0gdp4aiBQvvo8WRZK8iEOpEVqdXJkGuLceQYOv30j4tlrcjJydkMUi0IX1MPqyKo
+        tYnGc+eFt7KSPkgLRw0UOkSPJ8taQSbUiaxIrU6GXFuMI8fQGaZ/XCxrRV5e3maQakH4mn5YFUGVP5Bb
-        8gdyE8TupO7x+DU4O1g2HXjvt4J4DMQ2ZHpOQsi96LATYyeEdxIvKytrI9ZvkegiEUyKrRUwWQ/TDkTa
+        IHY7fY/HL8HZwbKZwHu/FcRjIHYg03MSQh5Ah90YOyG8k3g5OTkbsX6TRBeJ1ymxtQIm62Hahci4Lqas
-        dTFl7cA7tgHdXf1vBgQ2aV24Iof4C99AKagYLe9bAAAAAElFTkSuQmCC
+        HXjHNqC7K//NgMAm7QtXZBd/AWaMJXnjHFh9AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnZoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -325,25 +307,25 @@
   <data name="btnSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALDSURBVEhLpVY9aBRBFD5ECxstFLUSsTjlhPzc5rAJplFs
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALDSURBVEhLpVY9aFNRFA6ig4sOijqpU5QI/XsNLsUsiouD
-        LARt/MHrLsrd7s7MHmohHFpoJYIRRCwkaIRINrsX0VZsTGNhooVFII3Y2KiQCDFmfd/cm8u4dxePyweP
+        oEP8wW6tkuS9e+8L6lAIOugkghVEHKRohUpe3ktFV3Gxi4OtDg6FLuLiokIr1Jjn+W7Ojdf81JB+cLjn
-        ee+b9773ZmYPLmOQ96dOsqtRkFFwsPjkN/FXmOodjjf1zBFh4qh4EvGADPsLKk7A5US4qpM2g8Hy858Q
+        fPec75x77wskYTDilU+yq5GWoX9g/PEv4q8w1T8ct/zUEUHsqGgO8ZAMBtMqisGlRFDTSZvBcO7ZDwh2
-        bGdDMn7Mab3jqFffi2khiDXvhp+avgjHOG1zMA0G3Mmcjq+92AmuwUfuSO3NVp3YCxxvZj/EcypeZkqD
+        slEZPeK0/nHUre7FtBDEOlIIPjZ9EUxz2uZgGgwV5lI6vvZ8J7gGHxYypddbdWI/cNz5/RBPqWiNKQ16
-        3uQDeGNDIj7OW93DkdHo+qRxkvemT4EviPqRBh8lQ6pOVxUlg0F8DHuB5xWEEIlSKqH1JriOoCkX7QZY
+        k/fgjY2K6Dhv9Q5HhpN/J43iEbdyCnxaVI80+DAeVVW6qjAe9qNj2PNdNy2EiJVSMa03wHUFTbliN8Ca
-        s2JiqeFHScEPX42op+PDYuL2iHq0GzXS90etBi+1UCc4qn5CH19Nj9O3/wB+I6b3UPE8cq6qyqqU8q0u
+        FLOrDT+M017wMqOezIyJ2VsZ9XA3aqTnTVoNXmihbnBU9YQ+vqrM0Ld/H34jpvdQ0RJyrqp8TUr5RhcQ
-        IJBwDHFYpVL5xjT4c+Aot5+pVuA3gFOgQUFMvVaisqSUTKSeWK5ixfTFYvEPxODzaWYtP/F9/xBLtgI/
+        SDiCOCyfz39lGvw5cJQ7yFQ78BvAKdAgLcqvlMivKiVjqSeWNayYPpvN/oYYfD7NguXHnucdYsl24MeF
-        LjRw/Gj2srheDKiBLUgTrpkYK3Frlo8GX1iqPfrUdLYvCPdwmCHBOTOZETExVqv5GuJyubyLS7sDrggC
+        Bo4XLlwW18d9amAL0oR1E2Mlrm75aPCZpTpjQFWSA36wh8MECS6ayYyIibFazeuIc7ncLi7tDbgiCLTY
-        KRsjsbu0rqT4hMs2hpTeRRK4RzaHImvKlVqttoXTNDzP+25ycALy39EbCOKHOaUVKOhgLd89ceVUTtM4
+        NIndoXW9hY+5bGNI6V4kgbtkiyiyplwvlUpbOE3Ddd1vJgcnIP8tvYEgfoxT2oGCLtb23ROXa8lpGqe0
-        pRXYxDQ8kX2CKqc0QdNeMjlWnjZOaQU97BkqvEPHnLcb0AN+5ZQmSOizyYEoroxshupvcEpn4L5RbBuJ
+        A5uYhieyT1DklCZo2ksmx8rTxintoIc9Q4W36ZhLdgN6wC+c0gQJfTI5EMWVkc1T/RSndAfuG8W2kciy
-        LARBcJb80zTIx/Q+7TW/wK5Ak/zCZCg2U5oYa+pafnBZd6CCuhE2qzE7Nj6a0KlucfnGcF13BwotW07F
+        7/tnyT9Ng3xo3ae95hfYE2iSn5gMxWZKE2NtuZbvXNYbqKBqhM1qzI6NjyZ0qptcvjEKhcIOFFq21hJ3
-        HY2abGeZjUHJWRTQNT1EXK1W99GUC5gUPK2LtHcAe+S/Z/6fPxD/RalU2sauBongB6gbkPh9pjWIO8xu
+        NWqynWU2BiUnUUDX9ABxsVjcR1MuY1LwtK7Q3kHskf+O+X/+QPwXExMT29jVIBH8AHUDEr/HtAZxh9nt
-        76Djn4c42wWm2yCT+QvRc2XmxX0IkAAAAABJRU5ErkJggg==
+        H3T88xBnu8B0ByQSfwCqJWQA7REYAQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>128, 20</value>
-  </metadata>
   <metadata name="OpenFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>233, 25</value>
   </metadata>
+  <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>368, 25</value>
+  </metadata>
 </root>

Controls.DocumentViewer/DocumentViewer.vb

@@ -2,7 +2,11 @@
 Imports System.Globalization
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
+Imports Independentsoft.Msg
+Imports DevExpress.Spreadsheet
 Imports GdPicture14
+Imports DevExpress
+Imports DevExpress.Office.Utils
 
 Public Class DocumentViewer
     Private Enum ZoomMode
@@ -16,7 +20,6 @@ Public Class DocumentViewer
         ZoomFitHeight
     End Enum
 
-    Private _docPath As String
     Private _currentSearchOccurence As Integer = 0
     Private _toggleGamma As Boolean = True
     Private _licenseKey As String = String.Empty
@@ -24,6 +27,11 @@ Public Class DocumentViewer
     Private _logConfig As LogConfig
     Private _logger As Logger
 
+    Private _hide_file_info_from_user As Boolean = False
+
+    ' List of all created temp files when converting msg files
+    Private _TempFiles As New List(Of String)
+
     Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load
         Dim zoomModes As New Dictionary(Of ZoomMode, String) From {
             {ZoomMode.Zoom50, "50%"},
@@ -40,9 +48,16 @@ Public Class DocumentViewer
             cbZoom.Items.Add(item.Value)
         Next
 
+        _TempFiles.Clear()
+
         UpdateMainUi()
     End Sub
 
+    ''' <summary>
+    ''' Initialize the Viewer
+    ''' </summary>
+    ''' <param name="LogConfig">A LogConfig object</param>
+    ''' <param name="LicenseKey">The GDPicture.NET License Key</param>
     Public Sub Init(LogConfig As LogConfig, LicenseKey As String)
         _logConfig = LogConfig
         _logger = LogConfig.GetLogger()
@@ -51,33 +66,123 @@ Public Class DocumentViewer
         _licenseManager.RegisterKEY(_licenseKey)
     End Sub
 
-    Public Sub LoadFile(filepath As String)
+    ''' <summary>
+    ''' Terminate Viewer, freeing up resources and deleting temp files
+    ''' </summary>
+    Public Sub Done()
+        DeleteTempFiles()
+    End Sub
+
+    ''' <summary>
+    ''' Load a file and display it
+    ''' </summary>
+    ''' <param name="FilePath"></param>
+    Public Sub LoadFile(FilePath As String)
         If _licenseKey = String.Empty Then
-            _logger.Warn("License key was not provided. File {0} not loaded.", filepath)
+            _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
             Exit Sub
         End If
 
-        CloseDocument()
-
-        _docPath = filepath
-        statusLabel.Text = _docPath
-
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-        GdViewer.DisplayFromFile(filepath)
+
-        GdViewer.Focus()
+        _logger.Info("Loading File {0}", FilePath)
+
+        DoLoadFile(FilePath)
 
         UpdateMainUi()
     End Sub
 
-    Private Sub CloseDocument()
+    Public Sub CloseDocument()
         GdViewer.CloseDocument()
         UpdateMainUi()
     End Sub
 
-    Private Sub btnOpen_Click(sender As Object, e As EventArgs) Handles btnOpen.Click
+    Public Sub DeleteTempFiles()
-        CloseDocument()
+        For Each oFile In _TempFiles
+            Try
+                IO.File.Delete(oFile)
+            Catch ex As Exception
+                _logger.Warn("Could not delete temp file {0}", oFile)
+            End Try
+        Next
+        _TempFiles.Clear()
+    End Sub
 
+    Private Sub DoLoadFile(FilePath As String)
+        Try
+            Dim oFileInfo = New IO.FileInfo(FilePath)
+            Dim oExtension As String = oFileInfo.Extension.ToUpper
+
+            RichEditControl1.Visible = False
+            RichEditControl1.Dock = DockStyle.None
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            mainToolStrip.Visible = False
+
+            Select Case oExtension.ToUpper
+                Case ".MSG"
+                    Dim oMsg As New Message(FilePath)
+                    ' TODO: Improve Encoding, maybe convert based on encoding
+                    oMsg.Encoding = System.Text.Encoding.UTF32
+                    Dim oMime = oMsg.ConvertToMimeMessage()
+                    Dim oTempFileName = IO.Path.GetTempFileName()
+                    oMime.Save(oTempFileName, True)
+
+                    RichEditControl1.LoadDocument(oTempFileName, XtraRichEdit.DocumentFormat.Mht)
+
+                    _TempFiles.Add(oTempFileName)
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
+
+                    Select Case oExtension.ToUpper
+                        Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
+                        Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
+                        Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
+                        Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
+                        Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
+                        Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
+                    End Select
+
+                    RichEditControl1.LoadDocument(FilePath, oFormat)
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", "CSV"
+                    Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
+
+                    Select Case oExtension.ToUpper
+                        Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
+                        Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
+                        Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
+                    End Select
+
+                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    mainToolStrip.Visible = True
+
+                    GdViewer.DisplayFromFile(FilePath)
+            End Select
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    Private Sub btnOpen_Click(sender As Object, e As EventArgs)
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
 
@@ -89,28 +194,26 @@ Public Class DocumentViewer
         UpdateMainUi()
     End Sub
 
-    Private Function GetDocumentTypeLabel() As String
+    ''' <summary>
-        Dim result As String = ""
+    ''' Configures the viewer to hide the file path to the end-user.
-        Select Case GdViewer.GetDocumentType()
+    ''' </summary>
-            Case DocumentType.DocumentTypeBitmap
+    ''' <param name="ViewOnly">
-                result = "Bilddatei"
+    ''' True means that all file info should be hidden from the end-user
-            Case DocumentType.DocumentTypeMetaFile
+    ''' False means the end user may see the filepath or other info about the file
-                result = "Metafile"
+    ''' </param>
-            Case DocumentType.DocumentTypePDF
+    Public Sub RightOnlyView(ViewOnly As Boolean)
-                result = "PDF"
+        If ViewOnly Then
-            Case DocumentType.DocumentTypeSVG
+            btnPrint.Visible = False
-                result = "SVG"
+        Else
-            Case DocumentType.DocumentTypeTXT
+            btnPrint.Visible = True
-                result = "Textdatei"
+        End If
-            Case DocumentType.DocumentTypeUnknown
-                result = "Unbekannt"
-        End Select
-        Return result
-    End Function
 
+        _hide_file_info_from_user = Not ViewOnly
+    End Sub
     Private Sub UpdateMainUi()
+        Exit Sub
+
         If GdViewer.PageCount = 0 Then
-            'btnOpen.Enabled = True
             btnPrint.Enabled = False
             btnFirstPage.Enabled = False
             btnPreviousPage.Enabled = False
@@ -131,7 +234,6 @@ Public Class DocumentViewer
             lblPageCount.Text = "/ 0"
             cbZoom.SelectedIndex = -1
         Else
-            'btnOpen.Enabled = False
             btnPrint.Enabled = True
             btnFirstPage.Enabled = True
             btnPreviousPage.Enabled = True
@@ -375,24 +477,6 @@ Public Class DocumentViewer
             btnLastPage.Enabled = True
         End If
         cbZoom.Text = String.Format(CultureInfo.InvariantCulture, "{0:#0.##%}", GdViewer.Zoom)
-
-
-        Dim widthInches, heightInches As Double
-
-        If GdViewer.GetDocumentType = DocumentType.DocumentTypePDF Then
-            widthInches = GdViewer.PdfGetPageWidth / 72
-            heightInches = GdViewer.PdfGetPageHeight / 72
-        Else
-            widthInches = GdViewer.PageWidth / GdViewer.HorizontalResolution
-            heightInches = GdViewer.PageHeight / GdViewer.VerticalResolution
-        End If
-
-        Me.ToolStripStatusLabel1.Text = "Typ: " + GetDocumentTypeLabel() + "  -  " +
-                                        "Seitengröße (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + "  -  " +
-                                        "Seitengröße (pixel): " + Trim(Str(GdViewer.PageWidth)) + " × " + Trim(Str(GdViewer.PageHeight)) + "  -  " +
-                                        "Horizontale Auflösung: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI  -  " +
-                                        "Vertikale Auflösung: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI"
-
     End Sub
 
     Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click
@@ -452,4 +536,10 @@ Public Class DocumentViewer
         MagnifierToolStripMenuItem.Checked = True
         GdViewer.Focus()
     End Sub
+
+    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
+        Dim oControlWidth = RichEditControl1.Width - 100
+        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
+        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
+    End Sub
 End Class

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -8,8 +8,8 @@
     <OutputType>Library</OutputType>
     <StartupObject>
     </StartupObject>
-    <RootNamespace>DocumentViewer</RootNamespace>
+    <RootNamespace>DigitalData.Controls.DocumentViewer</RootNamespace>
-    <AssemblyName>DocumentViewer</AssemblyName>
+    <AssemblyName>DigitalData.Controls.DocumentViewer</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>DocumentViewer.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.Controls.DocumentViewer.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>DocumentViewer.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.Controls.DocumentViewer.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -48,12 +48,37 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Images.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Spreadsheet.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -134,6 +159,7 @@
     <EmbeddedResource Include="frmViewerSettings.resx">
       <DependentUpon>frmViewerSettings.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>

Controls.DocumentViewer/My Project/AssemblyInfo.vb

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

Controls.DocumentViewer/My Project/Resources.Designer.vb

@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DocumentViewer.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Controls.DocumentViewer.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

Controls.DocumentViewer/My Project/Settings.Designer.vb

@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DocumentViewer.My.MySettings
+        Friend ReadOnly Property Settings() As Global.DigitalData.Controls.DocumentViewer.My.MySettings
             Get
-                Return Global.DocumentViewer.My.MySettings.Default
+                Return Global.DigitalData.Controls.DocumentViewer.My.MySettings.Default
             End Get
         End Property
     End Module

Controls.DocumentViewer/My Project/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.DocumentViewer/My Project/licenses.licx.bak

@@ -0,0 +1 @@
+DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.DocumentViewer/packages.config

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

Controls.LookupGrid/LookupControl.vbproj

@@ -43,39 +43,32 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="DevExpress.Office.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Office.v18.1.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Pdf.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Pdf.v18.1.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Printing.v18.1.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v18.1.Export, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Export.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraLayout.v18.1.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraPrinting.v18.1.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Controls.LookupGrid/LookupControl.vbproj.bak

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Controls.LookupGrid</RootNamespace>
+    <AssemblyName>DigitalData.Controls.LookupGrid</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Controls.LookupGrid.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Controls.LookupGrid.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="DevExpress.Office.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Office.v18.1.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Pdf.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Pdf.v18.1.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Printing.v18.1.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v18.1.Export, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Export.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraLayout.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraPrinting.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="frmLookupGrid.Designer.vb">
+      <DependentUpon>frmLookupGrid.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmLookupGrid.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LookupControl.Designer.vb">
+      <DependentUpon>LookupControl.vb</DependentUpon>
+    </Compile>
+    <Compile Include="LookupControl.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LookupControl2.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LookupGridHandler.vb" />
+    <Compile Include="LookupGridRegistration.vb" />
+    <Compile Include="LookupGridView.Designer.vb">
+      <DependentUpon>LookupGridView.vb</DependentUpon>
+    </Compile>
+    <Compile Include="LookupGridView.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="LookupGridControl.Designer.vb">
+      <DependentUpon>LookupGridControl.vb</DependentUpon>
+    </Compile>
+    <Compile Include="LookupGridControl.vb">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frmLookupGrid.resx">
+      <DependentUpon>frmLookupGrid.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LookupControl.resx">
+      <DependentUpon>LookupControl.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LookupControl2.resx">
+      <DependentUpon>LookupControl2.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{94E38DFF-614B-4CBD-B67C-F211BB35CE8B}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

Controls.LookupGrid/LookupControl2.vb

@@ -80,6 +80,7 @@ Public Class LookupControl2
 
         Properties.Buttons.Item(0).Tag = TAG_DROPDOWN
         Properties.Buttons.AddRange({_LookupFormButton})
+        Properties.NullText = TEXT_NO_RECORDS
 
         AddHandler ButtonClick, AddressOf HandleButtonClick
         AddHandler EditValueChanging, AddressOf HandleEditValueChanging

Controls.LookupGrid/My Project/AssemblyInfo.vb

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

Controls.LookupGrid/My Project/licenses.licx

@@ -1,5 +1,3 @@
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.LookupGrid/My Project/licenses.licx.bak

@@ -0,0 +1 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.LookupGrid/frmLookupGrid.Designer.vb

@@ -38,7 +38,7 @@ Partial Class frmLookupGrid
         Me.gridLookup.Location = New System.Drawing.Point(0, 0)
         Me.gridLookup.MainView = Me.viewLookup
         Me.gridLookup.Name = "gridLookup"
-        Me.gridLookup.Size = New System.Drawing.Size(384, 221)
+        Me.gridLookup.Size = New System.Drawing.Size(388, 221)
         Me.gridLookup.TabIndex = 0
         Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup})
         '
@@ -55,7 +55,7 @@ Partial Class frmLookupGrid
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.Panel1.Location = New System.Drawing.Point(0, 221)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(384, 40)
+        Me.Panel1.Size = New System.Drawing.Size(388, 40)
         Me.Panel1.TabIndex = 1
         '
         'btnOK
@@ -64,14 +64,14 @@ Partial Class frmLookupGrid
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(117, 23)
         Me.btnOK.TabIndex = 0
-        Me.btnOK.Text = "OK (F1)"
+        Me.btnOK.Text = "OK (F2)"
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'btnClear
         '
         Me.btnClear.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnClear.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.btnClear.Location = New System.Drawing.Point(236, 6)
+        Me.btnClear.Location = New System.Drawing.Point(240, 6)
         Me.btnClear.Name = "btnClear"
         Me.btnClear.Size = New System.Drawing.Size(136, 23)
         Me.btnClear.TabIndex = 0
@@ -82,7 +82,7 @@ Partial Class frmLookupGrid
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(384, 261)
+        Me.ClientSize = New System.Drawing.Size(388, 261)
         Me.Controls.Add(Me.gridLookup)
         Me.Controls.Add(Me.Panel1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow

Controls.LookupGrid/frmLookupGrid.vb

@@ -1,5 +1,6 @@
 Imports System.Windows.Forms
 Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 
 Public Class frmLookupGrid
@@ -41,6 +42,7 @@ Public Class frmLookupGrid
         grid.DataSource = dataSourceTemp
 
         ' Anzeige Eigeschaften setzen
+        view.OptionsFind.Condition = DevExpress.Data.Filtering.FilterCondition.Contains
         view.OptionsFind.AlwaysVisible = True
         view.OptionsSelection.MultiSelect = False
 
@@ -155,15 +157,24 @@ Public Class frmLookupGrid
     End Sub
 
     Private Sub gridLookup_KeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.KeyUp
-        Select Case e.KeyCode
+        HandleCustomKeys(e)
-            Case Keys.Escape
+    End Sub
-                Close()
-            Case Keys.F1
-                SaveSelectedValues()
 
-                DialogResult = DialogResult.OK
+    Private Sub gridLookup_EditorKeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.EditorKeyUp
-                Close()
+        HandleCustomKeys(e)
-        End Select
+    End Sub
+
+    Private Sub HandleCustomKeys(e As KeyEventArgs)
+        If e.KeyCode = Keys.Escape Then
+            Close()
+        ElseIf e.KeyCode = Keys.F2 Then
+            ' Make sure the currently focused row's state is saved
+            viewLookup.PostEditor()
+            SaveSelectedValues()
+
+            DialogResult = DialogResult.OK
+            Close()
+        End If
     End Sub
 
     Private Sub viewLookup_CellValueChanging(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles viewLookup.CellValueChanging

DDEmailService/App.config

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="DDEmailService.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+    <applicationSettings>
+        <DDEmailService.My.MySettings>
+            <setting name="FB_ConnString" serializeAs="String">
+                <value>172.24.12.41</value>
+            </setting>
+            <setting name="SQLSERVER_CS" serializeAs="String">
+                <value>Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
+            </setting>
+            <setting name="SQLSERVER_CS_TEST" serializeAs="String">
+                <value>Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
+            </setting>
+            <setting name="FB_DATABASE" serializeAs="String">
+                <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
+            </setting>
+            <setting name="FB_USER" serializeAs="String">
+                <value>sysdba</value>
+            </setting>
+            <setting name="FB_PW" serializeAs="String">
+                <value>dd</value>
+            </setting>
+            <setting name="DEBUG" serializeAs="String">
+                <value>True</value>
+            </setting>
+        </DDEmailService.My.MySettings>
+    </applicationSettings>
+<system.data>
+		<DbProviderFactories>
+			<remove invariant="FirebirdSql.Data.FirebirdClient" />
+			<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
+		</DbProviderFactories>
+	</system.data></configuration>

DDEmailService/DDEmailService.vbproj

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{83ED2617-B398-4859-8F59-B38F8807E83E}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>DDEmailService.EmailService</StartupObject>
+    <RootNamespace>DDEmailService</RootNamespace>
+    <AssemblyName>DDEmailService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DDEmailService.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DDEmailService.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectInstaller.Designer.vb">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EmailService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EmailService.Designer.vb">
+      <DependentUpon>EmailService.vb</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProjectInstaller.resx">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
+      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
+      <Name>Filesystem</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Messaging\Messaging.vbproj">
+      <Project>{af664d85-0a4b-4bab-a2f8-83110c06553a}</Project>
+      <Name>Messaging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

DDEmailService/EmailService.Designer.vb

@@ -1,11 +1,11 @@
 Imports System.ServiceProcess
 
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class MyNewService
+Partial Class EmailService
     Inherits System.ServiceProcess.ServiceBase
 
     'UserService überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()>
+    <System.Diagnostics.DebuggerNonUserCode()> _
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -17,8 +17,8 @@ Partial Class MyNewService
     End Sub
 
     ' Der Haupteinstiegspunkt für den Prozess
-    <MTAThread()>
+    <MTAThread()> _
-    <System.Diagnostics.DebuggerNonUserCode()>
+    <System.Diagnostics.DebuggerNonUserCode()> _
     Shared Sub Main()
         Dim ServicesToRun() As System.ServiceProcess.ServiceBase
 
@@ -26,9 +26,9 @@ Partial Class MyNewService
         ' weiteren Dienst zu diesem Prozess hinzuzufügen, ändern Sie die folgende Zeile,
         ' um ein zweites Dienstobjekt zu erstellen. Zum Beispiel
         '
-        '   ServicesToRun = New System.ServiceProcess.ServiceBase () {New MyNewService, New MySecondUserService}
+        '   ServicesToRun = New System.ServiceProcess.ServiceBase () {New Service1, New MySecondUserService}
         '
-        ServicesToRun = New System.ServiceProcess.ServiceBase() {New MyNewService}
+        ServicesToRun = New System.ServiceProcess.ServiceBase() {New EmailService}
 
         System.ServiceProcess.ServiceBase.Run(ServicesToRun)
     End Sub
@@ -39,15 +39,10 @@ Partial Class MyNewService
     ' Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich.
     ' Das Bearbeiten ist mit dem Komponenten-Designer möglich.  
     ' Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()>
+    <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        '
+        components = New System.ComponentModel.Container()
-        'MyNewService
+        Me.ServiceName = "Service1"
-        '
-        Me.CanPauseAndContinue = True
-        Me.CanShutdown = True
-        Me.ServiceName = "MyNewService"
-
     End Sub
 
 End Class

DDEmailService/EmailService.vb

@@ -0,0 +1,350 @@
+Imports System.ComponentModel
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Messaging
+Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Language
+Imports System.Timers
+Imports System.IO
+Public Class EmailService
+    Private _Logger As Logger
+    Private _LogConfig As LogConfig
+    Private _Firebird As Firebird
+    Private _MSSQL As MSSQLServer
+    Private _MSSQL_Test As MSSQLServer
+    Private _Email As Email
+    Private _Encryption As EncryptionLegacy
+
+    Private _EmailQueue As BackgroundWorker
+    Private _QueueTimer As Timer
+
+    Private _AnyDatabaseInitialized As Boolean = False
+
+    Private Enum DatabaseType
+        Firebird
+        MSSQL
+    End Enum
+
+    Protected Overrides Sub OnStart(ByVal args() As String)
+        Try
+            ' === Initialize Logger ===
+
+            _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"))
+            _LogConfig.Debug = My.Settings.DEBUG
+            _Logger = _LogConfig.GetLogger()
+
+            _Logger.Info("Starting {0}", ServiceName)
+
+            ' === Inititalize Encryption ===
+
+            _Logger.NewBlock("Inititalize Encryption")
+
+            _Encryption = New EncryptionLegacy("!35452didalog=")
+
+            _Logger.EndBlock()
+
+            ' === Initialize Databases ===
+
+            _Logger.NewBlock("Inititalize Databases")
+
+            If My.Settings.FB_ConnString <> String.Empty Then
+                _Firebird = New Firebird(_LogConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
+
+                If _Firebird._DBInitialized = False Then
+                    _Logger.Warn("Firebird Connection could not be established. Check the Error Log")
+                End If
+            End If
+
+            If My.Settings.SQLSERVER_CS <> String.Empty Then
+                _MSSQL = New MSSQLServer(_LogConfig, My.Settings.SQLSERVER_CS)
+
+                If _MSSQL.DBInitialized = False Then
+                    _Logger.Warn("MSSQL Connection could not be established. Check the Error Log")
+                End If
+            End If
+
+            If My.Settings.SQLSERVER_CS_TEST <> String.Empty Then
+
+                _MSSQL_Test = New MSSQLServer(_LogConfig, My.Settings.SQLSERVER_CS_TEST)
+
+                If _MSSQL_Test.DBInitialized = False Then
+                    _Logger.Warn("MSSQL Test Connection could not be established. Check the Error Log")
+                End If
+            End If
+
+            _AnyDatabaseInitialized = _Firebird?._DBInitialized Or _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
+
+            _Logger.EndBlock()
+
+            ' === Initialize Email ===
+
+            _Logger.NewBlock("Inititalize Email")
+
+            _Email = New Email(_LogConfig)
+
+            _Logger.EndBlock()
+
+            ' === Initialize Queue ===
+
+            _Logger.NewBlock("Inititalize Queue")
+
+            If _AnyDatabaseInitialized Then
+                _EmailQueue = New BackgroundWorker() With {
+                    .WorkerReportsProgress = True,
+                    .WorkerSupportsCancellation = True
+                }
+
+                AddHandler _EmailQueue.DoWork, AddressOf EmailQueue_DoWork
+                AddHandler _EmailQueue.RunWorkerCompleted, AddressOf EmailQueue_Completed
+            End If
+
+            _Logger.EndBlock()
+
+            ' === Initialize & Start Timer ===
+
+            _Logger.NewBlock("Initialize & Start Timer")
+
+            If _AnyDatabaseInitialized Then
+                _QueueTimer = New Timer With {
+                   .Interval = 60000,
+                   .Enabled = True
+                }
+
+                AddHandler _QueueTimer.Elapsed, AddressOf QueueTimer_Elapsed
+            End If
+
+            _Logger.EndBlock()
+
+            ' === Initial Run ===
+
+            If _AnyDatabaseInitialized Then
+                _Logger.Info("Starting Initial Run...")
+                _EmailQueue.RunWorkerAsync()
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+    End Sub
+
+    Private Sub QueueTimer_Elapsed(sender As Object, e As ElapsedEventArgs)
+        If Not _EmailQueue.IsBusy Then
+            _EmailQueue.RunWorkerAsync()
+            _Logger.Debug("Worker is ready, executing.")
+        Else
+            _Logger.Info("Worker is busy, skipping execution.")
+        End If
+    End Sub
+
+    Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs)
+        Try
+            If _Firebird?._DBInitialized Then
+                _Logger.Debug("Starting Firebird Sending")
+                SendEmailFrom(DatabaseType.Firebird, Nothing)
+            End If
+
+            If _MSSQL?.DBInitialized Then
+                _Logger.Debug("Starting MSSQL Sending")
+                SendEmailFrom(DatabaseType.MSSQL, _MSSQL)
+            End If
+
+            If _MSSQL_Test?.DBInitialized Then
+                _Logger.Debug("Starting MSSQL Test Sending")
+                SendEmailFrom(DatabaseType.MSSQL, _MSSQL_Test)
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+    End Sub
+
+    Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
+        Try
+            Dim oSQL As String = String.Empty
+            Dim oEmailAccounts As DataTable
+            Dim oEmailQueue As DataTable
+
+            Select Case Database
+                Case DatabaseType.Firebird
+                    oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
+                    oEmailAccounts = _Firebird.GetDatatable(oSQL)
+                Case DatabaseType.MSSQL
+                    oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1"
+                    oEmailAccounts = MSSQLInstance.GetDatatable(oSQL)
+            End Select
+
+            If IsNothing(oEmailAccounts) Then
+                _Logger.Warn("Error in TBEDM_EMAIL_ACCOUNT Query. Exiting.")
+                _Logger.Warn("Query: {0}", oSQL)
+                Return False
+            End If
+
+            If oEmailAccounts.Rows.Count = 0 Then
+                _Logger.Warn("No Active Email Accounts Configured! Exiting.")
+                Return False
+            End If
+
+            Select Case Database
+                Case DatabaseType.Firebird
+                    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
+                    oEmailQueue = _Firebird.GetDatatable(oSQL)
+                Case DatabaseType.MSSQL
+                    oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
+                    oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
+            End Select
+
+            If IsNothing(oEmailQueue) Then
+                _Logger.Warn("Error in EmailQueue Query. Exiting.")
+                _Logger.Warn("Query: {0}", oSQL)
+                Return False
+            End If
+
+            If oEmailQueue.Rows.Count = 0 Then
+                _Logger.Debug("Email Queue is empty. Exiting.")
+                Return False
+            End If
+
+            Dim oEmailTo, oSubject, oBody As String
+            Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment
+            Dim oAccountId, oGuid, oJobId As Integer
+
+            For Each oEmailToRow As DataRow In oEmailQueue.Rows
+                Dim oAccountMatch As Boolean = False
+                Dim oComment As String = String.Empty
+
+                Select Case Database
+                    Case DatabaseType.Firebird
+                        oAccountId = oEmailToRow.Item("EMAIL_ACCOUNT_ID")
+                    Case DatabaseType.MSSQL
+                        oAccountId = oEmailToRow.Item("SENDING_PROFILE")
+                End Select
+
+                For Each oAccountRow As DataRow In oEmailAccounts.Rows
+                    If oAccountRow.Item("GUID") = oAccountId Then
+                        oAccountMatch = True
+
+                        Select Case Database
+                            Case DatabaseType.Firebird
+                                oMailFrom = oAccountRow.Item("EMAIL_FROM")
+                                oMailSMTP = oAccountRow.Item("SERVER_OUT")
+                                oMailport = oAccountRow.Item("PORT_OUT")
+                                oMailUser = oAccountRow.Item("EMAIL_USER")
+                                oAuthType = oAccountRow.Item("AUTH_TYPE")
+                                oMailPW = oAccountRow.Item("EMAIL_PW")
+
+                            Case DatabaseType.MSSQL
+                                oMailFrom = oAccountRow.Item("EMAIL_FROM")
+                                oMailSMTP = oAccountRow.Item("EMAIL_SMTP")
+                                oMailport = oAccountRow.Item("PORT")
+                                oMailUser = oAccountRow.Item("EMAIL_USER")
+                                oAuthType = oAccountRow.Item("AUTH_TYPE")
+                                oMailPW = oAccountRow.Item("EMAIL_PW")
+                        End Select
+
+                        Dim oPasswordPlain = _Encryption.DecryptData(oMailPW)
+                        If Not IsNothing(oPasswordPlain) Then
+                            oMailPW = oPasswordPlain
+                        Else
+                            _Logger.Warn("Could not decrypt email password. Exiting.")
+                            Return False
+                        End If
+                    End If
+                Next
+
+                If IsNothing(oMailFrom) Or IsNothing(oMailPW) Then
+                    If oAccountMatch Then
+                        _Logger.Warn("Account credentials are empty. Exiting.")
+                    Else
+                        _Logger.Warn("Account credentials are empty and account with Id {0} does not match the configuration. Exiting.", oAccountId)
+                    End If
+
+                    Return False
+                End If
+
+                Select Case Database
+                    Case DatabaseType.Firebird
+                        oGuid = oEmailToRow.Item("GUID")
+                        oEmailTo = oEmailToRow.Item("EMAIL_TO")
+                        _Logger.Debug("oEmailTo: {0}", oEmailTo)
+                        oSubject = oEmailToRow.Item("EMAIL_SUBJ")
+                        _Logger.Debug("oSubject: {0}", oSubject)
+                        oBody = oEmailToRow.Item("EMAIL_BODY")
+                        _Logger.Debug("oBody: {0}", oBody)
+                        oJobId = oEmailToRow.Item("JOB_ID")
+                        _Logger.Debug("oJOB_ID: {0}", oJobId)
+                        oAttachment = Utils.NotNull(oEmailToRow.Item("EMAIL_ATTMT1"), String.Empty)
+
+                    Case DatabaseType.MSSQL
+                        oGuid = oEmailToRow.Item("GUID")
+                        oEmailTo = oEmailToRow.Item("EMAIL_ADRESS")
+                        _Logger.Debug($"oEmailTo: {oEmailTo}")
+                        oSubject = oEmailToRow.Item("EMAIL_SUBJ")
+                        _Logger.Debug($"oSubject: {oSubject}")
+                        oBody = oEmailToRow.Item("EMAIL_BODY")
+                        _Logger.Debug($"oBody: {oBody}")
+                        oJobId = oEmailToRow.Item("REFERENCE_ID")
+                        _Logger.Debug($"oJOB_ID: {oJobId}")
+                        oAttachment = Utils.NotNull(oEmailToRow.Item("EMAIL_ATTMT1"), String.Empty)
+                End Select
+
+                If oAttachment <> String.Empty Then
+                    If IO.File.Exists(oAttachment) = False Then
+                        _Logger.Warn($"Email Attachment FB FileNotFound Exception!")
+                        oComment = "Email Attachment FB FileNotFound Exception"
+                        oAttachment = String.Empty
+                    Else
+                        _Logger.Debug("Email Attachment is: {0}", oAttachment)
+                    End If
+                End If
+
+                Dim oEmailSent As Boolean = False
+                oEmailSent = _Email.New_EmailISoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEmailService", oAttachment)
+
+                If oEmailSent Then
+
+                    Select Case Database
+                        Case DatabaseType.Firebird
+                            oSQL = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGuid}"
+                            If oSQL.Contains(",COMMENT = ''") Then
+                                oSQL.Replace(",COMMENT = ''", "")
+                            End If
+                            _Firebird.ExecuteNonQuery(oSQL)
+                        Case DatabaseType.MSSQL
+                            oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(),COMMENT = '{oComment}' WHERE GUID = {oGuid} "
+                            If oSQL.Contains(",COMMENT = ''") Then
+                                oSQL.Replace(",COMMENT = ''", "")
+                            End If
+                            MSSQLInstance.NewExecutenonQuery(oSQL)
+                    End Select
+                    _Logger.Info($"Email has been send to: {oEmailTo} - Subject: {oSubject}")
+                    Threading.Thread.Sleep(500)
+                End If
+            Next
+
+            Return True
+        Catch ex As Exception
+            _Logger.Warn("Error in SendEmailFrom. Email was not sent.")
+            _Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Private Sub EmailQueue_Completed(sender As Object, e As RunWorkerCompletedEventArgs)
+        Try
+            If e.Cancelled Then
+                _Logger.Warn("EmailQueue has been cancelled manually!")
+            ElseIf e.Error IsNot Nothing Then
+                _Logger.Warn("Unexpected Error in EmailQueue: {0}", e.Error.Message)
+                _Logger.Error(e.Error)
+            End If
+        Catch ex As Exception
+            _Logger.Error(e.Error)
+        End Try
+    End Sub
+
+    Protected Overrides Sub OnStop()
+        Try
+            _Logger.Warn("Service {0} was stopped.", ServiceName)
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+    End Sub
+End Class

DDEmailService/My Project/AssemblyInfo.vb

@@ -8,17 +8,17 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("DDTestService")>
+<Assembly: AssemblyTitle("DDEmailService")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("DDTestService")>
+<Assembly: AssemblyProduct("DDEmailService")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
+<Assembly: AssemblyCopyright("Copyright ©  2019")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
-<Assembly: Guid("77ccc747-3bd3-4783-bd7c-3d3af77168d2")>
+<Assembly: Guid("e2deb8e7-50e5-42e4-a534-694e746bedb1")>
 
 ' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
 '

DDEmailService/My Project/Resources.Designer.vb

@@ -38,7 +38,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DDTestService.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DDEmailService.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

DDEmailService/My Project/Settings.Designer.vb

@@ -0,0 +1,138 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.41")>  _
+        Public ReadOnly Property FB_ConnString() As String
+            Get
+                Return CType(Me("FB_ConnString"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info="& _ 
+            "True;User ID=sa;Password=dd")>  _
+        Public ReadOnly Property SQLSERVER_CS() As String
+            Get
+                Return CType(Me("SQLSERVER_CS"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info="& _ 
+            "True;User ID=sa;Password=dd")>  _
+        Public ReadOnly Property SQLSERVER_CS_TEST() As String
+            Get
+                Return CType(Me("SQLSERVER_CS_TEST"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB")>  _
+        Public ReadOnly Property FB_DATABASE() As String
+            Get
+                Return CType(Me("FB_DATABASE"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("sysdba")>  _
+        Public ReadOnly Property FB_USER() As String
+            Get
+                Return CType(Me("FB_USER"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("dd")>  _
+        Public ReadOnly Property FB_PW() As String
+            Get
+                Return CType(Me("FB_PW"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public ReadOnly Property DEBUG() As Boolean
+            Get
+                Return CType(Me("DEBUG"),Boolean)
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DDEmailService.My.MySettings
+            Get
+                Return Global.DDEmailService.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace

DDEmailService/My Project/Settings.settings

@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
+  <Profiles />
+  <Settings>
+    <Setting Name="FB_ConnString" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">172.24.12.41</Value>
+    </Setting>
+    <Setting Name="SQLSERVER_CS" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+    </Setting>
+    <Setting Name="SQLSERVER_CS_TEST" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+    </Setting>
+    <Setting Name="FB_DATABASE" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</Value>
+    </Setting>
+    <Setting Name="FB_USER" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">sysdba</Value>
+    </Setting>
+    <Setting Name="FB_PW" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">dd</Value>
+    </Setting>
+    <Setting Name="DEBUG" Type="System.Boolean" Scope="Application">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

DDEmailService/ProjectInstaller.Designer.vb

@@ -32,8 +32,9 @@
         '
         'ServiceInstaller1
         '
-        Me.ServiceInstaller1.Description = "TestService für testzwecke"
+        Me.ServiceInstaller1.Description = "Sends all emails from Digital Data Modules"
-        Me.ServiceInstaller1.ServiceName = "MyNewService"
+        Me.ServiceInstaller1.DisplayName = "Digital Data Email Service"
+        Me.ServiceInstaller1.ServiceName = "DDEmailService"
         '
         'ProjectInstaller
         '

DDEmailService/ProjectInstaller.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="ServiceProcessInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="ServiceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>197, 17</value>

DDEmailService/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
+</packages>

DDLicenseService/DDEDMLicenseService.vbproj

@@ -49,7 +49,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DDLicenseService/packages.config

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

DDMonorepo.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.27703.2000
+VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}"
 EndProject
@@ -98,6 +98,16 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Modules.Jobs\Jobs.v
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem.Test", "Modules\Filesystem.Test\Filesystem.Test.vbproj", "{B29ED6D4-839B-413A-A485-B10F4A4788EA}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.GraphQLTest", "GUIs.Test.GraphQLTest\GUIs.Test.GraphQLTest.vbproj", "{609B09B4-AD1E-40F7-8899-A6685924621C}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.DocumentViewerTest", "GUIs.Test.DocumentViewerTest\GUIs.Test.DocumentViewerTest.vbproj", "{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -252,6 +262,22 @@ Global
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{609B09B4-AD1E-40F7-8899-A6685924621C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{609B09B4-AD1E-40F7-8899-A6685924621C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{609B09B4-AD1E-40F7-8899-A6685924621C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{609B09B4-AD1E-40F7-8899-A6685924621C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -294,6 +320,10 @@ Global
 		{5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
+		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
+		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}

DDTestService/MyNewService.vb

@@ -1,95 +0,0 @@
-Imports System.ComponentModel
-Imports DigitalData.Modules.Logging
-Imports NLog
-Public Class MyNewService
-    Dim MyLogger1 As LogConfig
-    Shared Logger1 As NLog.Logger
-    Dim MyLogger2 As LogConfig
-    Shared Logger2 As NLog.Logger
-    Public Shared threadRunner1 As BackgroundWorker
-
-    Private eventId As Integer = 1
-    Protected Overrides Sub OnStart(ByVal args() As String)
-
-
-
-        '        '#Thread für Durchlauf generieren
-        threadRunner1 = New BackgroundWorker()
-        threadRunner1.WorkerReportsProgress = True
-        threadRunner1.WorkerSupportsCancellation = True
-        AddHandler threadRunner1.DoWork, AddressOf RUN_THREAD
-        AddHandler threadRunner1.RunWorkerCompleted, AddressOf Thread_Completed
-
-        '        '### Den Timer generieren
-        Dim Timer1 As New System.Timers.Timer()
-        'Das Event hinterlegen welches bei "Tick" ausgelöst wird
-        AddHandler Timer1.Elapsed, AddressOf Thread1_Run
-        ' Set the Interval
-        Timer1.Interval = 10000
-        'ClassLogger.Add("Timer - Intervall: " & clsSQLITE.konf_intervall & " Minuten", False)
-        Timer1.Enabled = True
-        MyLogger1 = New LogConfig(LogConfig.PathType.CurrentDirectory, Nothing, "Log1")
-        Logger1 = MyLogger1.LogFactory.GetCurrentClassLogger()
-        MyLogger2 = New LogConfig(LogConfig.PathType.CurrentDirectory, Nothing, "Log2")
-        Logger2 = MyLogger2.LogFactory.GetCurrentClassLogger()
-        Logger1.Info("Timer gestartet")
-        ' Und den Durchlauf das erste Mal starten
-        threadRunner1.RunWorkerAsync()
-
-        ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge
-        ' ausführen, damit der Dienst gestartet werden kann.
-
-
-        ' clsLogger.Init(My.Application.Info.DirectoryPath & "\Log", "_SERVICEResultHandler")
-        Logger1.Info("Service started")
-        Logger2.Info("Service started")
-        ' Set up a timer to trigger every minute.  
-        Dim timer As System.Timers.Timer = New System.Timers.Timer()
-        timer.Interval = 12000 ' 12 seconds  
-        AddHandler timer.Elapsed, AddressOf Me.OnTimer1
-        timer.Start()
-
-    End Sub
-    Private Sub RUN_THREAD()
-        ' TODO: Insert monitoring activities here.  
-        Logger1.Info("RUN_THREAD -  Monitoring the System - eventId: " & eventId)
-    End Sub
-    Public Shared Sub Thread1_Run()
-        If Not threadRunner1.IsBusy Then
-            threadRunner1.RunWorkerAsync()
-        End If
-    End Sub
-    Private Shared Sub Thread_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted
-        ' This event fires when the DoWork event completes
-        Try
-            Dim result As String = ""
-            If e.Cancelled Then
-                Logger1.Warn("Der Process wurde durch den Anwender abgebrochen")
-            ElseIf e.Error IsNot Nothing Then
-                Logger1.Warn("Fehler bei Durchlauf. Der Vorgang wird abgebrochen: " & e.Error.Message)
-            End If
-
-        Catch ex As Exception
-            EventLog.WriteEntry("DDWMResultHandler", "Unexpected error in Thread_Completed: " & ex.ToString(), EventLogEntryType.Error)
-        End Try
-    End Sub
-    Private Sub OnTimer1(sender As Object, e As Timers.ElapsedEventArgs)
-        ' TODO: Insert monitoring activities here.  
-        Logger2.Info("OnTimer1 -  Monitoring the System - eventId: " & eventId)
-        eventId = eventId + 1
-    End Sub
-
-    Protected Overrides Sub OnStop()
-        ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen.
-        Logger1.Info("Service stopped")
-        Logger2.Info("Service stopped")
-    End Sub
-    Protected Overrides Sub OnPause()
-        Logger1.Info("In OnPause...")
-        Logger2.Info("In OnPause...")
-    End Sub
-    Protected Overrides Sub OnContinue()
-        Logger1.Info("In OnContinue...")
-        Logger2.Info("In OnContinue...")
-    End Sub
-End Class

DDTestService/packages.config

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

DDZUGFeRDService/App.config

@@ -32,11 +32,14 @@
                 <value>10</value>
             </setting>
             <setting name="MSSQL_CONNECTIONSTRING" serializeAs="String">
-                <value />
+              <value/>
             </setting>
             <setting name="MSSQL_ENABLED" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="GDPICTURE_KEY" serializeAs="String">
+                <value>1234567890_EXAMPLE_KEY</value>
+            </setting>
         </DDZUGFeRDService.My.MySettings>
     </applicationSettings>
 <system.data>

DDZUGFeRDService/DDZUGFeRDService.vbproj

@@ -52,7 +52,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DDZUGFeRDService/My Project/AssemblyInfo.vb

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

DDZUGFeRDService/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -134,6 +134,15 @@ Namespace My
                 Return CType(Me("MSSQL_ENABLED"),Boolean)
             End Get
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("1234567890_EXAMPLE_KEY")>  _
+        Public ReadOnly Property GDPICTURE_KEY() As String
+            Get
+                Return CType(Me("GDPICTURE_KEY"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 

DDZUGFeRDService/My Project/Settings.settings

@@ -29,5 +29,8 @@
     <Setting Name="MSSQL_ENABLED" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="GDPICTURE_KEY" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">1234567890_EXAMPLE_KEY</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

DDZUGFeRDService/ThreadRunner.vb

@@ -31,7 +31,6 @@ Public Class ThreadRunner
         _logConfig = LogConfig
         _logger = _logConfig.GetLogger()
         _firebird = Firebird
-        _zugferd = New ZUGFeRDInterface(_logConfig)
         _mssql = MSSQL
 
         Dim args As New WorkerArgs()
@@ -113,25 +112,6 @@ Public Class ThreadRunner
             Dim args As WorkerArgs = e.Argument
 
             _logger.Debug("Background worker running..")
-            ' Use MSSQL Server if available
-            If Not IsNothing(_mssql) Then
-                'Checking if documents have bee´n rejected
-                Dim oSQL As String = "Select * from TBEDMI_DOC_REJECTED WHERE MD5_UPDATE = 0"
-                Dim oDT As DataTable = _mssql.GetDatatable(oSQL)
-                If Not IsNothing(oDT) Then
-                    For Each oRow As DataRow In oDT.Rows
-                        oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET REJECTED = TRUE WHERE MESSAGE_ID = '{oRow.Item("MESSAGE_ID")}'"
-                        If _firebird.ExecuteNonQuery(oSQL) = True Then
-                            oSQL = $"UPDATE TBEDMI_DOC_REJECTED SET MD5_UPDATE = 1 WHERE GUID = '{oRow.Item("GUID")}'"
-                            If _mssql.ExecuteNonQuery(oSQL) = True Then
-                                _logger.Debug($"Refreshed the Rejected Info for messageid [{oRow.Item("MESSAGE_ID")}]")
-                            End If
-                        End If
-                    Next
-                Else
-                    _logger.Warn("oDTTBEDMI_DOC_REJECTED is nothing...")
-                End If
-            End If
             Dim job As New ImportZUGFeRDFiles(_logConfig, _firebird, _mssql)
             job.Start(args)
         Catch ex As Exception

DDZUGFeRDService/ZUGFeRDService.vb

@@ -24,6 +24,7 @@ Public Class ZUGFeRDService
         Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL
         Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING
         Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED
+        Dim oGDPictureKey As String = My.Settings.GDPICTURE_KEY
 
         _firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword)
 
@@ -37,7 +38,7 @@ Public Class ZUGFeRDService
         End If
 
         Try
-            _threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql)
+            _threadRunner = New ThreadRunner(_logConfig, oGDPictureKey, _firebird, _mssql)
             _threadRunner.Start(oJobInterval)
         Catch ex As Exception
             _logger.Error(ex)

DDZUGFeRDService/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.7" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

DD_CommunicationService/DD_CommunicationService.vbproj

@@ -59,6 +59,9 @@
     <Reference Include="DigitalData.Modules.Messaging">
       <HintPath>..\Message\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\Modules.Logging\bin\Debug\NLog.dll</HintPath>
     </Reference>
@@ -140,5 +143,11 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Messaging\Messaging.vbproj">
+      <Project>{AF664D85-0A4B-4BAB-A2F8-83110C06553A}</Project>
+      <Name>Messaging</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

DD_CommunicationService/MyComService.vb

@@ -10,7 +10,7 @@ Public Class MyComService
     Private _firebird As Firebird
     Private _MSSQL As MSSQLServer
     Private _Email As Email
-    Private _EmailAlt As clsEmail
+    'Private _EmailAlt As clsEmail
     Public Shared threadEmailQueue As BackgroundWorker
     Protected Overrides Sub OnStart(ByVal args() As String)
         ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge
@@ -28,7 +28,7 @@ Public Class MyComService
                 _firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
             End If
             _Email = New Email(MyLoConfig)
-            _EmailAlt = New clsEmail(MyLoConfig)
+            '_EmailAlt = New clsEmail(MyLoConfig)
             If My.Settings.SQLSERVER_CS <> String.Empty Then
                 _MSSQL = New MSSQLServer(MyLoConfig, My.Settings.SQLSERVER_CS)
             End If
@@ -82,6 +82,9 @@ Public Class MyComService
             Else
                 MyLoConfig.Debug = False
             End If
+            If threadEmailQueue.IsBusy Then
+                Exit Sub
+            End If
             _Email = New Email(MyLoConfig)
             If My.Settings.FB_ConnString <> String.Empty Then
                 _firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
@@ -190,11 +193,11 @@ Public Class MyComService
                     'End If
 
                     Dim oSendResult As Boolean = False
-                    oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment)
+                    ' oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment)
-                    If oSendResult = False Then
+                    ' If oSendResult = False Then
-                        oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString)
+                    oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString)
 
-                    End If
+                    ' End If
                     If oSendResult = True Then
                         Dim upd = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGUID}"
                         If upd.Contains(",COMMENT = ''") Then
@@ -238,6 +241,7 @@ Public Class MyComService
                     Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment
 
                     Dim oACCOUNT_MATCH As Boolean = False
+
                     For Each oAccountRow As DataRow In oDT_EMAIL_ACCOUNT.Rows
                         If oAccountRow.Item("GUID") = oEMAILACCOUNT_ID Then
                             oACCOUNT_MATCH = True
@@ -248,8 +252,6 @@ Public Class MyComService
                             oAuthType = oAccountRow.Item("AUTH_TYPE")
                             oMailPW = oAccountRow.Item("EMAIL_PW")
 
-
-
                             Dim owrapper As New clsEncryption("!35452didalog=")
 
                             Dim oPWPlain = owrapper.DecryptData(oMailPW)
@@ -261,6 +263,7 @@ Public Class MyComService
                             End If
                         End If
                     Next
+
                     If IsNothing(oMailFrom) Or IsNothing(oMailPW) Then
                         If oACCOUNT_MATCH = True Then
                             myLogger.Warn("ACCOUNT-Infos are nothing!")
@@ -303,10 +306,10 @@ Public Class MyComService
                     End Try
 
                     Dim oSendResult As Boolean = False
-                    oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment)
+                    'oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment)
-                    If oSendResult = False Then
+                    'If oSendResult = False Then
-                        oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString)
+                    oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString)
-                    End If
+                    ' End If
                     If oSendResult = True Then
                         Dim oUpdCommand = "UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE() WHERE GUID = " & oGUID
                         _MSSQL.NewExecutenonQuery(oUpdCommand)

EDMI.File/Archive.vb

@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Logging
+
+Public Class Archive
+    Private _LogConfig As LogConfig
+    Private _Logger As Logger
+
+    Public Sub New(LogConfig As LogConfig)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+    End Sub
+End Class

EDMI.File/EDMI.File.vbproj

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1477032D-7A02-4C5F-B026-A7117DA4BC6B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Modules.EDMI.File</RootNamespace>
+    <AssemblyName>DigitalData.Modules.EDMI.File</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.EDMI.File.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.EDMI.File.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Archive.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

EDMI.File/My Project/Application.Designer.vb

@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+

EDMI.File/My Project/Application.myapp

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>

EDMI.File/My Project/AssemblyInfo.vb

@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("EDMI.File")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("EDMI.File")>
+<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyTrademark("")>
+
+<Assembly: ComVisible(False)>
+
+'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
+<Assembly: Guid("2a4f6a80-e6e0-4764-ba6e-91484bda887f")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' indem Sie "*" wie unten gezeigt eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>

EDMI.File/My Project/Resources.Designer.vb

@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.EDMI.File.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace

EDMI.File/My Project/Resources.resx

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

EDMI.File/My Project/Settings.Designer.vb

@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.File.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.EDMI.File.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace

EDMI.File/packages.config

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

GUIs.ClientSuite/App.config

@@ -30,7 +30,7 @@
   <applicationSettings>
     <DigitalData.GUIs.ClientSuite.My.MySettings>
       <setting name="IDBNetworkServiceAddress" serializeAs="String">
-        <value>net.tcp://172.24.12.67:9000/DigitalData/Services/Main</value>
+        <value>net.tcp://172.24.12.39:9000/DigitalData/Services/Main</value>
       </setting>
     </DigitalData.GUIs.ClientSuite.My.MySettings>
     <ClientSuite.My.MySettings>

GUIs.ClientSuite/ClassService.vb

@@ -1,8 +1,10 @@
 Imports System.ServiceModel
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMIAPI
 Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
+Imports System.ServiceModel.Security
 
 Public Class ClassService
     Inherits BaseClass
@@ -11,6 +13,7 @@ Public Class ClassService
         Successful
         NotFound
         EmptyURI
+        Authentication
         Unknown
     End Enum
 
@@ -60,6 +63,9 @@ Public Class ClassService
                                                Catch ex As UriFormatException
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.EmptyURI
+                                               Catch ex As SecurityNegotiationException
+                                                   Logger.Error(ex)
+                                                   Return ConnectionTestResult.Authentication
                                                Catch ex As Exception
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.Unknown
@@ -93,5 +99,4 @@ Public Class ClassService
 
         Return oBinding
     End Function
-
 End Class

GUIs.ClientSuite/ClientSuite.vbproj

@@ -66,21 +66,21 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="DevExpress.Dashboard.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Dashboard.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Mvvm.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Mvvm.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Sparkline.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
@@ -89,7 +89,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
@@ -496,6 +496,10 @@
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
+      <Project>{5b1171dc-fffe-4813-a20d-786aae47b320}</Project>
+      <Name>EDMI.API</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Language\Language.vbproj">
       <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
       <Name>Language</Name>
@@ -508,9 +512,9 @@
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\IDBService.vbproj">
+    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\EDMIService.vbproj">
       <Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
-      <Name>IDBService</Name>
+      <Name>EDMIService</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

GUIs.ClientSuite/ClientSuite.vbproj.bak

@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>DigitalData.GUIs.ClientSuite.My.MyApplication</StartupObject>
+    <RootNamespace>DigitalData.GUIs.ClientSuite</RootNamespace>
+    <AssemblyName>ClientSuite</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>WindowsForms</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>ClientSuite.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>ClientSuite.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility" />
+    <Reference Include="DevExpress.Dashboard.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Mvvm.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Sparkline.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.EntityFrameworkCore.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=7a73ef09980c56c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.EntityFrameworkCore.Firebird.6.4.0\lib\netstandard2.0\FirebirdSql.EntityFrameworkCore.Firebird.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+    <Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
+    <Compile Include="Base\BaseClass.vb" />
+    <Compile Include="FormDesigner\Controls\Data.vb" />
+    <Compile Include="ClassControlManager.vb" />
+    <Compile Include="Common\ClassCommonCommands.vb" />
+    <Compile Include="Common\ClassCommonViews.vb" />
+    <Compile Include="ClassConfig.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="FormDesigner\Controls\Loader.vb" />
+    <Compile Include="ClassControlPatcher.vb" />
+    <Compile Include="ClassDragDrop.vb" />
+    <Compile Include="ClassErrorHandler.vb" />
+    <Compile Include="ClassLayout.vb" />
+    <Compile Include="ClassPanelManager.vb" />
+    <Compile Include="ClassService.vb" />
+    <Compile Include="ClassUIConfig.vb" />
+    <Compile Include="ClassUtils.vb" />
+    <Compile Include="Common\ClassCommon.vb" />
+    <Compile Include="ControlDefaults\GridControlDefaults.vb" />
+    <Compile Include="ControlDefaults\TreeListDefaults.vb" />
+    <Compile Include="FormDesigner\Controls\Editors\DatasourceType.vb" />
+    <Compile Include="FormDesigner\Controls\Metadata.vb" />
+    <Compile Include="FormDesigner\Controls\Editors\DatasourceEditor.vb" />
+    <Compile Include="FormDesigner\Controls\Editors\frmDatasourceEditor.Designer.vb">
+      <DependentUpon>frmDatasourceEditor.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormDesigner\Controls\Editors\frmDatasourceEditor.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormDesigner\Controls\Properties\DatepickerProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\MemoeditProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\CheckboxProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\TextboxProperties.vb" />
+    <Compile Include="FormDesigner\frmFormDesigner.Designer.vb">
+      <DependentUpon>frmFormDesigner.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormDesigner\frmFormDesigner.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowOverview.Designer.vb">
+      <DependentUpon>frmWorkflowOverview.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowOverview.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowRawData.Designer.vb">
+      <DependentUpon>frmWorkflowRawData.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowRawData.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowStep.Designer.vb">
+      <DependentUpon>frmWorkflowStep.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ModuleWorkflow\frmWorkflowStep.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSearch.Designer.vb">
+      <DependentUpon>frmSearch.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSearch.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Panels\BasePanel.Designer.vb">
+      <DependentUpon>BasePanel.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\BasePanel.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Panels\DocumentPanel.Designer.vb">
+      <DependentUpon>DocumentPanel.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\DocumentPanel.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Panels\PanelInfo.vb" />
+    <Compile Include="Workers\HeartbeatWorker.vb" />
+    <Compile Include="Workers\IWorker.vb" />
+    <Compile Include="Workers\WorkerManager.vb" />
+    <Compile Include="Workers\WorkflowOverviewWorker.vb" />
+    <Compile Include="ModuleWorkflow\GridOverview.Designer.vb">
+      <DependentUpon>GridOverview.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ModuleWorkflow\GridOverview.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ModuleWorkflow\NavControlOverview.Designer.vb">
+      <DependentUpon>NavControlOverview.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ModuleWorkflow\NavControlOverview.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ModuleWorkflow\WorkflowDetail.vb" />
+    <Compile Include="ModuleWorkflow\WorkflowItem.vb" />
+    <Compile Include="_TEST\DockManagerTest.Designer.vb">
+      <DependentUpon>DockManagerTest.vb</DependentUpon>
+    </Compile>
+    <Compile Include="_TEST\DockManagerTest.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="_TEST\frmDocTest.Designer.vb">
+      <DependentUpon>frmDocTest.vb</DependentUpon>
+    </Compile>
+    <Compile Include="_TEST\frmDocTest.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormDesigner\Controls\Localization.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\BaseProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\ComboboxProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Editors\StaticListEditor.vb" />
+    <Compile Include="FormDesigner\Controls\Editors\frmStaticListEditor.designer.vb">
+      <DependentUpon>frmStaticListEditor.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormDesigner\Controls\Editors\frmStaticListEditor.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Base\BaseForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Base\BaseRibbonForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="_TEST\frmFileTest.Designer.vb">
+      <DependentUpon>frmFileTest.vb</DependentUpon>
+    </Compile>
+    <Compile Include="_TEST\frmFileTest.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmHome.Designer.vb">
+      <DependentUpon>frmHome.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmHome.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmMain.Designer.vb">
+      <DependentUpon>frmMain.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmMain.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmConfigService.Designer.vb">
+      <DependentUpon>frmConfigService.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmConfigService.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSplash.designer.vb">
+      <DependentUpon>frmSplash.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSplash.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmConfigUser.Designer.vb">
+      <DependentUpon>frmConfigUser.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmConfigUser.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmObjectEditor.Designer.vb">
+      <DependentUpon>frmObjectEditor.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmObjectEditor.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormUserManager\frmUserManager.Designer.vb">
+      <DependentUpon>frmUserManager.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormUserManager\frmUserManager.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="MyApplication.vb" />
+    <Compile Include="State\ClassServiceState.vb" />
+    <Compile Include="State\ClassUserState.vb" />
+    <Compile Include="Strings\ControlProperties.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>ControlProperties.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Strings\ControlProperties.en.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>ControlProperties.en.resx</DependentUpon>
+    </Compile>
+    <Compile Include="FormUserManager\UserControlAssignment.Designer.vb">
+      <DependentUpon>UserControlAssignment.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormUserManager\UserControlAssignment.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Widgets\ProcessManagerWidget.Designer.vb">
+      <DependentUpon>ProcessManagerWidget.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Widgets\ProcessManagerWidget.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="_TEST\frmWorkflowTest.Designer.vb">
+      <DependentUpon>frmWorkflowTest.vb</DependentUpon>
+    </Compile>
+    <Compile Include="_TEST\frmWorkflowTest.vb">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Base\BaseForm.resx">
+      <DependentUpon>BaseForm.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormDesigner\Controls\Editors\frmDatasourceEditor.resx">
+      <DependentUpon>frmDatasourceEditor.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormDesigner\frmFormDesigner.resx">
+      <DependentUpon>frmFormDesigner.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModuleWorkflow\frmWorkflowOverview.resx">
+      <DependentUpon>frmWorkflowOverview.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModuleWorkflow\frmWorkflowRawData.resx">
+      <DependentUpon>frmWorkflowRawData.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModuleWorkflow\frmWorkflowStep.resx">
+      <DependentUpon>frmWorkflowStep.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSearch.resx">
+      <DependentUpon>frmSearch.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Panels\DocumentPanel.resx">
+      <DependentUpon>DocumentPanel.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModuleWorkflow\GridOverview.resx">
+      <DependentUpon>GridOverview.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModuleWorkflow\NavControlOverview.resx">
+      <DependentUpon>NavControlOverview.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="_TEST\DockManagerTest.resx">
+      <DependentUpon>DockManagerTest.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="_TEST\frmDocTest.resx">
+      <DependentUpon>frmDocTest.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormDesigner\Controls\Editors\frmStaticListEditor.en-US.resx">
+      <DependentUpon>frmStaticListEditor.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormDesigner\Controls\Editors\frmStaticListEditor.resx">
+      <DependentUpon>frmStaticListEditor.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="_TEST\frmFileTest.resx">
+      <DependentUpon>frmFileTest.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmHome.resx">
+      <DependentUpon>frmHome.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmMain.resx">
+      <DependentUpon>frmMain.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmConfigService.resx">
+      <DependentUpon>frmConfigService.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSplash.resx">
+      <DependentUpon>frmSplash.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmConfigUser.resx">
+      <DependentUpon>frmConfigUser.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmObjectEditor.resx">
+      <DependentUpon>frmObjectEditor.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormUserManager\frmUserManager.resx">
+      <DependentUpon>frmUserManager.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Strings\ControlProperties.en.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ControlProperties.en.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Strings\ControlProperties.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ControlProperties.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormUserManager\UserControlAssignment.resx">
+      <DependentUpon>UserControlAssignment.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Widgets\ProcessManagerWidget.resx">
+      <DependentUpon>ProcessManagerWidget.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="_TEST\frmWorkflowTest.resx">
+      <DependentUpon>frmWorkflowTest.vb</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\app.manifest" />
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Resources\iconfinder_Gowalla_324477.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\user_16xLG.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\email_go.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\folder_go.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
+      <Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project>
+      <Name>LookupControl</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Config\Config.vbproj">
+      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.EDMIAPI\EDMIAPI.vbproj">
+      <Project>{5b1171dc-fffe-4813-a20d-786aae47b320}</Project>
+      <Name>EDMIAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.License\License.vbproj">
+      <Project>{5ebacbfa-f11a-4bbf-8d02-91461f2293ed}</Project>
+      <Name>License</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\IDBService.vbproj">
+      <Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
+      <Name>IDBService</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TextBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\DatePicker.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ComboBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CheckBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="My Project\DataSources\" />
+    <Folder Include="Resources\Icons\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ampel-gelb.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ampel-gruen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ampel-rot.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

GUIs.ClientSuite/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Public NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -56,7 +56,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.67:9000/DigitalData/Services/Main")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.39:9000/DigitalData/Services/Main")>  _
         Public ReadOnly Property IDBNetworkServiceAddress() As String
             Get
                 Return CType(Me("IDBNetworkServiceAddress"),String)

GUIs.ClientSuite/My Project/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="IDBNetworkServiceAddress" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">net.tcp://172.24.12.67:9000/DigitalData/Services/Main</Value>
+      <Value Profile="(Default)">net.tcp://172.24.12.39:9000/DigitalData/Services/Main</Value>
     </Setting>
   </Settings>
 </SettingsFile>

GUIs.ClientSuite/My Project/licenses.licx

@@ -1,17 +1,10 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClientSuite/My Project/licenses.licx.bak

@@ -0,0 +1,17 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClientSuite/_TEST/frmFileTest.Designer.vb

@@ -26,13 +26,6 @@ Partial Class frmFileTest
     Private Sub InitializeComponent()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.listboxLog = New System.Windows.Forms.ListBox()
-        Me.btnDocByDocId = New System.Windows.Forms.Button()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.btnDocByContainerId = New System.Windows.Forms.Button()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
-        Me.TextBox3 = New System.Windows.Forms.TextBox()
-        Me.TextBox4 = New System.Windows.Forms.TextBox()
-        Me.Button2 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'Button1
@@ -46,96 +39,26 @@ Partial Class frmFileTest
         '
         'listboxLog
         '
-        Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Right
         Me.listboxLog.FormattingEnabled = True
-        Me.listboxLog.Location = New System.Drawing.Point(0, 225)
+        Me.listboxLog.Location = New System.Drawing.Point(165, 0)
         Me.listboxLog.Name = "listboxLog"
-        Me.listboxLog.Size = New System.Drawing.Size(800, 225)
+        Me.listboxLog.Size = New System.Drawing.Size(635, 450)
         Me.listboxLog.TabIndex = 1
         '
-        'btnDocByDocId
-        '
-        Me.btnDocByDocId.Location = New System.Drawing.Point(655, 12)
-        Me.btnDocByDocId.Name = "btnDocByDocId"
-        Me.btnDocByDocId.Size = New System.Drawing.Size(133, 32)
-        Me.btnDocByDocId.TabIndex = 2
-        Me.btnDocByDocId.Text = "GetDocByDocId"
-        Me.btnDocByDocId.UseVisualStyleBackColor = True
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Location = New System.Drawing.Point(425, 24)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox1.TabIndex = 3
-        '
-        'btnDocByContainerId
-        '
-        Me.btnDocByContainerId.Location = New System.Drawing.Point(655, 50)
-        Me.btnDocByContainerId.Name = "btnDocByContainerId"
-        Me.btnDocByContainerId.Size = New System.Drawing.Size(133, 32)
-        Me.btnDocByContainerId.TabIndex = 4
-        Me.btnDocByContainerId.Text = "GetDocByContainerId"
-        Me.btnDocByContainerId.UseVisualStyleBackColor = True
-        '
-        'TextBox2
-        '
-        Me.TextBox2.Location = New System.Drawing.Point(425, 62)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox2.TabIndex = 3
-        '
-        'TextBox3
-        '
-        Me.TextBox3.Location = New System.Drawing.Point(425, 138)
-        Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox3.TabIndex = 5
-        '
-        'TextBox4
-        '
-        Me.TextBox4.Location = New System.Drawing.Point(425, 112)
-        Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox4.TabIndex = 5
-        '
-        'Button2
-        '
-        Me.Button2.Location = New System.Drawing.Point(655, 126)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(133, 32)
-        Me.Button2.TabIndex = 4
-        Me.Button2.Text = "GetDocByContainerId"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
         'frmFileTest
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
-        Me.Controls.Add(Me.TextBox4)
-        Me.Controls.Add(Me.TextBox3)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.btnDocByContainerId)
-        Me.Controls.Add(Me.TextBox2)
-        Me.Controls.Add(Me.TextBox1)
-        Me.Controls.Add(Me.btnDocByDocId)
         Me.Controls.Add(Me.listboxLog)
         Me.Controls.Add(Me.Button1)
         Me.Name = "frmFileTest"
         Me.Text = "frmFileTest"
         Me.ResumeLayout(False)
-        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents Button1 As Button
     Friend WithEvents listboxLog As ListBox
-    Friend WithEvents btnDocByDocId As Button
-    Friend WithEvents TextBox1 As TextBox
-    Friend WithEvents btnDocByContainerId As Button
-    Friend WithEvents TextBox2 As TextBox
-    Friend WithEvents TextBox3 As TextBox
-    Friend WithEvents TextBox4 As TextBox
-    Friend WithEvents Button2 As Button
 End Class

GUIs.ClientSuite/_TEST/frmFileTest.vb

@@ -1,6 +1,5 @@
 Imports System.IO
 Imports DigitalData.Modules.EDMIAPI
-Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Logging
 
 Public Class frmFileTest
@@ -16,73 +15,81 @@ Public Class frmFileTest
     End Sub
 
     Private Async Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oDialog = New OpenFileDialog()
+        Dim oDialog = New OpenFileDialog() With {
-        Dim oDialogResult = oDialog.ShowDialog()
+            .Multiselect = True
+        }
 
-        If oDialogResult <> DialogResult.OK Then
+        If oDialog.ShowDialog() <> DialogResult.OK Then
             Exit Sub
         End If
 
-        Try
+        For Each oFileName In oDialog.FileNames
-            Dim oResult = Await _fileOp.ImportFileAsync(oDialog.FileName)
+            Try
+                Dim oSW As New Stopwatch()
+                oSW.Start()
 
-            If oResult.OK = False Then
+                Dim oResult = Await _fileOp.ImportFile2(oFileName)
-                MsgBox(oResult.ErrorMessage)
+
-                Exit Sub
+                oSW.Stop()
-            End If
+
+                If oResult.OK = False Then
+                    listboxLog.Items.Add($"Document upload failed! Reason: '{oResult.ErrorMessage}'")
+                    Exit Sub
+                End If
+
+                listboxLog.Items.Add($"Document uploaded!")
+                listboxLog.Items.Add($"Filename: {oResult.Document.FileName}")
+                listboxLog.Items.Add($"Time in milliseconds: {oSW.ElapsedMilliseconds}")
+                listboxLog.Items.Add($"----------------------------------------------------------")
+            Catch ex As Exception
+                listboxLog.Items.Add($"Document upload failed! Reason: '{ex.Message}'")
+                Logger.Error(ex)
+            End Try
+        Next
 
-            listboxLog.Items.Add($"Document uploaded!")
-            listboxLog.Items.Add($"DocId: {oResult.Document.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oResult.Document.ContainerId}")
-            listboxLog.Items.Add($"Filename: {oResult.Document.FileName}")
-            listboxLog.Items.Add($"----------------------------------------------------------")
-        Catch ex As Exception
-            ShowErrorMessage(ex)
-            Logger.Error(ex)
-        End Try
     End Sub
 
-    Private Sub btnDocByDocId_Click(sender As Object, e As EventArgs) Handles btnDocByDocId.Click
+    'Private Sub btnDocByDocId_Click(sender As Object, e As EventArgs)
-        Try
+    '    Try
-            Dim oDocId As Int64 = Int64.Parse(TextBox1.Text)
+    '        Dim oDocId As Int64 = Int64.Parse(TextBox1.Text)
-            Dim oResult = _fileOp.GetDocumentByDocumentId(oDocId)
+    '        Dim oResult = _fileOp.GetDocumentByDocumentId(oDocId)
 
-            If Not oResult.OK Then
+    '        If Not oResult.OK Then
-                MsgBox(oResult.ErrorMessage)
+    '            MsgBox(oResult.ErrorMessage)
-                Exit Sub
+    '            Exit Sub
-            End If
+    '        End If
 
-            Dim oDocObject = oResult.Document
+    '        Dim oDocObject = oResult.Document
 
-            listboxLog.Items.Add($"Document fetched!")
+    '        listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+    '        listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+    '        listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
+    '        listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
-            listboxLog.Items.Add($"----------------------------------------------------------")
+    '        listboxLog.Items.Add($"----------------------------------------------------------")
-        Catch ex As Exception
+    '    Catch ex As Exception
-            ShowErrorMessage(ex)
+    '        ShowErrorMessage(ex)
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
 
-    Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs) Handles btnDocByContainerId.Click, Button2.Click
+    'Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs)
-        Try
+    '    Try
-            Dim oContainerId As Int64 = Int64.Parse(TextBox2.Text)
+    '        Dim oContainerId As Int64 = Int64.Parse(TextBox2.Text)
-            Dim oResult = _fileOp.GetDocumentByContainerId(oContainerId)
+    '        Dim oResult = _fileOp.GetDocumentByContainerId(oContainerId)
 
-            If Not oResult.OK Then
+    '        If Not oResult.OK Then
-                MsgBox(oResult.ErrorMessage)
+    '            MsgBox(oResult.ErrorMessage)
-                Exit Sub
+    '            Exit Sub
-            End If
+    '        End If
 
-            Dim oDocObject = oResult.Document
+    '        Dim oDocObject = oResult.Document
 
-            listboxLog.Items.Add($"Document fetched!")
+    '        listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+    '        listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+    '        listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
+    '        listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
-            listboxLog.Items.Add($"----------------------------------------------------------")
+    '        listboxLog.Items.Add($"----------------------------------------------------------")
-        Catch ex As Exception
+    '    Catch ex As Exception
-            ShowErrorMessage(ex)
+    '        ShowErrorMessage(ex)
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
 End Class

GUIs.ClientSuite/frmConfigService.vb

@@ -40,6 +40,8 @@ Public Class frmConfigService
                         lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port."
                     Case ClassService.ConnectionTestResult.EmptyURI
                         lblStatus.Text = "Bitte tragen Sie eine gültige Dienst Adresse ein."
+                    Case ClassService.ConnectionTestResult.Authentication
+                        lblStatus.Text = "Authentifizierungsfehler. Prüfen Sie, ob sich Ihr Gerät in der korrekten Domäne befindet."
                     Case Else
                         lblStatus.Text = "Unbekannter Fehler."
                 End Select

GUIs.ClientSuite/packages.config

@@ -3,6 +3,6 @@
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.EntityFrameworkCore.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net461" />
-  <package id="NLog" version="4.6.7" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
   <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
 </packages>

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -43,22 +43,19 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Data.v18.1.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Utils.v18.1.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraEditors.v18.1.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj.bak

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Modules.ClipboardWatcher</RootNamespace>
+    <AssemblyName>DigitalData.Modules.ClipboardWatcher</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Data.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Utils.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraEditors.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="frmMatch.Designer.vb">
+      <DependentUpon>frmMatch.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmMatch.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmTreeView.Designer.vb">
+      <DependentUpon>frmTreeView.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmTreeView.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ProfileFilter.vb" />
+    <Compile Include="ProfileMatch.vb" />
+    <Compile Include="ProfileSearches.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frmMatch.resx">
+      <DependentUpon>frmMatch.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmTreeView.resx">
+      <DependentUpon>frmTreeView.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GUIs.Common\Common.vbproj">
+      <Project>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Patterns\Patterns.vbproj">
+      <Project>{7c3b0c7e-59fe-4e1a-a655-27ae119f9444}</Project>
+      <Name>Patterns</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.ZooFlow\ZooFlow.vbproj">
+      <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
+      <Name>ZooFlow</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Windows\Windows.vbproj">
+      <Project>{5efaef9b-90b9-4f05-9f70-f79ad77fff86}</Project>
+      <Name>Windows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

GUIs.ClipboardWatcher/My Project/licenses.licx

@@ -1,2 +0,0 @@
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClipboardWatcher/My Project/licenses.licx.bak

@@ -0,0 +1 @@
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClipboardWatcher/ProfileFilter.vb

@@ -36,15 +36,22 @@ Public Class ProfileFilter
 
     Public Sub New(LogConfig As LogConfig, ProfileDatatable As DataTable, ProcessTable As DataTable, WindowDatatable As DataTable, ControlDatatable As DataTable, TreeView As TreeView)
         Try
-            _ProfileMatch = New ProfileMatch(LogConfig)
+            _LogConfig = LogConfig
+            _Logger = LogConfig.GetLogger()
+
+            _Logger.Debug("Initializing Profile Filter")
+            _Logger.Debug("Initializing Profile Data")
             _ProfileTable = ProfileDatatable
             _ProcessTable = ProcessTable
             _WindowTable = WindowDatatable
             _ControlTable = ControlDatatable
-            _Profiles = TransformProfiles()
+
+            _Logger.Debug("Initializing Profile Debugging")
             _TreeView = TreeView
-            _LogConfig = LogConfig
+            _ProfileMatch = New ProfileMatch(LogConfig)
-            _Logger = LogConfig.GetLogger()
+
+            _Logger.Debug("Transforming Profiles")
+            _Profiles = TransformProfiles()
         Catch ex As Exception
             _Logger.Error(ex)
             Throw ex
@@ -55,6 +62,11 @@ Public Class ProfileFilter
         Return _Profiles
     End Function
 
+    Public Function LogRemainingProfiles(Profiles As List(Of ProfileData), StepDescription As String) As List(Of ProfileData)
+        _Logger.Debug("Profiles remaining after Step {0}: {1}", StepDescription, Profiles.Count)
+        Return Profiles
+    End Function
+
     Public Function FilterProfilesByClipboardRegex(Profiles As List(Of ProfileData), ClipboardContents As String) As List(Of ProfileData)
         Dim oFilteredProfiles As New List(Of ProfileData)
 
@@ -77,6 +89,7 @@ Public Class ProfileFilter
                 Dim oMatch = oRegex.Match(ClipboardContents)
                 If oMatch.Success Then
                     _Logger.Debug("FilterProfilesByClipboardRegex: Clipboard Regex Matched: {0}", ClipboardContents)
+                    _Logger.Info("FilterProfilesByClipboardRegex: Profile {0} matched!", oProfile.Name)
                     oFilteredProfiles.Add(oProfile)
                     oProfile.IsMatched = True
 
@@ -91,39 +104,37 @@ Public Class ProfileFilter
 
         Return oFilteredProfiles
     End Function
-    Public Function FilterProfilesByProcess(Profiles As List(Of ProfileData), CurrentProcessName As String) As List(Of ProfileData)
+    Public Function FilterProfilesByProcess(Profiles As List(Of ProfileData), ProcessName As String) As List(Of ProfileData)
         Dim oFilteredProfiles As New List(Of ProfileData)
         Try
-            For Each oProfile In Profiles
+            For Each oProfile As ProfileData In Profiles
                 Dim oGuid = oProfile.Guid
 
-                If oProfile.IsMatched = False Then
-                    Continue For
-                End If
-
                 Dim oProcesses As New List(Of ProcessData)
-                For Each oProcessDef As ProcessData In oProfile.Processes
+                For Each oProcess As ProcessData In oProfile.Processes
-                    If oProcessDef.PROFILE_ID <> oGuid Then
+                    If oProcess.PROFILE_ID <> oGuid Then
                         Continue For
                     End If
 
-                    Dim oIsMatch = oProcessDef.ProcessName.ToLower = CurrentProcessName.ToLower
+                    Dim oIsMatch = oProcess.ProcessName.ToLower = ProcessName.ToLower
                     Dim oParent = _ProfileMatch.FindNodeByTag(_TreeView.Nodes, oProfile.Name & "-REGEX")
                     If oParent IsNot Nothing Then
-                        Dim oNode = _ProfileMatch.NewProcessNode(oProfile, oProcessDef, oIsMatch)
+                        Dim oNode = _ProfileMatch.NewProcessNode(oProfile, oProcess, oIsMatch)
                         oParent.Nodes.Add(oNode)
                     End If
 
-                    _Logger.Debug($"FilterProfilesByProcess: Checking Profile: {oProfile.Name} ...")
+                    _Logger.Debug($"FilterProfilesByProcess: Checking Profile: {oProfile.Name}")
                     If oIsMatch Then
-                        _Logger.Debug($"Yes...Processname Matched: {oProcessDef.ProcessName}")
+                        _Logger.Debug($"Processname Matched: {oProcess.ProcessName}")
-                        'TODO: Add Debug Data
+
                         oFilteredProfiles.Add(oProfile)
-                        oProfile.MatchedProcessID = oProcessDef.Guid
+                        _Logger.Info("FilterProfilesByProcess: Profile {0} matched!", oProfile.Name)
-                        oProcessDef.IsMatched = True
+
-                        oProcesses.Add(oProcessDef)
+                        oProfile.MatchedProcessID = oProcess.Guid
+                        oProcess.IsMatched = True
+                        oProcesses.Add(oProcess)
                         oProfile.IsMatched = True
-                        oProfile.MatchedProcessID = oProcessDef.Guid
+                        oProfile.MatchedProcessID = oProcess.Guid
 
                     End If
                 Next
@@ -136,18 +147,37 @@ Public Class ProfileFilter
         Catch ex As Exception
             _Logger.Warn("Unexpected error in FilterProfilesByProcess...")
             _Logger.Error(ex)
+            Return Profiles
         End Try
-
     End Function
     Public Function FilterWindowsByWindowTitleRegex(Profiles As List(Of ProfileData), WindowTitle As String) As List(Of ProfileData)
         Dim oProfiles As New List(Of ProfileData)
 
         For Each oProfile As ProfileData In Profiles
             _Logger.Debug("Checking WindowDefinition for profile: {0}...", oProfile.Name)
-            If oProfile.IsMatched = False Then Continue For
+
+            Dim oFilteredWindows As New List(Of WindowData)
+
+            ' Create list of all controls that match the current process and matched window
+            For Each oWindow As WindowData In oProfile.Windows
+                If oWindow.WindowProcessID = oProfile.MatchedProcessID Then
+                    oFilteredWindows.Add(oWindow)
+                End If
+            Next
+
+            ' If Profile has no windows at all, it automatically matches
+            If oFilteredWindows.Count = 0 Then
+                _Logger.Debug("Profile has no Windows assigned, automatic MATCH")
+
+                oProfile.IsMatched = True
+                oProfiles.Add(oProfile)
+
+                Continue For
+            End If
+
             Dim oWindows As New List(Of WindowData)
 
-            For Each oWindowDef As WindowData In oProfile.Windows
+            For Each oWindowDef As WindowData In oFilteredWindows
                 If oWindowDef.WindowProcessID <> oProfile.MatchedProcessID Then Continue For
                 Try
                     If oWindowDef.Regex = String.Empty Then
@@ -165,6 +195,8 @@ Public Class ProfileFilter
                         oProfile.MatchedWindowID = oWindowDef.Guid
                         oWindowDef.IsMatched = True
                         oWindows.Add(oWindowDef)
+                    Else
+                        _Logger.Debug("NO MATCH on WindowTitle: {0} - REGEX: {2}", WindowTitle, oWindowDef.Regex)
                     End If
 
                     Dim oParent = _ProfileMatch.FindNodeByTag(_TreeView.Nodes, oWindowDef.WindowProcessID & "-PROCESS")
@@ -179,57 +211,105 @@ Public Class ProfileFilter
                 End Try
             Next
 
+            ' If Profile has windows that matched, the profile matches
             If oWindows.Count > 0 Then
                 oProfile.Windows = oWindows
                 oProfile.IsMatched = True
                 oProfiles.Add(oProfile)
+
+                _Logger.Info("FilterWindowsByWindowTitleRegex: Profile {0} matched!", oProfile.Name)
             End If
         Next
 
         Return oProfiles
     End Function
 
-    Public Function FilterProfilesByFocusedControlLocation(Profiles As List(Of ProfileData), ClipboardContents As String, WindowHandle As IntPtr) As List(Of ProfileData)
+    Public Function FilterProfilesByFocusedControl(Profiles As List(Of ProfileData), ClipboardContents As String, WindowHandle As IntPtr) As List(Of ProfileData)
         Dim oFilteredProfiles As New List(Of ProfileData)
         Dim oWindow As New Window(_LogConfig)
+        Dim oFocusedWindow As Window.WindowInfo
 
-        For Each oProfile In Profiles
+        Try
-            If oProfile.IsMatched = False Then Continue For
+            oFocusedWindow = oWindow.GetWindowInfo()
+            If oFocusedWindow Is Nothing Then
+                Throw New ApplicationException("Window Information is Empty")
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return Profiles
+        End Try
 
-            If oProfile.Controls.Count = 0 Then
+        For Each oProfile As ProfileData In Profiles
+            Dim oFilteredControls As New List(Of ControlData)
+
+            ' Create list of all controls that match the current process and matched window
+            For Each oControl As ControlData In oProfile.Controls
+                If oProfile.MatchedWindowID = oControl.WindowId And oFocusedWindow.ProcessName = oControl.ProcessName Then
+                    oFilteredControls.Add(oControl)
+                End If
+            Next
+
+            ' If Profile has no controls at all, it automatically matches
+            If oFilteredControls.Count = 0 Then
+                _Logger.Debug("Profile has no Controls assigned, automatic MATCH")
                 oFilteredProfiles.Add(oProfile)
                 Continue For
             End If
 
-            Dim oControls As New List(Of ControlData)
+            Dim oMatchingControls As New List(Of ControlData)
 
-            For Each oControl In oProfile.Controls
+            For Each oControl In oFilteredControls
-                Dim oControlBounds = oWindow.GetFocusedControlLocation(WindowHandle)
                 Dim oFound As Boolean = False
 
-                For Each oItem As KeyValuePair(Of String, Window.RectangleInfo) In oControlBounds
+                ' If control name is empty, use coordinates
-                    Select Case oItem.Key
+                If oControl.ControlName Is Nothing OrElse oControl.ControlName = String.Empty Then
-                        Case "TOPLEFT"
+                    Dim oControlBounds As Dictionary(Of String, Window.RectangleInfo)
-                            If oControl.TopLeft.Top = oItem.Value.Top And oControl.TopLeft.Left = oItem.Value.Left Then
+
-                                oFound = True
+                    Try
-                            End If
+                        oControlBounds = oWindow.GetFocusedControlLocation(WindowHandle)
-                        Case "TOPRIGHT"
+
-                            If oControl.TopRight.Top = oItem.Value.Top And oControl.TopLeft.Right = oItem.Value.Right Then
+                        For Each oItem As KeyValuePair(Of String, Window.RectangleInfo) In oControlBounds
-                                oFound = True
+                            Select Case oItem.Key
-                            End If
+                                Case "TopLeft"
-                        Case "BOTTOMLEFT"
+                                    If oControl.TopLeft.Top = oItem.Value.Top And oControl.TopLeft.Left = oItem.Value.Left Then
-                            If oControl.BottomLeft.Bottom = oItem.Value.Bottom And oControl.TopLeft.Left = oItem.Value.Left Then
+                                        oFound = True
-                                oFound = True
+                                    End If
-                            End If
+                                Case "TopRight"
-                        Case "BOTTOMRIGHT"
+                                    If oControl.TopRight.Top = oItem.Value.Top And oControl.TopLeft.Right = oItem.Value.Right Then
-                            If oControl.BottomRight.Bottom = oItem.Value.Bottom And oControl.TopLeft.Right = oItem.Value.Right Then
+                                        oFound = True
-                                oFound = True
+                                    End If
-                            End If
+                                Case "BottomLeft"
-                    End Select
+                                    If oControl.BottomLeft.Bottom = oItem.Value.Bottom And oControl.TopLeft.Left = oItem.Value.Left Then
-                Next
+                                        oFound = True
+                                    End If
+                                Case "BottomRight"
+                                    If oControl.BottomRight.Bottom = oItem.Value.Bottom And oControl.TopLeft.Right = oItem.Value.Right Then
+                                        oFound = True
+                                    End If
+                            End Select
+                        Next
+                    Catch ex As Exception
+                        _Logger.Warn("Error while getting focused control location")
+                        _Logger.Error(ex)
+                    End Try
+                Else
+                    Dim oControlName As String = oControl.ControlName
+
+                    Try
+                        Dim oFocusedControl = oWindow.GetFocusedControl(WindowHandle)
+
+                        If oFocusedControl.ControlName = oControlName Then
+                            oFound = True
+                        End If
+                    Catch ex As Exception
+                        _Logger.Warn("Error while getting focused control name")
+                        _Logger.Error(ex)
+                    End Try
+                End If
 
                 If oFound Then
-                    oControls.Add(oControl)
+                    _Logger.Debug("Control {0} has MATCH", oControl.ControlName)
+                    oMatchingControls.Add(oControl)
                 End If
 
                 Dim oParent = _ProfileMatch.FindNodeByTag(_TreeView.Nodes, oControl.WindowId & "-WINDOW")
@@ -239,13 +319,16 @@ Public Class ProfileFilter
                 End If
             Next
 
-            If oControls.Count > 0 Then
+            ' If Profile has controls that matched, the profile matches
-                oProfile.Controls = oControls
+            If oMatchingControls.Count > 0 Then
+                _Logger.Debug("Profile has {0} MATCHING Controls", oMatchingControls.Count)
+                oProfile.Controls = oMatchingControls
                 oFilteredProfiles.Add(oProfile)
+
+                _Logger.Info("FilterProfilesByFocusedControl: Profile {0} matched!", oProfile.Name)
             End If
         Next
 
-
         Return oFilteredProfiles
     End Function
 
@@ -253,48 +336,50 @@ Public Class ProfileFilter
         Dim oProfiles As New List(Of ProfileData)
 
         For Each oProfile In Profiles
+            _Logger.Debug($"Checking SearchResults on ProfileID: {oProfile.Guid}")
             Dim oResultDocs As Integer = 0
             Dim oResultData As Integer = 0
 
             Dim oPatterns As New ClassPatterns(_LogConfig)
 
-            Dim oDataSearches As DataTable
+            Dim oDTDataSearches As DataTable
-            Dim oDocSearches As DataTable
+            Dim oDTDocSearches As DataTable
 
             Try
-                oDataSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}")
+                oDTDataSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}")
             Catch ex As Exception
                 _Logger.Error(ex)
                 Continue For
             End Try
 
             Try
-                oDocSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}")
+                oDTDocSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}")
             Catch ex As Exception
                 _Logger.Error(ex)
                 Continue For
             End Try
 
-            For Each oRow As DataRow In oDataSearches.Rows
+            For Each oRow As DataRow In oDTDataSearches.Rows
                 Dim oCountCommand = String.Empty
                 Try
                     oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty)
 
                     If oCountCommand = String.Empty Then
+                        _Logger.Debug("oCountCommand = String.Empty ==>  Continue for")
                         Continue For
                     End If
 
                     oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand)
                     oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, User)
                     oCountCommand = oPatterns.ReplaceClipboardContents(oCountCommand, ClipboardContents)
-
+                    _Logger.Debug($"Count-Command DATA before execute: [{oCountCommand}]")
                     oResultData += NotNull(Of Integer)(Database.GetScalarValue(oCountCommand), 0)
                 Catch ex As Exception
                     _Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
                 End Try
             Next
 
-            For Each oRow As DataRow In oDocSearches.Rows
+            For Each oRow As DataRow In oDTDocSearches.Rows
                 Dim oCountCommand = String.Empty
                 Try
                     oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty)
@@ -302,21 +387,28 @@ Public Class ProfileFilter
                     If oCountCommand = String.Empty Then
                         Continue For
                     End If
-
+                    _Logger.Debug($"Count-Command DOCS BEFORE Replace: {oCountCommand}")
                     oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand)
+                    ' _Logger.Debug($"Count-Command DOCS AFTER ReplaceInternalValues: {oCountCommand}")
                     oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, User)
+                    ' _Logger.Debug($"Count-Command DOCS AFTER ReplaceUserValues: {oCountCommand}")
                     oCountCommand = oPatterns.ReplaceClipboardContents(oCountCommand, ClipboardContents)
-
+                    _Logger.Debug($"Count-Command DOCS BEFORE execute: {oCountCommand}")
                     oResultDocs += NotNull(Of Integer)(Database.GetScalarValue(oCountCommand), 0)
+                    _Logger.Debug($"oResultDocs: {oResultDocs}")
                 Catch ex As Exception
                     _Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
                 End Try
             Next
 
-            If oResultData > 0 Or oResultDocs > 0 Then
+            oProfile.CountData = oResultData
-                oProfile.CountData = oResultData
+            oProfile.CountDocs = oResultDocs
-                oProfile.CountDocs = oResultDocs
+        Next
+
+        For Each oProfile In Profiles
+            If oProfile.CountData > 0 Or oProfile.CountDocs > 0 Then
                 oProfiles.Add(oProfile)
+                _Logger.Info("Profile {0} matched in FilterProfilesBySearchResults!", oProfile.Name)
             End If
         Next
 
@@ -361,6 +453,8 @@ Public Class ProfileFilter
             If oWindows.Count > 0 Then
                 oProfile.Windows = oWindows
                 oProfiles.Add(oProfile)
+
+                _Logger.Info("FilterWindowsByWindowClipboardRegex: Profile {0} matched!", oProfile.Name)
             End If
         Next
 
@@ -385,106 +479,128 @@ Public Class ProfileFilter
     End Function
 
     Private Function TransformProfiles() As List(Of ProfileData)
-        Dim oList As New List(Of ProfileData)
+        Try
+            Dim oList As New List(Of ProfileData)
 
-        For Each oRow As DataRow In _ProfileTable.Rows
+            For Each oRow As DataRow In _ProfileTable.Rows
-            Dim oProfileId = oRow.Item("GUID")
+                Dim oProfileId = oRow.Item("GUID")
-            Dim oProcessList As List(Of ProcessData) = TransformProcesses(oProfileId, _ProcessTable)
+                Dim oProcessList As List(Of ProcessData) = TransformProcesses(oProfileId, _ProcessTable)
-            Dim oWindowList As List(Of WindowData) = TransformWindows(oProfileId, _WindowTable)
+                Dim oWindowList As List(Of WindowData) = TransformWindows(oProfileId, _WindowTable)
-            Dim oControlList As List(Of ControlData) = TransformControls(oProfileId, _ControlTable)
+                Dim oControlList As List(Of ControlData) = TransformControls(oProfileId, _ControlTable)
 
-            oList.Add(New ProfileData() With {
+                oList.Add(New ProfileData() With {
-                .Guid = oRow.Item("GUID"),
+                    .Guid = oRow.Item("GUID"),
-                .Regex = oRow.Item("REGEX_EXPRESSION"),
+                    .Regex = oRow.Item("REGEX_EXPRESSION"),
-                .Name = NotNull(oRow.Item("NAME"), String.Empty),
+                    .Name = NotNull(oRow.Item("NAME"), String.Empty),
-                .Comment = NotNull(oRow.Item("COMMENT"), String.Empty),
+                    .Comment = NotNull(oRow.Item("COMMENT"), String.Empty),
-                .ProfileType = NotNull(oRow.Item("PROFILE_TYPE"), String.Empty),
+                    .ProfileType = NotNull(oRow.Item("PROFILE_TYPE"), String.Empty),
-                .Processes = oProcessList,
+                    .Processes = oProcessList,
-                .Windows = oWindowList,
+                    .Windows = oWindowList,
-                .Controls = oControlList
+                    .Controls = oControlList
-            })
+                })
-        Next
+            Next
 
-        oList = oList.
+            oList = oList.
-            Distinct().
+                Distinct().
-            ToList()
+                ToList()
 
-        Return oList
+            Return oList
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Throw ex
+        End Try
     End Function
 
     Private Function TransformControls(ProfileId As Integer, ControlDatatable As DataTable) As List(Of ControlData)
-        Dim oControlList As New List(Of ControlData)
+        Try
+            Dim oControlList As New List(Of ControlData)
 
-        For Each oRow As DataRow In ControlDatatable.Rows
+            For Each oRow As DataRow In ControlDatatable.Rows
-            If oRow.Item("PROFILE_ID") = ProfileId Then
+                If oRow.Item("PROFILE_ID") = ProfileId Then
-                oControlList.Add(New ControlData() With {
+                    oControlList.Add(New ControlData() With {
-                    .Guid = oRow.Item("GUID"),
+                        .Guid = oRow.Item("GUID"),
-                    .Description = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
+                        .ProcessName = NotNull(oRow.Item("PROCESS_NAME"), String.Empty),
-                    .WindowId = oRow.Item("WINDOW_ID"),
+                        .ControlName = NotNull(oRow.Item("CONTROL_NAME"), String.Empty),
-                    .TopLeft = New ControlBounds() With {
+                        .Description = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
-                        .Left = oRow.Item("TOPLEFT_LEFT"),
+                        .WindowId = oRow.Item("WINDOW_ID"),
-                        .Right = oRow.Item("TOPLEFT_RIGHT"),
+                        .TopLeft = New ControlBounds() With {
-                        .Top = oRow.Item("TOPLEFT_TOP"),
+                            .Left = oRow.Item("TOPLEFT_LEFT"),
-                        .Bottom = oRow.Item("TOPLEFT_BOTTOM")
+                            .Right = oRow.Item("TOPLEFT_RIGHT"),
-                    },
+                            .Top = oRow.Item("TOPLEFT_TOP"),
-                    .TopRight = New ControlBounds() With {
+                            .Bottom = oRow.Item("TOPLEFT_BOTTOM")
-                        .Left = oRow.Item("TOPRIGHT_LEFT"),
+                        },
-                        .Right = oRow.Item("TOPRIGHT_RIGHT"),
+                        .TopRight = New ControlBounds() With {
-                        .Top = oRow.Item("TOPRIGHT_TOP"),
+                            .Left = oRow.Item("TOPRIGHT_LEFT"),
-                        .Bottom = oRow.Item("TOPRIGHT_BOTTOM")
+                            .Right = oRow.Item("TOPRIGHT_RIGHT"),
-                    },
+                            .Top = oRow.Item("TOPRIGHT_TOP"),
-                    .BottomLeft = New ControlBounds() With {
+                            .Bottom = oRow.Item("TOPRIGHT_BOTTOM")
-                        .Left = oRow.Item("BOTTOMLEFT_LEFT"),
+                        },
-                        .Right = oRow.Item("BOTTOMLEFT_RIGHT"),
+                        .BottomLeft = New ControlBounds() With {
-                        .Top = oRow.Item("BOTTOMLEFT_TOP"),
+                            .Left = oRow.Item("BOTTOMLEFT_LEFT"),
-                        .Bottom = oRow.Item("BOTTOMLEFT_BOTTOM")
+                            .Right = oRow.Item("BOTTOMLEFT_RIGHT"),
-                    },
+                            .Top = oRow.Item("BOTTOMLEFT_TOP"),
-                    .BottomRight = New ControlBounds() With {
+                            .Bottom = oRow.Item("BOTTOMLEFT_BOTTOM")
-                        .Left = oRow.Item("BOTTOMRIGHT_LEFT"),
+                        },
-                        .Right = oRow.Item("BOTTOMRIGHT_RIGHT"),
+                        .BottomRight = New ControlBounds() With {
-                        .Top = oRow.Item("BOTTOMRIGHT_TOP"),
+                            .Left = oRow.Item("BOTTOMRIGHT_LEFT"),
-                        .Bottom = oRow.Item("BOTTOMRIGHT_BOTTOM")
+                            .Right = oRow.Item("BOTTOMRIGHT_RIGHT"),
-                    }
+                            .Top = oRow.Item("BOTTOMRIGHT_TOP"),
-                })
+                            .Bottom = oRow.Item("BOTTOMRIGHT_BOTTOM")
-            End If
+                        }
-        Next
+                    })
+                End If
+            Next
 
-        Return oControlList
+            Return oControlList
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Throw ex
+        End Try
     End Function
     Private Function TransformProcesses(ProfileId As Integer, ProcessDatatable As DataTable) As List(Of ProcessData)
-        Dim oProcessList As New List(Of ProcessData)
+        Try
+            Dim oProcessList As New List(Of ProcessData)
 
-        For Each oRow As DataRow In ProcessDatatable.Rows
+            For Each oRow As DataRow In ProcessDatatable.Rows
-            If oRow.Item("PROFILE_ID") = ProfileId Then
+                If oRow.Item("PROFILE_ID") = ProfileId Then
-                oProcessList.Add(New ProcessData() With {
+                    oProcessList.Add(New ProcessData() With {
-                    .Guid = oRow.Item("GUID"),
+                        .Guid = oRow.Item("GUID"),
-                    .PROFILE_ID = oRow.Item("PROFILE_ID"),
+                        .PROFILE_ID = oRow.Item("PROFILE_ID"),
-                    .ProcessName = NotNull(oRow.Item("PROC_NAME"), String.Empty)
+                        .ProcessName = NotNull(oRow.Item("PROC_NAME"), String.Empty)
-                })
+                    })
-            End If
+                End If
-        Next
+            Next
 
-        oProcessList = oProcessList.
+            oProcessList = oProcessList.
-            Distinct().
+                Distinct().
-            ToList()
+                ToList()
 
-        Return oProcessList
+            Return oProcessList
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Throw ex
+        End Try
     End Function
     Private Function TransformWindows(ProfileId As Integer, WindowDatatable As DataTable) As List(Of WindowData)
-        Dim oWindowList As New List(Of WindowData)
+        Try
+            Dim oWindowList As New List(Of WindowData)
 
-        For Each oRow As DataRow In WindowDatatable.Rows
+            For Each oRow As DataRow In WindowDatatable.Rows
-            If oRow.Item("PROFILE_ID") = ProfileId Then
+                If oRow.Item("PROFILE_ID") = ProfileId Then
-                oWindowList.Add(New WindowData() With {
+                    oWindowList.Add(New WindowData() With {
-                    .Guid = oRow.Item("GUID"),
+                        .Guid = oRow.Item("GUID"),
-                    .WindowProcessID = oRow.Item("PROCESS_ID"),
+                        .WindowProcessID = oRow.Item("PROCESS_ID"),
-                    .Title = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
+                        .Title = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
-                    .Regex = NotNull(oRow.Item("REGEX"), String.Empty),
+                        .Regex = NotNull(oRow.Item("REGEX"), String.Empty),
-                    .Sequence = NotNull(oRow.Item("SEQUENCE"), 0)
+                        .Sequence = NotNull(oRow.Item("SEQUENCE"), 0)
-                })
+                    })
-            End If
+                End If
-        Next
+            Next
 
-        Return oWindowList
+            Return oWindowList
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Throw ex
+        End Try
     End Function
 End Class

GUIs.ClipboardWatcher/ProfileMatch.vb

@@ -25,6 +25,8 @@ Public Class ProfileMatch
     End Function
 
     Public Function NewProfileNode(Profile As ProfileData) As TreeNode
+        _Logger.Debug("New Profile Node for Profile {0}", Profile.Name)
+
         Dim oNode As New TreeNode() With {
             .Text = $"Profile: {Profile.Name}",
             .ImageIndex = ProfileFilter.ImageIndex.Profile,
@@ -35,8 +37,9 @@ Public Class ProfileMatch
     End Function
 
     Public Function NewClipboardRegexNode(Profile As ProfileData, IsMatch As Boolean) As TreeNode
-        Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex {Profile.Regex}"
+        _Logger.Debug("New Clipboard Regex Node for Profile {0}", Profile.Name)
 
+        Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex {Profile.Regex}"
         Dim oNode As New TreeNode() With {
             .Text = oText,
             .ImageIndex = ProfileFilter.ImageIndex.Clipboard,
@@ -47,9 +50,10 @@ Public Class ProfileMatch
         Return oNode
     End Function
     Public Function NewProcessNode(Profile As ProfileData, Process As ProcessData, IsMatch As Boolean) As TreeNode
+        _Logger.Debug("New Process Node for Profile {0} and ProcessName {1}", Profile.Name, Process.ProcessName)
+
         Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
         Dim oText = $"{GetMatchText(IsMatch)} on ProcessName {Process.ProcessName}"
-
         Dim oNode As New TreeNode() With {
             .Text = oText,
             .ImageIndex = ProfileFilter.ImageIndex.Process,
@@ -61,9 +65,10 @@ Public Class ProfileMatch
     End Function
 
     Public Function NewWindowNode(Profile As ProfileData, Window As WindowData, IsMatch As Boolean) As TreeNode
+        _Logger.Debug("New Window Node for Profile {0} and WindowTitle {1}", Profile.Name, Window.Title)
+
         Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
         Dim oText = $"{GetMatchText(IsMatch)} on WindowTitle {Window.Title}"
-
         Dim oNode As New TreeNode() With {
             .Text = oText,
             .ImageIndex = ProfileFilter.ImageIndex.Window,
@@ -75,8 +80,10 @@ Public Class ProfileMatch
     End Function
 
     Public Function NewControlNode(Profile As ProfileData, Control As ControlData, IsMatch As Boolean) As TreeNode
+        _Logger.Debug("New Control Node for Profile {0} and Control {1}", Profile.Name, Control.Description)
+
         Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
-        Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}: {IsMatch.ToString}"
+        Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}"
 
         Dim oNode As New TreeNode() With {
             .Text = oText,

GUIs.ClipboardWatcher/ProfileSearches.vb

@@ -23,13 +23,14 @@ Public Class ProfileSearches
         _Params = Params
     End Sub
 
-    Public Async Function LoadDocumentSearchesAsync() As Task(Of List(Of Search))
+    Public Async Function LoadDocumentSearchesAsync(ProfileId As Integer) As Task(Of List(Of Search))
-        Return Await Task.Run(AddressOf DoLoadDocumentSearches)
+        Return Await Task.Run(Function()
+                                  Return DoLoadDocumentSearches(ProfileId)
+                              End Function)
     End Function
 
-    Private Function DoLoadDocumentSearches() As List(Of Search)
+    Private Function DoLoadDocumentSearches(ProfileId As Integer) As List(Of Search)
-        Dim oMatchingIds = String.Join(",", _Params.MatchingProfiles.Select(Function(p) p.Guid).ToArray())
+        Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {ProfileId} ORDER BY TAB_INDEX"
-        Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
         Dim oSearchesDataTable = _Environment.Database.GetDatatable(oSQL)
         Dim oDocSearches As New List(Of Search)
         Dim oCounter As Integer = 0
@@ -47,6 +48,12 @@ Public Class ProfileSearches
             oSQL = oPatterns.ReplaceClipboardContents(oSQL, _Params.ClipboardContents)
 
             Dim oDatatable As DataTable = _Environment.Database.GetDatatable(oSQL, oConnectionId)
+
+            If oDatatable Is Nothing Then
+                _Logger.Warn("Error in SQL-Query '{0}'", oSQL)
+                Continue For
+            End If
+
             oDocSearches.Add(New Search() With {
                 .Guid = oGuid,
                 .DataTable = oDatatable,
@@ -62,16 +69,17 @@ Public Class ProfileSearches
         Return oDocSearches
     End Function
 
-    Public Async Function LoadDataSearchesAsync() As Task(Of List(Of Search))
+    Public Async Function LoadDataSearchesAsync(ProfileId As Integer) As Task(Of List(Of Search))
-        Return Await Task.Run(AddressOf DoLoadDataSearches)
+        Return Await Task.Run(Function()
+                                  Return DoLoadDataSearches(ProfileId)
+                              End Function)
     End Function
 
-    Private Function DoLoadDataSearches() As List(Of Search)
+    Private Function DoLoadDataSearches(ProfileId As Integer) As List(Of Search)
         Dim oDataSearches As New List(Of Search)
 
         Try
-            Dim oMatchingIds = String.Join(",", _Params.MatchingProfiles.Select(Function(p) p.Guid).ToArray())
+            Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {ProfileId} ORDER BY TAB_INDEX"
-            Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
             Dim oSearchesDataTable = _Environment.Database.GetDatatable(oSQL)
 
             Dim oCounter As Integer = 0
@@ -88,6 +96,12 @@ Public Class ProfileSearches
                     oSQL = oPatterns.ReplaceInternalValues(oSQL)
 
                     Dim oDatatable As DataTable = _Environment.Database.GetDatatable(oSQL, oConnectionId)
+
+                    If oDatatable Is Nothing Then
+                        _Logger.Warn("Error in SQL-Query '{0}'", oSQL)
+                        Continue For
+                    End If
+
                     oDataSearches.Add(New Search() With {
                         .DataTable = oDatatable,
                         .ProfileId = oProfileId,

GUIs.ClipboardWatcher/frmMatch.vb

@@ -55,14 +55,7 @@ Public Class frmMatch
         _Params = Params
     End Sub
 
-    Public Sub ShowTreeView()
+    Private Async Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With {
-            .StartPosition = FormStartPosition.CenterScreen
-        }
-        oForm.ShowDialog()
-    End Sub
-
-    Private Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Dim oCreatedTiles = CreateTiles()
 
         If oCreatedTiles = -1 Then
@@ -70,19 +63,39 @@ Public Class frmMatch
         End If
 
         If oCreatedTiles = 0 Then
-            _Logger.Warn("No Results found for ""{0}""", _Params.ClipboardContents)
+            _Logger.Warn("No Tiles Created: No Results found for ""{0}""", _Params.ClipboardContents)
             Close()
         End If
 
         Dim oMatchString = IIf(oCreatedTiles = 1, "1 Profil", $"{oCreatedTiles} Profile")
         Label1.Text = String.Format(Label1.Text, oMatchString, _Params.ClipboardContents)
-
+        _Logger.Debug($"Created Tiles: {oCreatedTiles} ")
         If oCreatedTiles = 1 Then
+
             Dim oProfile As ProfileData = _Params.MatchingProfiles.First()
-            ' TODO Open Result Forms
+            Dim oProfileSearch As New ProfileSearches(_LogConfig, _Environment, _Params)
+
+            If oProfile.CountDocs > 0 And oProfile.CountData = 0 Then
+                _Logger.Debug($"ONLY Docs")
+                'ONLY DOCS AND NÒ DATA
+                Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync(oProfile.Guid)
+                OpenDocumentResults(oProfile, oSearches)
+                Hide()
+            ElseIf oProfile.CountDocs > 0 And oProfile.CountData > 0 Then
+                _Logger.Debug($"Docs AND Data")
+            ElseIf oProfile.CountDocs = 0 And oProfile.CountData > 0 Then
+                _Logger.Debug($"ONLY Data")
+                Dim oSearches = Await oProfileSearch.LoadDataSearchesAsync(oProfile.Guid)
+                OpenDataResults(oProfile, oSearches)
+                Hide()
+            End If
         End If
     End Sub
 
+    Private Sub frmMatch_Activated(sender As Object, e As EventArgs) Handles Me.Activated
+        TopMost = True
+    End Sub
+
     Function CreateTiles() As Integer
         Try
             Dim oCreatedTiles As Integer = 0
@@ -94,20 +107,24 @@ Public Class frmMatch
             oDataGroup.Items.Clear()
 
             For Each oProfile As ProfileData In _Params.MatchingProfiles
-                If oProfile.ProfileType = ProfileType.ANY Then
+                'TODO: Add Support for Combined Result Lists
-                    If oProfile.CountData > 0 And oProfile.CountDocs > 0 Then
+                'If oProfile.ProfileType = ProfileType.ANY Then
-                        Dim oCountText = oProfile.CountData + oProfile.CountDocs
+                '    If oProfile.CountData > 0 And oProfile.CountDocs > 0 Then
-                        Dim oItem = CreateTile(oProfile, $"{oCountText} Ergebnisse")
+                '        Dim oCountText = oProfile.CountData + oProfile.CountDocs
-                        oDataDocumentsGroup.Items.Add(oItem)
+                '        Dim oItem = CreateTile(oProfile, $"{oCountText} Ergebnisse")
-                        oCreatedTiles += 1
+                '        oDataDocumentsGroup.Items.Add(oItem)
-                    End If
+                '        oCreatedTiles += 1
-                End If
+                '    End If
+                'End If
 
                 If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DOCS_ONLY Then
+                    _Logger.Debug("Docs only or ProfileTypeAny")
                     If oProfile.CountDocs > 0 Then
-                        Dim oItem = CreateTile(oProfile, $"{oProfile.CountDocs} Dokumente")
+                        Dim oItem = CreateTile(oProfile, $"{oProfile.CountDocs} Dateien")
                         oDocumentGroup.Items.Add(oItem)
                         oCreatedTiles += 1
+                    Else
+                        _Logger.Debug("NO Doc-Results!")
                     End If
                 End If
 
@@ -116,6 +133,8 @@ Public Class frmMatch
                         Dim oItem = CreateTile(oProfile, $"{oProfile.CountData} Datensätze")
                         oDataGroup.Items.Add(oItem)
                         oCreatedTiles += 1
+                    Else
+                        _Logger.Debug("NO Data-Results!")
                     End If
                 End If
             Next
@@ -179,7 +198,10 @@ Public Class frmMatch
     End Function
 
     Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click
-        ShowTreeView()
+        Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With {
+            .StartPosition = FormStartPosition.CenterScreen
+        }
+        oForm.ShowDialog()
     End Sub
 
     Private Async Sub TileControlMatch_ItemClick(sender As Object, e As TileItemEventArgs) Handles TileControlMatch.ItemClick
@@ -194,11 +216,11 @@ Public Class frmMatch
 
         Select Case oItem.Group.Name
             Case TileGroupData.Name
-                Dim oSearches = Await oProfileSearch.LoadDataSearchesAsync()
+                Dim oSearches = Await oProfileSearch.LoadDataSearchesAsync(oProfileId)
                 OpenDataResults(oProfile, oSearches)
 
             Case TileGroupDocuments.Name
-                Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync()
+                Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync(oProfileId)
                 OpenDocumentResults(oProfile, oSearches)
 
             Case Else

GUIs.ClipboardWatcher/packages.config

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

GUIs.Common/Base/BaseErrorHandler.vb

@@ -0,0 +1,103 @@
+Imports System.Reflection
+Imports System.Windows.Forms
+Imports DigitalData.Modules.Logging
+
+Namespace Base
+    Public Class BaseErrorHandler
+        Private _LogConfig As LogConfig
+        Private _Logger As Logger
+        Private _Form As Form
+
+        Private Const UNKNOWN_METHOD = "Unknown Method"
+        Private Const UNKNOWN_FORM = "Unknown Form"
+
+        Public Sub New(LogConfig As LogConfig, Logger As Logger, Form As Form)
+            _LogConfig = LogConfig
+            _Logger = Logger
+            _Form = Form
+        End Sub
+
+        Public Sub ShowErrorMessage(Exception As Exception)
+            _Logger.Error(Exception)
+            MessageBox.Show(GetMessage(Exception), _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
+        End Sub
+
+        Public Sub ShowInfoMessage(Text As String)
+            _Logger.Info(Text)
+            MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
+        End Sub
+
+        Private Function GetMessage(Exception As Exception) As String
+            Dim oTargetSite = Exception.TargetSite
+            Dim oMethodName = GetMethodName(Exception)
+            Dim oFormName = GetFormName(Exception)
+            Dim oMessage As String = String.Empty
+
+            If TypeOf Exception Is SqlClient.SqlException Then
+                Dim oNumber As Integer = DirectCast(Exception, SqlClient.SqlException).Number
+                Select Case oNumber
+                    Case 2627
+                        oMessage = "Es wurde ein Doppelter Wert in eine Spalte eingetragen, die einzigartig sein muss."
+                End Select
+            ElseIf TypeOf Exception Is NoNullAllowedException Then
+                oMessage = "Einige benötigte Felder wurde nicht ausgefüllt."
+            Else
+                oMessage = $"Es ist ein unerwarteter Fehler in {oFormName}/{oMethodName} aufgetreten. Mehr Informationen finden Sie im Log."
+            End If
+
+            If _LogConfig.Debug Then
+                oMessage &= vbNewLine & vbNewLine & "== Debug Informationen =="
+                oMessage &= vbNewLine & vbNewLine & "Die ursprüngliche Fehlermeldung lautet:"
+                oMessage &= vbNewLine & Exception.Message
+                oMessage &= vbNewLine & vbNewLine & "Stacktrace:"
+                oMessage &= vbNewLine & Exception.StackTrace
+            End If
+
+            Return oMessage
+        End Function
+
+        'Private Function GetMessage(Exception As Exception) As String
+        '    Dim oTargetSite = Exception.TargetSite
+        '    Dim oMethodName = GetMethodName(Exception)
+        '    Dim oFormName = GetFormName(Exception)
+        '    Dim oMessage As String = String.Empty
+
+        '    oMessage &= $"Form: {oFormName}{vbNewLine}"
+        '    oMessage &= $"Method: {oMethodName}{vbNewLine}"
+
+        '    If Not String.IsNullOrEmpty(Exception.StackTrace) Then
+        '        oMessage &= $"Message: {Exception.Message}{vbNewLine}{vbNewLine}"
+        '    End If
+
+        '    If Not String.IsNullOrEmpty(Exception.StackTrace) Then
+        '        oMessage &= $"Stacktrace: {Exception.StackTrace}{vbNewLine}"
+        '    End If
+
+        '    oMessage &= $"{vbNewLine}"
+        '    oMessage &= $"Please report this error to error@digitaldata.works"
+
+        '    Return oMessage
+        'End Function
+
+        Private Function GetMethodName(Exception As Exception) As String
+            Dim oMethodName = Exception.TargetSite?.Name
+
+            If oMethodName Is Nothing Then
+                Return UNKNOWN_METHOD
+            Else
+                Return oMethodName
+            End If
+        End Function
+
+        Private Function GetFormName(Exception As Exception) As String
+            Dim oFormName = Exception.TargetSite?.ReflectedType?.Name
+
+            If oFormName Is Nothing Then
+                Return UNKNOWN_FORM
+            Else
+                Return oFormName
+            End If
+        End Function
+    End Class
+
+End Namespace

GUIs.Common/Base/BaseMessageBox.vb

@@ -1,72 +0,0 @@
-Imports System.Reflection
-Imports System.Windows.Forms
-Imports DigitalData.Modules.Logging
-
-Namespace Base
-    Public Class BaseErrorHandler
-        Private _Logger As Logger
-        Private _Form As Form
-
-        Private Const UNKNOWN_METHOD = "Unknown Method"
-        Private Const UNKNOWN_FORM = "Unknown Form"
-
-        Public Sub New(Logger As Logger, Form As Form)
-            _Logger = Logger
-            _Form = Form
-        End Sub
-
-        Public Sub ShowErrorMessage(Exception As Exception)
-            _Logger.Error(Exception)
-            MessageBox.Show(GetMessage(Exception), _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
-        End Sub
-
-        Public Sub ShowInfoMessage(Text As String)
-            _Logger.Info(Text)
-            MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
-        End Sub
-
-        Private Function GetMessage(Exception As Exception) As String
-            Dim oTargetSite = Exception.TargetSite
-            Dim oMethodName = GetMethodName(Exception)
-            Dim oFormName = GetFormName(Exception)
-            Dim oMessage As String = String.Empty
-
-            oMessage &= $"Form: {oFormName}{vbNewLine}"
-            oMessage &= $"Method: {oMethodName}{vbNewLine}"
-
-            If Not String.IsNullOrEmpty(Exception.StackTrace) Then
-                oMessage &= $"Message: {Exception.Message}{vbNewLine}{vbNewLine}"
-            End If
-
-            If Not String.IsNullOrEmpty(Exception.StackTrace) Then
-                oMessage &= $"Stacktrace: {Exception.StackTrace}{vbNewLine}"
-            End If
-
-            oMessage &= $"{vbNewLine}"
-            oMessage &= $"Please report this error to error@digitaldata.works"
-
-            Return oMessage
-        End Function
-
-        Private Function GetMethodName(Exception As Exception) As String
-            Dim oMethodName = Exception.TargetSite?.ReflectedType?.Name
-
-            If oMethodName Is Nothing Then
-                Return UNKNOWN_METHOD
-            Else
-                Return oMethodName
-            End If
-        End Function
-
-        Private Function GetFormName(Exception As Exception) As String
-            Dim oFormName = Exception.TargetSite?.ReflectedType?.ReflectedType?.Name
-
-            If oFormName Is Nothing Then
-                Return UNKNOWN_FORM
-            Else
-                Return oFormName
-            End If
-        End Function
-    End Class
-
-End Namespace

GUIs.Common/Base/BaseRibbonForm.vb

@@ -12,8 +12,6 @@ Namespace Base
     '''     
     '''     ... 
     ''' End Class
-    ''' 
-    ''' Only BaseRibbonForms can have panels attached to it!
     ''' </summary>
     Public Class BaseRibbonForm
         Inherits RibbonForm
@@ -27,57 +25,31 @@ Namespace Base
             End Get
         End Property
 
-        ''' <summary>
+        Public Sub New()
-        ''' Sets or gets the ribbon Page that will be shown when the window is visible
-        ''' </summary>
-        ''' <returns></returns>
-        Public Property DefaultRibbonPage As RibbonPage
-
-        Protected Overrides Sub OnLoad(e As EventArgs)
-            MyBase.OnLoad(e)
-
-            If DefaultRibbonPage IsNot Nothing Then
-                Ribbon.SelectPage(DefaultRibbonPage)
-            End If
         End Sub
 
-        Protected Overrides Sub OnVisibleChanged(e As EventArgs)
-            MyBase.OnVisibleChanged(e)
-
-            If Visible And DefaultRibbonPage IsNot Nothing Then
-                Ribbon.SelectPage(DefaultRibbonPage)
-            End If
-        End Sub
-
-        Protected Overrides Sub OnActivated(e As EventArgs)
-            MyBase.OnVisibleChanged(e)
-
-            If Visible And DefaultRibbonPage IsNot Nothing Then
-                Ribbon.SelectPage(DefaultRibbonPage)
-            End If
-        End Sub
-
-
         Public Sub New(LogConfig As LogConfig)
             ' Get the full name of the inheriting form
             ' so the log messages have the right classname
             Dim oClassName = [GetType]().FullName
 
-            ' My.LogConfig is undefined in the designer  
+            ' My.LogConfig is undefined in the designer
             _Logger = LogConfig?.GetLogger(oClassName)
-            _ErrorHandler = New BaseErrorHandler(_Logger, Me)
+            _ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me)
 
             ' When you add something, be careful if it 
             ' depends on a global var like My.LogConfig
             ' you might need to check for its existence with ?
         End Sub
 
+        ''' ============== PUBLIC METHODS ==============
+
         Public Sub ShowErrorMessage(Exception As Exception)
             _ErrorHandler.ShowErrorMessage(Exception)
         End Sub
 
         Public Sub ShowErrorMessage(ErrorMessage As String)
-            _ErrorHandler.ShowErrorMessage(New Exception(ErrorMessage))
+            _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage))
         End Sub
     End Class
 End Namespace

GUIs.Common/Common.vbproj

@@ -43,23 +43,26 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Dialogs.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraDialogs.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraDialogs.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
     <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -88,7 +91,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Base\BaseMessageBox.vb" />
+    <Compile Include="Base\BaseErrorHandler.vb" />
     <Compile Include="Base\BaseRibbonForm.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -151,13 +154,8 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
-      <Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
-      <Name>DocumentViewer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules.Config\Config.vbproj">
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
@@ -180,6 +178,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\txt.png" />
   </ItemGroup>
   <ItemGroup>
@@ -215,5 +214,14 @@
   <ItemGroup>
     <None Include="Resources\png.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Article_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Open_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Copy_32x32.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

GUIs.Common/Common.vbproj.bak

@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.GUIs.Common</RootNamespace>
+    <AssemblyName>DigitalData.GUIs.Common</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.GUIs.Common.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.GUIs.Common.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraDialogs.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14">
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Base\BaseErrorHandler.vb" />
+    <Compile Include="Base\BaseRibbonForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Constants.vb" />
+    <Compile Include="DataResultList\DataResultConfig.vb" />
+    <Compile Include="DataResultList\DataResultParams.vb" />
+    <Compile Include="DataResultList\frmDataResultList.Designer.vb">
+      <DependentUpon>frmDataResultList.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DataResultList\frmDataResultList.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DocumentResultList\DocumentResultConfig.vb" />
+    <Compile Include="DocumentResultList\DocumentResultParams.vb" />
+    <Compile Include="DocumentResultList\frmDocumentResultList.Designer.vb">
+      <DependentUpon>frmDocumentResultList.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DocumentResultList\frmDocumentResultList.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IResultForm.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataResultList\frmDataResultList.resx">
+      <DependentUpon>frmDataResultList.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DocumentResultList\frmDocumentResultList.resx">
+      <DependentUpon>frmDocumentResultList.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Config\Config.vbproj">
+      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.ZooFlow\ZooFlow.vbproj">
+      <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
+      <Name>ZooFlow</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\txt.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\pdf.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\doc.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\xls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ppt.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\dwg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\dxf.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\tiff.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\jpg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\_blank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\_page.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\png.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Article_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Open_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Copy_32x32.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

GUIs.Common/DataResultList/frmDataResultList.vb

@@ -38,7 +38,7 @@ Public Class frmDataResultList
 
         _LogConfig = LogConfig
         _Logger = LogConfig.GetLogger()
-        _Config = New ConfigManager(Of DataResultConfig)(LogConfig, oConfigPath)
+        _Config = New ConfigManager(Of DataResultConfig)(LogConfig, oConfigPath, Application.StartupPath)
         _Environment = Environment
         _Params = Params
         _ResultLists = Params.Results
@@ -123,6 +123,16 @@ Public Class frmDataResultList
         _ActiveRowHandle = e.FocusedRowHandle
     End Sub
 
+    Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter
+        _ActiveGrid = sender
+        SetActiveGridBand()
+    End Sub
+
+    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
+
     Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged
         If _IsLoading = False Then
             _Config.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition

GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDocumentResultList
-    Inherits Base.BaseRibbonForm
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         If disposing AndAlso components IsNot Nothing Then
             components.Dispose()
@@ -17,7 +17,7 @@ Partial Class frmDocumentResultList
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocumentResultList))
@@ -53,7 +53,7 @@ Partial Class frmDocumentResultList
         Me.GridView3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
         Me.GridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.DocumentViewer1 = New DocumentViewer.DocumentViewer()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.XtraSaveFileDialog = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -227,18 +227,21 @@ Partial Class frmDocumentResultList
         '
         'DateiÖffnenToolStripMenuItem
         '
+        Me.DateiÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Article_32x32
         Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
         Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.DateiÖffnenToolStripMenuItem.Text = "Datei öffnen"
         '
         'OrdnerÖffnenToolStripMenuItem
         '
+        Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Open_32x32
         Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem"
         Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen"
         '
         'PfadInZwischenablageKopierenToolStripMenuItem
         '
+        Me.PfadInZwischenablageKopierenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Copy_32x32
         Me.PfadInZwischenablageKopierenToolStripMenuItem.Name = "PfadInZwischenablageKopierenToolStripMenuItem"
         Me.PfadInZwischenablageKopierenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.PfadInZwischenablageKopierenToolStripMenuItem.Text = "Pfad in Zwischenablage"
@@ -420,7 +423,7 @@ Partial Class frmDocumentResultList
     Friend WithEvents BarButtonItemExportGrid1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents DocumentViewer1 As DocumentViewer.DocumentViewer
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -38,8 +38,6 @@ Public Class frmDocumentResultList
     Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
 
     Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As DocumentResultParams)
-        MyBase.New(LogConfig)
-
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
@@ -48,7 +46,7 @@ Public Class frmDocumentResultList
 
         _LogConfig = LogConfig
         _Logger = LogConfig.GetLogger()
-        _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath)
+        _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath, oConfigPath)
         _Environment = Environment
         _Params = Params
         _ResultLists = Params.Results
@@ -104,13 +102,21 @@ Public Class frmDocumentResultList
                         UpdateGridHeader(index, oResult.Datatable.Rows.Count)
 
                     Case Else
-                        MessageBox.Show("You have more than three searches configured. This Window will only show the first three result lists!")
+                        MessageBox.Show("You have more than three searches configured. This Window will only show the first three result lists!", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
                         Exit For
                 End Select
             Next
 
             ' Hide Grids depending on Result count
             Select Case _ResultLists.Count
+                Case 0
+                    SplitContainerControl1.SetPanelCollapsed(True)
+                    SplitContainerControl2.SetPanelCollapsed(True)
+
+                    SwitchMainContainerHorizontal.Enabled = False
+                    SwitchDetailContainerHorizontal.Enabled = False
+
+                    MessageBox.Show("No Searches found.", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
                 Case 1
                     SplitContainerControl1.SetPanelCollapsed(True)
                     SplitContainerControl2.SetPanelCollapsed(True)
@@ -389,6 +395,11 @@ Public Class frmDocumentResultList
         SetActiveGridBand()
     End Sub
 
+    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
+
     Private Sub SetActiveGridBand()
         If _ActiveGrid.Equals(GridControl1) Then
             _ActiveGridBand = GridBand1
@@ -494,4 +505,10 @@ Public Class frmDocumentResultList
             _Logger.Error(ex)
         End Try
     End Sub
+
+    Private Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick, GridControl2.DoubleClick, GridControl3.DoubleClick
+        OpenFile()
+    End Sub
+
+
 End Class

GUIs.Common/My Project/Resources.Designer.vb

@@ -80,6 +80,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Article_32x32() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Article_32x32", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Copy_32x32() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Copy_32x32", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -120,6 +140,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Open_32x32() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Open_32x32", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

GUIs.Common/My Project/Resources.resx

@@ -118,23 +118,8 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="doc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Open_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="dxf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,16 +127,40 @@
   <data name="tiff" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="doc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="dxf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Article_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Copy_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

GUIs.Common/My Project/licenses.licx

@@ -1,4 +0,0 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.Common/My Project/licenses.licx.bak

@@ -0,0 +1,4 @@
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.Common/packages.config

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

GUIs.Test.ADSyncTest/ADSyncTest.vbproj

@@ -49,7 +49,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -130,7 +130,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Jobs\Jobs.vbproj">
+    <ProjectReference Include="..\Modules.Jobs\Jobs.vbproj">
       <Project>{39ec839a-3c30-4922-a41e-6b09d1dde5c3}</Project>
       <Name>Jobs</Name>
     </ProjectReference>

GUIs.Test.ADSyncTest/Form1.vb

@@ -19,14 +19,14 @@ Public Class Form1
         _firebird = New Firebird(_logConfig, "172.24.12.41", "172.24.12.41:E:\DB\Firebird\Databases\DD_ICM.fdb", "sysdba", "dd")
         _sql = New MSSQLServer(_logConfig, "Server=172.24.12.41\tests;Database=DD_ECM_TEST;User Id=sa; Password=dd")
 
-        _sync = New ActiveDirectoryInterface(_logConfig, Nothing, _sql)
+        _sync = New ActiveDirectoryInterface(_logConfig)
         _sync.Authenticate()
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         Dim oGroup As String = ListBox1.SelectedItem
         Dim oAttributeMappings = GetAttributeMappings()
-        _sync.SyncUsersForGroup(oGroup, oAttributeMappings)
+        _sync.SyncUsersForGroup(oGroup, oAttributeMappings, _firebird, _sql)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click

GUIs.Test.ADSyncTest/packages.config

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

GUIs.Test.DocumentViewerTest/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Independentsoft.Msg" publicKeyToken="76be97fe952f1ec7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.570.17147" newVersion="2.0.570.17147" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

GUIs.Test.DocumentViewerTest/Form1.Designer.vb

@@ -0,0 +1,102 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class Form1
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'TextBox1
+        '
+        Me.TextBox1.Location = New System.Drawing.Point(12, 12)
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.Size = New System.Drawing.Size(637, 20)
+        Me.TextBox1.TabIndex = 1
+        '
+        'OpenFileDialog1
+        '
+        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(655, 9)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(50, 23)
+        Me.Button1.TabIndex = 2
+        Me.Button1.Text = "..."
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(12, 38)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(637, 23)
+        Me.Button2.TabIndex = 2
+        Me.Button2.Text = "Load Form3 which loads Form4"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(12, 67)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(637, 23)
+        Me.Button3.TabIndex = 2
+        Me.Button3.Text = "Load Form4"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(12, 96)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(637, 23)
+        Me.Button4.TabIndex = 3
+        Me.Button4.Text = "Extract Files from PDF"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'Form1
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.Button3)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.TextBox1)
+        Me.Name = "Form1"
+        Me.Text = "Form1"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
+End Class