Merge branch 'master' of http://dd-vmp07-com04:3000/JenneJ/RecordOrganizer

2023-09-14 15:07:30 +02:00 · 2023-09-14 15:07:30 +02:00 · 77547b5e61
commit 77547b5e61
parent 051ee6421e 52d3d3d1b9
9 changed files with 193 additions and 17 deletions
--- a/app/DD-Record-Organizer/MailLicense.xml
+++ b/app/DD-Record-Organizer/MailLicense.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<License>
+  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
+  <ProductName>Mail.dll</ProductName>
+  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
+  <RegisteredTo>Digital Data GmbH</RegisteredTo>
+  <LicenseType>single developer</LicenseType>
+  <BuyerName>Digital Data GmbH</BuyerName>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
+  </Signature>
+</License>
--- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
@ -198,5 +198,5 @@ Module ModuleRuntimeVariables
    Public SQL_DOC_RESULT_RECORD As String = ""

    Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable
-    Public MYDB_ECM As MSSQLServer
+    Public Property MYDB_ECM As MSSQLServer
 End Module
--- a/app/DD-Record-Organizer/My
+++ b/app/DD-Record-Organizer/My
@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("OrgFlow")>
 <Assembly: AssemblyCopyright("Copyright 2023 Digital Data")>
-<Assembly: AssemblyTrademark("3.0.0.1")>
+<Assembly: AssemblyTrademark("3.0.0.5")>

 <Assembly: ComVisible(False)> 

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.0.0.1")>
+<Assembly: AssemblyVersion("3.0.0.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

 <Assembly: NeutralResourcesLanguageAttribute("")> 
--- a/app/DD-Record-Organizer/OrgFlow.vbproj
+++ b/app/DD-Record-Organizer/OrgFlow.vbproj
@ -169,6 +169,9 @@
    <Reference Include="DevExpress.XtraWizard.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
    <Reference Include="DigitalData.Modules.Base">
      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
@ -1602,6 +1605,9 @@
    <None Include="Resources\base_globe_32.png" />
    <None Include="Resources\1480524473_1.png" />
    <None Include="Resources\arrow_open_16xLG.png" />
+    <None Include="MailLicense.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
    <Content Include="ORGFLOW_Icon_16x16.ico" />
    <Content Include="ORGFLOW_Icon_256x256.ico" />
    <Content Include="Resources\cube.ico" />
--- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb
@ -41,7 +41,9 @@ Partial Class frmNodeNavigation
        Me.bbtnitmReloadView = New DevExpress.XtraBars.BarButtonItem()
        Me.BbtnitmNodeReorder = New DevExpress.XtraBars.BarButtonItem()
        Me.bbtnItm_TV_Collape_Expand = New DevExpress.XtraBars.BarButtonItem()
+        Me.checkShowPreview = New DevExpress.XtraBars.BarCheckItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroupView = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -80,6 +82,8 @@ Partial Class frmNodeNavigation
        Me.tsmiFileDelete = New System.Windows.Forms.ToolStripMenuItem()
        Me.TimerFileHandle = New System.Windows.Forms.Timer(Me.components)
        Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components)
+        Me.SplitContainerDocView = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.DocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer()
        CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -97,14 +101,20 @@ Partial Class frmNodeNavigation
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.cmsResultFilesBasic.SuspendLayout()
        Me.cmsResultFileDetail.SuspendLayout()
+        CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerDocView.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerDocView.Panel1.SuspendLayout()
+        CType(Me.SplitContainerDocView.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerDocView.Panel2.SuspendLayout()
+        Me.SplitContainerDocView.SuspendLayout()
        Me.SuspendLayout()
        '
        'ribbonNodeNavigation
        '
        Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0
-        Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand})
+        Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview})
        Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0)
-        Me.ribbonNodeNavigation.MaxItemId = 18
+        Me.ribbonNodeNavigation.MaxItemId = 19
        Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation"
        Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.ribbonNodeNavigation.PopupMenuAlignment = DevExpress.XtraBars.PopupMenuAlignment.Left
