merge

2020-03-04 14:45:47 +01:00 · 2020-03-04 14:45:47 +01:00 · c20fc2dbf5
commit c20fc2dbf5
parent 5ffe390f45 b995304ee3
25 changed files with 873 additions and 159 deletions
--- a/Controls.DocumentViewer/DocumentViewer.Designer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb
@ -103,7 +103,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
@ -195,7 +195,7 @@ Partial Class DocumentViewer
        '
        Me.DefaultToolStripMenuItem.CheckOnClick = True
        Me.DefaultToolStripMenuItem.Name = "DefaultToolStripMenuItem"
-        Me.DefaultToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.DefaultToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.DefaultToolStripMenuItem.Text = "Default"
        '
        'PanToolStripMenuItem
@ -204,28 +204,28 @@ Partial Class DocumentViewer
        Me.PanToolStripMenuItem.CheckOnClick = True
        Me.PanToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked
        Me.PanToolStripMenuItem.Name = "PanToolStripMenuItem"
-        Me.PanToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.PanToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.PanToolStripMenuItem.Text = "Pan"
        '
        'AreaSelectionToolStripMenuItem
        '
        Me.AreaSelectionToolStripMenuItem.CheckOnClick = True
        Me.AreaSelectionToolStripMenuItem.Name = "AreaSelectionToolStripMenuItem"
-        Me.AreaSelectionToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.AreaSelectionToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.AreaSelectionToolStripMenuItem.Text = "Area selection"
        '
        'AreaZoomingToolStripMenuItem
        '
        Me.AreaZoomingToolStripMenuItem.CheckOnClick = True
        Me.AreaZoomingToolStripMenuItem.Name = "AreaZoomingToolStripMenuItem"
-        Me.AreaZoomingToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.AreaZoomingToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.AreaZoomingToolStripMenuItem.Text = "Area zooming"
        '
        'MagnifierToolStripMenuItem
        '
        Me.MagnifierToolStripMenuItem.CheckOnClick = True
        Me.MagnifierToolStripMenuItem.Name = "MagnifierToolStripMenuItem"
-        Me.MagnifierToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.MagnifierToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.MagnifierToolStripMenuItem.Text = "Magnifier"
        '
        'ToolStripSeparator6
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@ -124,13 +124,13 @@
  <data name="btnPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVVBToRAEESNF/+kv+AKNx5AQuBi5hMe3JDo
-        yQ+w8WR8iCfCgQ9sdsNBnLFrdtodBgmzu2IllanudHdN70IIppDnuSQqnEVRDE4mYqZp84MQ4pIGKF8c
-        bZAkyfWyBkLcLLzBSm8gpdQD7JPJMXCUwV2xVufQjDmA3N+jKPrCU9H3vbrNK+JKohinre2cG0ODbdvq
-        pyuO488sy15g8PPo/aWBmdlrAyYMuPBU8n/CXHoDOTDouk6Jh1dqqHTx3uyg7ZwbQ6O3aZppg6qqVF3X
-        ErfAqjhtbefcGBq9ZVmODZbkYIM5befceEr/zwZaGEBP3cjOufGUxkCdsMlFvnCHssbbjA/LmhIjE9AX
-        v/USe+Kj+WHGQBHj+e1DPTlEjoHb4iNlWv1gG8zhbIO5DVAbhuGVafWDu4H75nIMnLrBxvTPIk3THbVc
-        7Ds9Qbcij2KDTWa4Jd6bNgdB8A1sed+Z/8S0TAAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVVBToRAEESNF/+kv+BIuPEAEgIXM4/wsnLQ
+        kx9gvRkf4oVw4AWb3XAQZ+yanXaHQcLsrlhJZao73V3TuxCCKeR5LokKZ1EUg5OJmGna/CCEuKQByhdH
+        GyRJcr2sgRA3C2/wqDeQUuoB9snkGDjK4K5Yq3NoxhxA7u9RFH3hqej7Xt3mFXElUYzT1nbOjaHBtm31
+        0xXH8WeWZS8w+Hn0/tLAzOy1ARMGXHgq+T9hLr2BHBh0XafEwys1VLp4b3bQds6NodHbNM20QVVVqq5r
+        iVtgVZy2tnNuDI3esizHBktysMGctnNuPKX/ZwMtDKCnbmTn3HhKY6BO2OQiX7hDWeNtxodlTYmRCeiL
+        33qJPXFlfpgxUMR4fvtQTw6RY+C2+EiZVj/YBnM422BuA9SGYXhlWv3gbuC+uRwDp26wMf2zSNN0Ry0X
+        +05P0K3Io9hgkxluifemzUEQfAOjsN87/RDFYwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnFitWidth.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -154,87 +154,87 @@
  <data name="btnMouseMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AGVRqPQIDMjVH4AnWRV
-        GhEh7IwoFIRGIqLTULIkmLsRHwUNCZGlUEtQ0hESwnXPeDeZuGfNrCd5cjP3vefM7uxOphx9ffkqxy/0
-        u4EKvZy6b8qufniB0nP5K401ujb7mOMczks0mbbR/QYnp85Q9Nut01trD+I8clLxN+ZT7bGS3vkjPbtR
-        jFY2R04qyuNNKpeF4fPbuwZY2TzS5KWK4/nhMg0a47B5pMlLFceZUBc0aIzD5hB5qeI4Y+qJBWEcNofI
-        SxXHy6pPFoRx2DzS5KXKpnP6uJqGjN1TBX19+6RfzA+MFdfsHJQ6m9bByxoWiJtbPaf7JTuNUmdTusFB
-        8eFfFi7uoptInQ37BngU2cUT7a+d65n1op7fvIpWXGOfPSqps0nziNIodTbN0/laFqhUqbPpGd6rY4FK
-        lTqbn7/pyhcLpXflS+o4f73JaUx8k51AHbJgWpGXKo7rh0MsmFbkpYrTMbFT3x6oRxZOEjnkpao8rr87
-        wAqSRE4qknF9tcRKyonzEk2PG4TjLSPbb6ywJOY4J5HK6ZoqNDpBuGDKboyvMW+wj7kcJWQy3xcBuJab
-        Sv3YAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AGNSqPQIDMjVH4AnaDS
+        iAhhZ0ShIDQSEZWKkiXB3I34KGhIiCyFWoKSjpAQrnvGu8nEPWtmPcmTm7nvPWd2Z3cypejpyVU4fr7X
+        DVToZdV9Q//qhxcoPZe70lija7OPOc7hvESTaRndr3Oy6gxFv906vbX2IM4jJxV/Yz7VHivpnj/SsxuF
+        aGVz5KSiNN6kclkYPr+9a4CVzSNNXqo4nh8u06AxDptHmrxUcZwJdUGDxjhsDpGXKo4zpp5YEMZhc4i8
+        VHG8PvXJgjAOm0eavFTZtE8fV9KQsXMqr69vn/SL+YGx4pqdg1Jn0zx4WcUCcbOr53S/aLtR6myKNzgo
+        PPzL/MVddBOps2HfAI+if/FE+2vnema9oOc3r6IV19hnj0rqbNI8ojRKnU3jdK6aBcpV6my6hvdqWKBc
+        pc7m52+68sVC6V35kjrOX29yGhPfZCdQhyyYVuSliuP64RALphV5qeK0TezUtgbqkYWTRA55qSqN6+8O
+        sIIkkZOKZFxfLbGSUuK8RNPjBuF408j2GyssijnOSaR8Oqby9U4QLpiyG+NrzBvsYy5HCZnMN/I6uJAB
+        Y+kDAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="btnFirstPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIB68iRVHE
-        W8++kt0iUsQi+hM8eRfFZreI4ME/IAqK+h8En1efmXSiyyaNSWn1gyGTeXzfzpAsaQdGS94Auq0FEFMm
-        tql78IwhQiwuP1UbnN99xVRq2Euij3KxZXDxFPJgihDKNj7AIAjPLAJm6ajfZGLT733RebCkOQEgpkxW
-        hpl4VHtVH0uzrcjktR4gthb2H/Q+3bAl3QQji8e91PXWDVbfsVrfyMfWZIHgxFyuUebd63WpBSCgWihg
-        cbFqLVfv9HxaC8gBkVOMi3fYcSSuvavxOB/pYwQSfPX9t3qk/wMBCLTDkP4fJhji8s2/Uy71eFZD+vj/
-        YIyddBtMThiOOLd45fv0al34bOQjfbwApkihsNfpX7+T/o92odelFoCAanFXhV0+7bJ5rZBlddiaPEEE
-        5XKHf+9PGSsg9LO6sFf1sSOjAAImMl05bbrVK7VX9bE03YoaIV88y1mumDG4d6PzYElzE+gIPgZHzlJX
-        XIerw1RrkS/u5Gwu5kzn8BZD7QGsru4R8gWfFS0VPudnjwAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmI4FkkKIp4
+        69lXs1tEgg9Ef4In76LY7BYRPPgHREFR/4Pg8+ozk0502aY1KY1+MGQyj+/bGZIlWWC45Peh21oAMWVi
+        m7oHzxgixOLyU7X+2d1XTCWGvSB6KBdbBhdPEQ+mCKFs7QMMgvBMI2CWjnpNJjaD3hedB0uaEwBiyuTG
+        IBOPaq/qY2m6FZm80gXE1tz+g96nG7Ykm2Bo/ribuv6qwao7Vuvr+djaWCA8MZcrlPn3el1iAQioFglY
+        XCxbi+U7PZ/UQnJAzSlGxTvsuCauvavxOB/pYwQa+Or7b/VI/wcCEMjCkP4fJhjg8i24Uy71eFpD+vj/
+        YISddBpMjhlFcW7x9e/Tq3XRs56P9PECmCKOs9ceXL/jwY92odclFoCAanFXhe2ddti84qRZHbY2nqAG
+        ntcW3PsTxhII/awu6lV97EgpgICJTFdOmm75Su1VfSxNtqJ6yBfOcpYrpgzu3+g8WNLcBDrCj6Eop6kr
+        rqPVYaq1yBd2cjYXM2bx8BZD2QBWV/UI+QIsdSyLN+9oxwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnPreviousPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g
-        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW/+BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
-        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yx9dj0
-        F9kAiiwIDV3FbFuxKdymdPMpO8/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
-        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qWsCS1MRgC0DAI3cbu33Fplib
+        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW/6BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
+        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxdd/0
+        F9kAiiwIDV3FbFuxKdymdPMpO4/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
+        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qmsGS1MRgC0DAI3cbu33Fplib
        sg2X8bkImY9LDTIbajwCAMsTFpvKTQHAjHQEpJBSDDUWO7Ar3eBoXb5xh3z8/N8wFyG7EEbjY0ONwg/s
        yjcY2pRtXGGbteknsgFUswAGgEWFum355qn6+eu/gwwhBkO1kgZsq7ZLgkpRu4qNb7G5GpkN1UIesKnY
        ImhbtrESVA/QxAIYABUvoLxkV7LhLshwZAxVQh0ASuK2pZujgbXbWar6AAMAi3ig672sSzcdhIrQCvxn