@ -225,12 +235,26 @@ Partial Class frmNodeNavigation
        Me.bbtnItm_TV_Collape_Expand.ImageOptions.SvgImage = CType(resources.GetObject("bbtnItm_TV_Collape_Expand.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.bbtnItm_TV_Collape_Expand.Name = "bbtnItm_TV_Collape_Expand"
        '
+        'checkShowPreview
+        '
+        Me.checkShowPreview.Caption = "Vorschau anzeigen"
+        Me.checkShowPreview.Id = 18
+        Me.checkShowPreview.ImageOptions.SvgImage = CType(resources.GetObject("checkShowPreview.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.checkShowPreview.Name = "checkShowPreview"
+        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup1, Me.RPGNodes})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupView, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup1, Me.RPGNodes})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Node Navigation"
        '
+        'RibbonPageGroupView
+        '
+        Me.RibbonPageGroupView.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupView.ItemLinks.Add(Me.checkShowPreview)
+        Me.RibbonPageGroupView.Name = "RibbonPageGroupView"
+        Me.RibbonPageGroupView.Text = "Ansicht"
+        '
        'RibbonPageGroupRecord
        '
        Me.RibbonPageGroupRecord.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
@ -284,7 +308,7 @@ Partial Class frmNodeNavigation
        'SplitContainerMain
        '
        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 158)
+        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0)
        Me.SplitContainerMain.Name = "SplitContainerMain"
        '
        'SplitContainerMain.Panel1
@ -296,8 +320,8 @@ Partial Class frmNodeNavigation
        '
        Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainer1)
        Me.SplitContainerMain.Panel2.Text = "Panel2"
-        Me.SplitContainerMain.Size = New System.Drawing.Size(1307, 664)
-        Me.SplitContainerMain.SplitterPosition = 451
+        Me.SplitContainerMain.Size = New System.Drawing.Size(1297, 664)
+        Me.SplitContainerMain.SplitterPosition = 289
        Me.SplitContainerMain.TabIndex = 2
        '
        'TreeListDevexpress
@ -332,7 +356,7 @@ Partial Class frmNodeNavigation
        Me.TreeListDevexpress.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.[False]
        Me.TreeListDevexpress.OptionsView.ShowVertLines = False
        Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark
-        Me.TreeListDevexpress.Size = New System.Drawing.Size(451, 664)
+        Me.TreeListDevexpress.Size = New System.Drawing.Size(289, 664)
        Me.TreeListDevexpress.StateImageList = Me.ImageCollection1
        Me.TreeListDevexpress.TabIndex = 1
        '
@ -355,8 +379,8 @@ Partial Class frmNodeNavigation
        'SplitContainer1.Panel2
        '
        Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlDocSearch)
-        Me.SplitContainer1.Size = New System.Drawing.Size(846, 664)
-        Me.SplitContainer1.SplitterDistance = 215
+        Me.SplitContainer1.Size = New System.Drawing.Size(998, 664)
+        Me.SplitContainer1.SplitterDistance = 214
        Me.SplitContainer1.TabIndex = 0
        '
        'pnlControls
@ -366,7 +390,7 @@ Partial Class frmNodeNavigation
        Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlControls.Location = New System.Drawing.Point(0, 0)
        Me.pnlControls.Name = "pnlControls"
-        Me.pnlControls.Size = New System.Drawing.Size(846, 215)
+        Me.pnlControls.Size = New System.Drawing.Size(998, 214)
        Me.pnlControls.TabIndex = 0
        '
        'GridControlDocSearch
@ -379,7 +403,7 @@ Partial Class frmNodeNavigation
        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
-        Me.GridControlDocSearch.Size = New System.Drawing.Size(846, 445)
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(998, 446)
        Me.GridControlDocSearch.TabIndex = 8
        Me.GridControlDocSearch.TabStop = False
        Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@ -562,12 +586,42 @@ Partial Class frmNodeNavigation
        '
        Me.TimerClearResultfiles.Interval = 3000
        '