-        ZGBgYAAA+36Jhi0FcugAAAAASUVORK5CYII=
+        ZGBgYAAAFXGJG9oJLr4AAAAASUVORK5CYII=
 </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+zmgUtQBtuXN/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
-        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMY9Nf23L
-        N+yxr9jiQlQSB2kkC3tu/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
-        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHLP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
+        FZv/Q/EN2/JNKfb1+zmgUtQBtuVN/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
+        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMfdNf23L
+        N+yxr9jiQlQSB2kkC3ts/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
+        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHzP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
        YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam
        nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2
-        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAv7+J
-        hvKjV0wAAAAASUVORK5CYII=
+        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAzT+J
+        GzCOALMAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="btnLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFxSURBVEhLY4ABp8qN4lAmbYBt2dqPtuWbOmlmkV3F5v8g
-        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF58z+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
+        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF50z+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
        27x803vb8s0txFiE1wKQIF5csOYd2KKKLYJQLRiA1CDCYINo63JgHJVtbLQo3CEE1QoHZAURMhtZzLZ8
-        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOPLY9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
-        Ja2KzX/QxaHGk+uDln/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
-        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggavlnW7bp
-        qm3p5mjkyCMW4PWBTen66/YVm2KN02YS7WKSAClBQTxgYAAARistFZO7C1wAAAAASUVORK5CYII=
+        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOHLf9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
+        Ja2KzX/QxaHGk+uD5n/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
+        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggav5nW7bp
+        qm3p5mjkyCMW4PWBTen66/YVm2KN02YS7WKSAClBQTxgYAAA1qQsi7HTS0QAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="btnZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
 </value>
  </data>
  <data name="btnZoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -307,19 +307,19 @@
  <data name="btnSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
 </value>
  </data>
  <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@ -85,6 +85,7 @@ Public Class DocumentViewer
        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter

        _logger.Info("Loading File {0}", filepath)