+        'SplitContainerDocView
+        '
+        Me.SplitContainerDocView.Collapsed = True
+        Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158)
+        Me.SplitContainerDocView.Name = "SplitContainerDocView"
+        '
+        'SplitContainerDocView.Panel1
+        '
+        Me.SplitContainerDocView.Panel1.Controls.Add(Me.SplitContainerMain)
+        Me.SplitContainerDocView.Panel1.Text = "Panel1"
+        '
+        'SplitContainerDocView.Panel2
+        '
+        Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer)
+        Me.SplitContainerDocView.Panel2.Text = "Panel2"
+        Me.SplitContainerDocView.Size = New System.Drawing.Size(1307, 664)
+        Me.SplitContainerDocView.SplitterPosition = 969
+        Me.SplitContainerDocView.TabIndex = 0
+        '
+        'DocumentViewer
+        '
+        Me.DocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer.FileLoaded = False
+        Me.DocumentViewer.Location = New System.Drawing.Point(0, 0)
+        Me.DocumentViewer.Name = "DocumentViewer"
+        Me.DocumentViewer.Size = New System.Drawing.Size(0, 0)
+        Me.DocumentViewer.TabIndex = 0
+        '
        'frmNodeNavigation
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1307, 844)
-        Me.Controls.Add(Me.SplitContainerMain)
+        Me.Controls.Add(Me.SplitContainerDocView)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.ribbonNodeNavigation)
        Me.IconOptions.SvgImage = CType(resources.GetObject("frmNodeNavigation.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
@ -592,6 +646,12 @@ Partial Class frmNodeNavigation
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
        Me.cmsResultFilesBasic.ResumeLayout(False)
        Me.cmsResultFileDetail.ResumeLayout(False)
+        CType(Me.SplitContainerDocView.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerDocView.Panel1.ResumeLayout(False)
+        CType(Me.SplitContainerDocView.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerDocView.Panel2.ResumeLayout(False)
+        CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerDocView.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -652,4 +712,8 @@ Partial Class frmNodeNavigation
    Friend WithEvents BbtnitmNodeReorder As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RPGNodes As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents bbtnItm_TV_Collape_Expand As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents SplitContainerDocView As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents DocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
+    Friend WithEvents RibbonPageGroupView As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents checkShowPreview As DevExpress.XtraBars.BarCheckItem
 End Class
--- a/app/DD-Record-Organizer/frmNodeNavigation.resx
+++ b/app/DD-Record-Organizer/frmNodeNavigation.resx
@ -424,6 +424,28 @@
        LDEwaC00djRIOHYtNEg0VjhoNFY0aDJ2NGg0VjEweiIgY2xhc3M9IkdyZWVuIiAvPg0KICAgIDxwYXRo
        IGQ9Ik0yMSwxMmMtNSwwLTksNC05LDlzNCw5LDksOXM5LTQsOS05UzI2LDEyLDIxLDEyeiBNMjYsMjJI
        MTZ2LTJoMTBWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="checkShowPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpZXciPg0KICAgIDxwYXRoIGQ9Ik0yMS40
+        LDI4SDE4bDAsMGwwLDBIOFY0aDEydjVjMCwwLjYsMC40LDEsMSwxaDV2MTMuNGwyLDJWOWwtNy03SDdD
+        Ni40LDIsNiwyLjQsNiwzdjI2YzAsMC42LDAuNCwxLDEsMWgxNi40ICAgTDIxLjQsMjh6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE4LDE0YzMuMywwLDYsMi43LDYsNmMwLDEuMi0wLjQsMi4z
+        LTEsMy4zbDQuNiw0LjZjMC41LDAuNSwwLjUsMS4zLDAsMS43Yy0wLjUsMC41LTEuMywwLjUtMS43LDBM
+        MjEuMywyNSAgIGMtMC45LDAuNi0yLjEsMS0zLjMsMWMtMy4zLDAtNi0yLjctNi02QzEyLDE2LjcsMTQu
+        NywxNCwxOCwxNHogTTE4LDI0YzIuMiwwLDQtMS44LDQtNHMtMS44LTQtNC00cy00LDEuOC00LDRTMTUu
+        OCwyNCwxOCwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/app/DD-Record-Organizer/frmNodeNavigation.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.vb
@ -15,6 +15,7 @@ Imports System.Runtime.InteropServices
 Imports DD_LIB_Standards
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database

 Public Class frmNodeNavigation
 #Region "Laufzeitvariablen & Konstanten"
@ -93,6 +94,7 @@ Public Class frmNodeNavigation

        DocList = New ClassWindreamDocGrid(GridViewDoc_Search)
        WindowsEx = New WindowsEx(LOGCONFIG)
+
    End Sub
    Private Function Get_Splitter_Layout_Filename()
        Dim Filename As String = String.Format("{0}-{1}-SplitterLayout.xml", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_DETAIL_ID.ToString)
@ -149,6 +151,11 @@ Public Class frmNodeNavigation

        DT_VWPMO_CONSTRUCTOR_FORMS = MYDB_ECM.GetDatatable(Sql)
        CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID))
+
+        Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense)
+        DocumentViewer.Init(LOGCONFIG, oGDPictureLicenseKey)
+
+
        ' Hintergrund Bild initialisieren
        'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then
        '    WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")
@ -951,8 +958,20 @@ Public Class frmNodeNavigation
        End If
        sw.Done()
    End Sub
+
+    Private LastFindFilterText As String = ""
+
    Private Sub TreeListDevexpress_ColumnFilterChanged_1(sender As Object, e As EventArgs) Handles TreeListDevexpress.ColumnFilterChanged
        'oFilterActive = True
+        Dim oFilterText As String = TreeListDevexpress.FindFilterText
+        Dim oNode = TreeListDevexpress.FocusedNode
+
+        If LastFindFilterText <> "" And oFilterText = "" Then
+            TreeListDevexpress.FocusedNode = FocusedNode
+            TreeListDevexpress.MakeNodeVisible(FocusedNode)
+        End If
+
+        LastFindFilterText = oFilterText
    End Sub
    Private Sub LoadRecord(pRecord As Integer)
        Try
@ -1759,6 +1778,8 @@ Public Class frmNodeNavigation
        If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
            Dim omsg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
            Update_DocID_Label(True, omsg, EditState.Update)
+
+
        Else
            Update_DocID_Label(True, "DocRow not selected", EditState.None)
        End If
@ -2851,4 +2872,20 @@ Public Class frmNodeNavigation
    Private Sub bbtnitmRecSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmRecSave.ItemClick
        Save_Record()
    End Sub
+
+    Private Sub checkShowPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkShowPreview.CheckedChanged
+        SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
+    End Sub
+
+    Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged
+        Dim oSelectedDocs = ClassWindreamDocGrid.GetSelectedDocuments(GridViewDoc_Search)
+
+        If oSelectedDocs.Count = 1 Then
+            Dim oDocument As ClassWindreamDocGrid.WindreamDoc = oSelectedDocs.First()
+            Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
+            DocumentViewer.LoadFile(oPath)
+        Else
+            DocumentViewer.CloseDocument()
+        End If
+    End Sub
 End Class
--- a/app/Setup_NoUpdaterVS19/Config.wxi
+++ b/app/Setup_NoUpdaterVS19/Config.wxi
@ -5,7 +5,7 @@
  <?define Manufacturer="Digital Data"?>
  <?define Description="OrgFlow"?>
  <?define Comments="OrgFlow"?>
-  <?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
+  <?define UpgradeCode="{1ee26168-2d4a-4216-8eaa-d30f1f136817}"?>

  <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
 </Include>
--- a/app/Setup_NoUpdaterVS19/Product.wxs
+++ b/app/Setup_NoUpdaterVS19/Product.wxs
@ -143,6 +143,8 @@
 				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll"  KeyPath="no" Checksum="yes"/>
 				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll"  KeyPath="no" Checksum="yes"/>
 				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll"  KeyPath="no" Checksum="yes"/>
 			</Component>

 			<!-- DD Bibliotheken -->
@ -156,6 +158,13 @@
 			<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
 				<File Id="MSGLib" Name="Independentsoft.Msg.dll"  KeyPath="yes" />
 			</Component>
+			
+			<!-- Limilabs Bibliothek -->
+			<Component Id="Limilabs" Guid="9b90bff5-83b7-4bb3-ba1a-1a7be81a9228">
+				<File Id="Mail.dll" Name="Mail.dll"  KeyPath="yes" />
+				<File Id="MailLicense.xml" Name="MailLicense.xml"  KeyPath="no" />
+			</Component>
+			
 			<!-- MAIL.NET Bibliothek -->
 			<Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
 				<File Id="ERPConnect35" Name="ERPConnect35.dll"  KeyPath="yes" />
@ -165,13 +174,21 @@
 			<Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
 				<File Id="NLog" Name="NLog.dll"  KeyPath="yes" Checksum="yes"/>
 			</Component>
+			
+			<!-- GDPicture -->
+			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
+				<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
+				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
+				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
+				<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+			</Component>

 			<!-- DEVEXPRESS Bibliotheken -->
 			<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
 				<File Id="DevExpress.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" KeyPath="yes" />
 				<File Id="DevExpress.CodeParser.v21.2" Name="DevExpress.CodeParser.v21.2.dll"  />
-				<File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" />
 				<File Id="DevExpress.Data.Desktop.v21.2" Name="DevExpress.Data.Desktop.v21.2.dll" />
+				<File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" />
 				<File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" />
 				<File Id="DevExpress.DataAccess.v21.2.UI" Name="DevExpress.DataAccess.v21.2.UI.dll" />
 				<File Id="DevExpress.DataVisualization.v21.2.Core" Name="DevExpress.DataVisualization.v21.2.Core.dll" />
@ -187,7 +204,10 @@
 				<File Id="DevExpress.RichEdit.v21.2.Export" Name="DevExpress.RichEdit.v21.2.Export.dll" />
 				<File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" />
 				<File Id="DevExpress.SpellChecker.v21.2.Core" Name="DevExpress.SpellChecker.v21.2.Core.dll" />
+				<File Id="DevExpress.Spreadsheet.v21.2.Core" Name="DevExpress.Spreadsheet.v21.2.Core.dll" />
+				<File Id="DevExpress.TreeMap.v21.2.Core" Name="DevExpress.TreeMap.v21.2.Core.dll" />
 				<File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" />
+				<File Id="DevExpress.Utils.v21.2.UI" Name="DevExpress.Utils.v21.2.UI.dll" />
 				<File Id="DevExpress.Xpo.v21.2" Name="DevExpress.Xpo.v21.2.dll" />
 				<File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" />
 				<File Id="DevExpress.XtraCharts.v21.2" Name="DevExpress.XtraCharts.v21.2.dll" />
@ -214,7 +234,9 @@
 				<File Id="DevExpress.XtraScheduler.v21.2.Reporting" Name="DevExpress.XtraScheduler.v21.2.Reporting.dll"  />
 				<File Id="DevExpress.XtraScheduler.v21.2.Reporting.Extensions" Name="DevExpress.XtraScheduler.v21.2.Reporting.Extensions.dll"  />
 				<File Id="DevExpress.XtraSpellChecker.v21.2" Name="DevExpress.XtraSpellChecker.v21.2.dll"  />
+				<File Id="DevExpress.XtraSpreadsheet.v21.2" Name="DevExpress.XtraSpreadsheet.v21.2.dll"  />
 				<File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll"  />
+				<File Id="DevExpress.XtraTreeMap.v21.2" Name="DevExpress.XtraTreeMap.v21.2.dll"  />
 				<File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll"  />
 				<File Id="DevExpress.XtraWizard.v21.2" Name="DevExpress.XtraWizard.v21.2.dll"  />
 			</Component>
@ -289,6 +311,8 @@
 			<ComponentRef Id="WindreamLibs" />
 			<ComponentRef Id="DDLibs" />
 			<ComponentRef Id="IndependentsoftLibs" />
+			<ComponentRef Id="Limilabs" />
+			<ComponentRef Id="GDPictureLibs" />
 			<ComponentRef Id="Scheduler.Locales" />
 			<ComponentRef Id="RecordOrganizer.Locales.de" />
 			<ComponentRef Id="RecordOrganizer.Locales.en_gb" />