+
        DoLoadFile(filepath)

        If _view_only Then
@ -113,10 +114,10 @@ Public Class DocumentViewer
    Private Sub DoLoadFile(FilePath As String)
        Try
            Dim oFileInfo = New IO.FileInfo(FilePath)
-            Dim oExtension As String = oFileInfo.Extension
+            Dim oExtension As String = oFileInfo.Extension.ToUpper

-            Select Case oExtension.ToLower
-                Case ".msg"
+            Select Case oExtension.ToUpper
+                Case ".MSG"
                    Dim oMsg As New Independentsoft.Msg.Message(FilePath)
                    ' TODO: Improve Encoding, maybe convert based on encoding
                    oMsg.Encoding = System.Text.Encoding.UTF32
@ -130,7 +131,7 @@ Public Class DocumentViewer

                    RichEditControl1.Visible = True
                    RichEditControl1.Dock = DockStyle.Fill
-                Case ".eml"
+                Case ".EML"
                    RichEditControl1.LoadDocument(FilePath, DevExpress.XtraRichEdit.DocumentFormat.Mht)

                    RichEditControl1.Visible = True
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@ -63,9 +63,8 @@
    <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="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\14_11_19_MIME_UTF_ENCODING\Independentsoft.Msg.dll</HintPath>
+    <Reference Include="Independentsoft.Msg.2.0.570.21482">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
--- a/Controls.DocumentViewer/My
+++ b/Controls.DocumentViewer/My
@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>

 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.1")>
--- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
+++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
@ -43,18 +43,18 @@
    <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.XtraEditors.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" />
+    <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">
--- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj.bak
+++ b/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>
--- a/GUIs.ClipboardWatcher/My
+++ b/GUIs.ClipboardWatcher/My
@ -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
--- a/Project/licenses.licx.bak
+++ b/Project/licenses.licx.bak
@ -0,0 +1 @@
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.ClipboardWatcher/frmMatch.vb
+++ b/GUIs.ClipboardWatcher/frmMatch.vb
@ -55,13 +55,6 @@ Public Class frmMatch
        _Params = Params
    End Sub

-    Public Sub ShowTreeView()
-        Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With {
-            .StartPosition = FormStartPosition.CenterScreen
-        }
-        oForm.ShowDialog()
-    End Sub
-
    Private Async Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Dim oCreatedTiles = CreateTiles()

@ -205,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
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@ -43,17 +43,17 @@
    <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="DevExpress.Data.v19.2, Version=19.2.3.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.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.XtraBars.v19.2, Version=19.2.3.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.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, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.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.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>
--- a/GUIs.Common/Common.vbproj.bak
+++ b/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>
--- a/Project/licenses.licx
+++ b/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
--- a/Project/licenses.licx.bak
+++ b/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
--- a/GUIs.Test.DocumentViewerTest/Form1.Designer.vb
+++ b/GUIs.Test.DocumentViewerTest/Form1.Designer.vb
@ -27,6 +27,7 @@ Partial Class Form1
        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
@ -67,11 +68,21 @@ Partial Class Form1
        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)
@ -87,4 +98,5 @@ Partial Class Form1
    Friend WithEvents Button1 As Button
    Friend WithEvents Button2 As Button
    Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
 End Class
--- a/GUIs.Test.DocumentViewerTest/Form1.vb
+++ b/GUIs.Test.DocumentViewerTest/Form1.vb
@ -1,4 +1,5 @@
 Imports DigitalData.Modules.Logging
+Imports GdPicture14

 Public Class Form1
    Private oSubform As Form3
@ -35,4 +36,44 @@ Public Class Form1
            MsgBox(ex.Message)
        End Try
    End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        Using oGdPicturePDF As GdPicturePDF = New GdPicturePDF()
+            If oGdPicturePDF.LoadFromFile(TextBox1.Text, False) = GdPictureStatus.OK Then
+                Dim embeddedFileCount As Integer = oGdPicturePDF.GetEmbeddedFileCount()
+                If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                    If embeddedFileCount > 0 Then
+                        Dim FileName As String = oGdPicturePDF.GetEmbeddedFileName(0)
+                        If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                            Dim FileSize As Integer = oGdPicturePDF.GetEmbeddedFileSize(0)
+                            If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                                Dim FileData As Byte() = New Byte(FileSize) {}
+                                Dim status As GdPictureStatus = oGdPicturePDF.ExtractEmbeddedFile(0, FileData)
+                                If status = GdPictureStatus.OK Then
+                                    MessageBox.Show("The content of the first embedded file has been extracted successfully.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                                    Dim oFileStream As System.IO.FileStream = Nothing
+                                    oFileStream = New System.IO.FileStream(FileName + "_content.dat", System.IO.FileMode.Create)
+                                    oFileStream.Write(FileData, 0, FileData.Length)
+                                    oFileStream.Close()
+                                    MessageBox.Show("The content of the embedded file has been saved successfully.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                                Else
+                                    MessageBox.Show("The embedded file has failed to extract. Status: " + status.ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                                End If
+                            Else
+                                MessageBox.Show("An error occurred getting the file size. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                            End If
+                        Else
+                            MessageBox.Show("An error occurred getting the file name. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                        End If
+                    Else
+                        MessageBox.Show("This PDF file does not contain embedded files.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                    End If
+                Else
+                    MessageBox.Show("An error occurred getting the number of embedded files. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                End If
+            Else
+                MessageBox.Show("The file can't be loaded.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+            End If
+        End Using
+    End Sub
 End Class
--- a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj
+++ b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj
@ -50,9 +50,8 @@
    <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="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\14_11_19_MIME_UTF_ENCODING\Independentsoft.Msg.dll</HintPath>
+    <Reference Include="Independentsoft.Msg.2.0.570.21482">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@ -1,9 +0,0 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.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.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.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.XtraEditors.CheckEdit, DevExpress.XtraEditors.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.XtraEditors.PictureEdit, DevExpress.XtraEditors.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
--- a/Project/licenses.licx.bak
+++ b/Project/licenses.licx.bak
@ -0,0 +1,9 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.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.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.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.XtraEditors.CheckEdit, DevExpress.XtraEditors.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.XtraEditors.PictureEdit, DevExpress.XtraEditors.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
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@ -43,17 +43,17 @@
    <StartupObject>DigitalData.GUIs.ZooFlow.My.MyApplication</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DevExpress.BonusSkins.v18.1" />
-    <Reference Include="DevExpress.Data.v18.1" />
-    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v18.1.Core" />
-    <Reference Include="DevExpress.Utils.v18.1" />
-    <Reference Include="DevExpress.XtraBars.v18.1" />
-    <Reference Include="DevExpress.Sparkline.v18.1.Core" />
-    <Reference Include="DevExpress.XtraEditors.v18.1" />
-    <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" />
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.BonusSkins.v19.2" />
+    <Reference Include="DevExpress.Data.v19.2" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v19.2.Core" />
+    <Reference Include="DevExpress.Utils.v19.2" />
+    <Reference Include="DevExpress.XtraBars.v19.2" />
+    <Reference Include="DevExpress.Sparkline.v19.2.Core" />
+    <Reference Include="DevExpress.XtraEditors.v19.2" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <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>
--- a/GUIs.ZooFlow/ZooFlow.vbproj.bak
+++ b/GUIs.ZooFlow/ZooFlow.vbproj.bak
@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D0FB36EB-783D-40E1-B71E-A0B84B2FE567}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>DigitalData.GUIs.ZooFlow</RootNamespace>
+    <AssemblyName>DigitalData.GUIs.ZooFlow</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <StartupObject>ZooFlow.Program</StartupObject>
+    <FileAlignment>512</FileAlignment>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MyType>WindowsForms</MyType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>DigitalData.GUIs.ZooFlow.My.MyApplication</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.BonusSkins.v18.1" />
+    <Reference Include="DevExpress.Data.v18.1" />
+    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v18.1.Core" />
+    <Reference Include="DevExpress.Utils.v18.1" />
+    <Reference Include="DevExpress.XtraBars.v18.1" />
+    <Reference Include="DevExpress.Sparkline.v18.1.Core" />
+    <Reference Include="DevExpress.XtraEditors.v18.1" />
+    <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" />
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <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.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
+    <Compile Include="Base\BaseClass.vb" />
+    <Compile Include="ClassClipboardWatcher.vb" />
+    <Compile Include="ClassInit.vb" />
+    <Compile Include="ClipboardWatcher\State.vb" />
+    <Compile Include="Events\OnFlowFormInteractionEvent.vb" />
+    <Compile Include="Events\OnFlowFormStateChangedEvent.vb" />
+    <Compile Include="Queries\ClassClipboardWatcherQueries.vb" />
+    <Compile Include="Queries\ClassCommonQueries.vb" />
+    <Compile Include="Config\ClassConfig.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="ClassEnvironment.vb" />
+    <Compile Include="ClassFlowForm.vb" />
+    <Compile Include="ClassInitLoader.vb" />
+    <Compile Include="Config\ClassUIConfig.vb" />
+    <Compile Include="frmConfigDatabase.Designer.vb">
+      <DependentUpon>frmConfigDatabase.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmConfigDatabase.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAdmin.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAdmin.Designer.vb">
+      <DependentUpon>frmAdmin.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFlowForm.Designer.vb">
+      <DependentUpon>frmFlowForm.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFlowForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSettings.Designer.vb">
+      <DependentUpon>frmSettings.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSettings.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="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="MyApplication.vb" />
+    <Compile Include="Queries\ClassQueries.vb" />
+    <EmbeddedResource Include="frmConfigDatabase.resx">
+      <DependentUpon>frmConfigDatabase.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmAdmin.resx">
+      <DependentUpon>frmAdmin.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmFlowForm.resx">
+      <DependentUpon>frmFlowForm.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSettings.resx">
+      <DependentUpon>frmSettings.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSplash.resx">
+      <DependentUpon>frmSplash.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>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="My Project\DataSources\ZooFlow.State.ClassUserState.datasource" />
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GUIs.ClipboardWatcher\ClipboardWatcher.vbproj">
+      <Project>{b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e}</Project>
+      <Name>ClipboardWatcher</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Config\Config.vbproj">
+      <Project>{44982F9B-6116-44E2-85D0-F39650B1EF99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.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>
+    <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>
+  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\CW_GEFUNDEN_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CW_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GLOBIX_GEFUNDEN_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GLOBIX_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZOOFLOW_Home_klein.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/Modules.Config/ConfigManager.vb
+++ b/Modules.Config/ConfigManager.vb
@ -32,7 +32,7 @@ Public Class ConfigManager(Of T)
        GetType(GlobalSettingAttribute)
    }

-    Private _ForceUserConfig As Boolean = False
+    Private _WriteAllValuesToUserConfig As Boolean = False

    ''' <summary>
    ''' Returns the currently loaded config object
@ -74,7 +74,7 @@ Public Class ConfigManager(Of T)
    ''' <param name="ComputerConfigPath">The path to check for a computer config file, eg. ProgramData (Usually Application.CommonAppDataPath)</param>
    ''' <param name="ApplicationStartupPath">The path to check for a third config file. This is useful when running the Application in an environment where AppData/ProgramData directories are not available</param>
    ''' <param name="ForceUserConfig">Override values from ComputerConfig with UserConfig</param>
-    Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, ApplicationStartupPath As String, Optional ForceUserConfig As Boolean = False)
+    Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, Optional ApplicationStartupPath As String = "", Optional ForceUserConfig As Boolean = False)
        _LogConfig = LogConfig
        _Logger = LogConfig.GetLogger()
        _File = New Filesystem.File(_LogConfig)
@ -84,13 +84,17 @@ Public Class ConfigManager(Of T)
        _Serializer = New XmlSerializer(_BlueprintType)

        _UserDirectory = _File.CreateDirectory(UserConfigPath)
-        _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
-        _AppConfigDirectory = _File.CreateDirectory(ApplicationStartupPath)
-        _ForceUserConfig = ForceUserConfig
-
        _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)
+
+        _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
        _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
-        _AppConfigPath = Path.Combine(_AppConfigDirectory, APP_CONFIG_NAME)
+
+        If ApplicationStartupPath <> String.Empty Then
+            _AppConfigDirectory = _File.CreateDirectory(ApplicationStartupPath)
+            _AppConfigPath = Path.Combine(_AppConfigDirectory, APP_CONFIG_NAME)
+        End If
+
+        _WriteAllValuesToUserConfig = ForceUserConfig

        Config = LoadConfig()
    End Sub
@ -100,8 +104,8 @@ Public Class ConfigManager(Of T)
    ''' </summary>
    ''' <param name="LogConfig">LogConfig instance</param>
    ''' <param name="ConfigPath">The path to check for a user config file, eg. AppData (Usually Application.UserAppDataPath or Application.LocalUserAppDataPath)</param>
-    Public Sub New(LogConfig As LogConfig, ConfigPath As String, ApplicationStartupPath As String)
-        MyClass.New(LogConfig, ConfigPath, ConfigPath, ApplicationStartupPath, ForceUserConfig:=True)
+    Public Sub New(LogConfig As LogConfig, ConfigPath As String)
+        MyClass.New(LogConfig, ConfigPath, String.Empty, String.Empty, ForceUserConfig:=True)
    End Sub

    ''' <summary>
@ -168,14 +172,10 @@ Public Class ConfigManager(Of T)
        Dim oConfig = Activator.CreateInstance(_BlueprintType)

        ' try to load the special app config
-        ' returns nothing if app was not found or could not be loaded
        oConfig = LoadAppConfig(oConfig)

-        If oConfig Is Nothing Then
-            oConfig = Activator.CreateInstance(_BlueprintType)
-            ' then Try to load computer config
-            oConfig = LoadComputerConfig(oConfig)
-        End If
+        ' try to load the computer config
+        oConfig = LoadComputerConfig(oConfig)

        ' now try to load userconfig
        oConfig = LoadUserConfig(oConfig)
@ -183,19 +183,18 @@ Public Class ConfigManager(Of T)
    End Function

    Private Function LoadAppConfig(ByVal Config As T) As T
-        If File.Exists(_AppConfigPath) Then
+        If Not String.IsNullOrEmpty(_AppConfigPath) AndAlso File.Exists(_AppConfigPath) Then
            Try
                Dim oAppConfig = ReadFromFile(_AppConfigPath)
                CopyValues(oAppConfig, Config)
            Catch ex As Exception
                _Logger.Error(ex)
                _Logger.Warn("ApplicationConfig could not be loaded!")
-                Return Nothing
            End Try
+            _WriteAllValuesToUserConfig = False
        Else
            _Logger.Debug("ApplicationConfig does not exist.")
-            _ForceUserConfig = True
-            Return Nothing
+            _WriteAllValuesToUserConfig = True
        End If

        Return Config
@ -210,9 +209,10 @@ Public Class ConfigManager(Of T)
                _Logger.Error(ex)
                _Logger.Warn("Computer config could not be loaded!")
            End Try
+            _WriteAllValuesToUserConfig = False
        Else
            _Logger.Debug("Computer config does not exist.")
-            _ForceUserConfig = True
+            _WriteAllValuesToUserConfig = True
        End If

        Return Config
@ -228,7 +228,7 @@ Public Class ConfigManager(Of T)
                    Dim oExcludedAttributes As New List(Of Type)

                    ' Copy values from user config to final config
-                    If _ForceUserConfig Then
+                    If _WriteAllValuesToUserConfig Then
                        CopyValues(oUserConfig, Config, New List(Of Type))
                    Else
                        CopyValues(oUserConfig, Config, _ExcludedAttributes)
@ -285,7 +285,7 @@ Public Class ConfigManager(Of T)

            ' If config was loaded from computer config, 
            ' DO NOT save connection string, etc. to user config
-            If _ForceUserConfig = False And ForceAll = False Then
+            If _WriteAllValuesToUserConfig = False And ForceAll = False Then
                Data = FilterValues(Data, _ExcludedAttributes)
            End If

--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("0.0.6.0")>
+<Assembly: AssemblyVersion("0.0.7.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb
+++ b/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb
@ -0,0 +1,9 @@
+Public Class PDFAttachments
+    Public Sub New(GdPictureKey As String)
+
+    End Sub
+
+    Public Shared Function Extract(FileName As String)
+        Using oGDPicturePDF As New GDPicturePDF
+    End Function
+End Class
--- a/Modules.Jobs/Jobs.vbproj
+++ b/Modules.Jobs/Jobs.vbproj
@ -88,6 +88,7 @@
    <Compile Include="EDMI\GraphQL\GraphQLJob.vb" />
    <Compile Include="EDMI\ZUGFeRD\EmailData.vb" />
    <Compile Include="EDMI\ZUGFeRD\ImportZUGFeRDFiles.vb" />
+    <Compile Include="EDMI\ZUGFeRD\PDFAttachments.vb" />
    <Compile Include="EDMI\ZUGFeRD\PropertyValues.vb" />
    <Compile Include="EDMI\ZUGFeRD\WorkerArgs.vb" />
    <Compile Include="EDMI\ZUGFeRD\XmlItemProperty.vb" />
				`@ -0,0 +1 @@`
				`DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`