MS 2.7

MS DocResult ENtitySearch
Update Installer
2021-06-28 16:02:25 +02:00 · 2021-06-28 10:32:13 +02:00 · 2021-06-28 10:25:26 +02:00
16 changed files with 2143 additions and 1357 deletions
--- a/app/DD-Record-Organizer/ClassDatabase.vb
+++ b/app/DD-Record-Organizer/ClassDatabase.vb
@@ -340,7 +340,7 @@ Public Class ClassDatabase

            Dim SQLconnect As New SqlClient.SqlConnection
            Dim SQLcommand As SqlClient.SqlCommand
-            If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+            If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED And ClassProxy.MyPROXYConnectionString <> String.Empty Then
                SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
            Else
                SQLconnect.ConnectionString = connectionString
--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@@ -24,10 +24,10 @@ Partial Class frmConstructor_Main
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
+        Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode7 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
@@ -230,11 +230,12 @@ Partial Class frmConstructor_Main
        Me.RepositoryItemProgressBar2 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar()
        Me.bsitmLoadEntity = New DevExpress.XtraBars.BarStaticItem()
        Me.bsitmWFState = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupSuchen = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -392,9 +393,9 @@ Partial Class frmConstructor_Main
        'tstxtRenameNode
        '
        Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control
+        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
        Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText
        Me.tstxtRenameNode.Name = "tstxtRenameNode"
-        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
        '
        'tsmiNodeNew
        '
@@ -410,8 +411,8 @@ Partial Class frmConstructor_Main
        'tsmINewText
        '
        Me.tsmINewText.BackColor = System.Drawing.Color.Yellow
-        Me.tsmINewText.Name = "tsmINewText"
        resources.ApplyResources(Me.tsmINewText, "tsmINewText")
+        Me.tsmINewText.Name = "tsmINewText"
        '
        'ToolStripSeparator15
        '
@@ -444,12 +445,12 @@ Partial Class frmConstructor_Main
        Me.GridControlMain.AllowDrop = True
        Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
        resources.ApplyResources(Me.GridControlMain, "GridControlMain")
-        GridLevelNode1.LevelTemplate = Me.grvwGrid
-        GridLevelNode1.RelationName = "Level1"
-        GridLevelNode2.LevelTemplate = Me.grvwCarousel
-        GridLevelNode2.RelationName = "Level2"
-        GridLevelNode3.RelationName = "Level3"
-        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
+        GridLevelNode5.LevelTemplate = Me.grvwGrid
+        GridLevelNode5.RelationName = "Level1"
+        GridLevelNode6.LevelTemplate = Me.grvwCarousel
+        GridLevelNode6.RelationName = "Level2"
+        GridLevelNode7.RelationName = "Level3"
+        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5, GridLevelNode6, GridLevelNode7})
        Me.GridControlMain.MainView = Me.grvwTiles
        Me.GridControlMain.Name = "GridControlMain"
        Me.GridControlMain.TabStop = False
@@ -887,8 +888,8 @@ Partial Class frmConstructor_Main
        Me.GridControlDocSearch.AllowDrop = True
        Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFilesBasic
        resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch")
-        GridLevelNode4.RelationName = "Level1"
-        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
+        GridLevelNode1.RelationName = "Level1"
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
        Me.GridControlDocSearch.TabStop = False
@@ -1315,8 +1316,8 @@ Partial Class frmConstructor_Main
        'CMDoc_TextBoxRenameFile
        '
        Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange
-        Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
        resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
+        Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
        '
        'DisplaynameUmbenennenToolStripMenuItem
        '
@@ -1327,8 +1328,8 @@ Partial Class frmConstructor_Main
        'CMDoc_TextBoxRenameDisplay
        '
        Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange
-        Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
        resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
+        Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
        '
        'ToolStripSeparator22
        '
@@ -1511,9 +1512,9 @@ Partial Class frmConstructor_Main
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniGeodaten, Me.bbtniCopyRecord, Me.bbtniParentLink, Me.bbtniWFTask, Me.bbtniReclog, Me.bbtnitemplate, Me.bbtniclearCache, Me.bbtniNewVariant2, Me.bStaticItem1, Me.bsitmState, Me.bsitmRecord, Me.bsitmDocID, Me.BarEditItem1, Me.BarEditItem2, Me.bsitmLoadEntity, Me.bsitmWFState})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniGeodaten, Me.bbtniCopyRecord, Me.bbtniParentLink, Me.bbtniWFTask, Me.bbtniReclog, Me.bbtnitemplate, Me.bbtniclearCache, Me.bbtniNewVariant2, Me.bStaticItem1, Me.bsitmState, Me.bsitmRecord, Me.bsitmDocID, Me.BarEditItem1, Me.BarEditItem2, Me.bsitmLoadEntity, Me.bsitmWFState, Me.BarButtonItem1})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 20
+        Me.RibbonControl1.MaxItemId = 21
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemProgressBar2})
@@ -1645,9 +1646,16 @@ Partial Class frmConstructor_Main
        Me.bsitmWFState.Id = 19
        Me.bsitmWFState.Name = "bsitmWFState"
        '
+        'BarButtonItem1
+        '
+        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
+        Me.BarButtonItem1.Id = 20
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupSuchen})
        Me.RibbonPage1.Name = "RibbonPage1"
        resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
        '
@@ -1675,11 +1683,13 @@ Partial Class frmConstructor_Main
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
        '
-        'RibbonPageGroup4
+        'RibbonPageGroupSuchen
        '
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.bStaticItem1)
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
+        Me.RibbonPageGroupSuchen.Enabled = False
+        Me.RibbonPageGroupSuchen.ItemLinks.Add(Me.bStaticItem1)
+        Me.RibbonPageGroupSuchen.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroupSuchen.Name = "RibbonPageGroupSuchen"
+        resources.ApplyResources(Me.RibbonPageGroupSuchen, "RibbonPageGroupSuchen")
        '
        'RibbonStatusBar1
        '
@@ -1978,7 +1988,7 @@ Partial Class frmConstructor_Main
    Friend WithEvents bbtniNewVariant2 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents bStaticItem1 As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupSuchen As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents bsitmState As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents bsitmRecord As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents bsitmDocID As DevExpress.XtraBars.BarStaticItem
@@ -1991,4 +2001,5 @@ Partial Class frmConstructor_Main
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents ExportNachExcelToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents EntitätsweiteSucheToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -336,6 +336,8 @@ Public Class frmConstructor_Main
                    For Each Constr_row As DataRow In DT_VWPMO_CONSTRUCTOR_FORMS.Rows
                        Entity_Name = Constr_row.Item("FORM_TITLE")
                        Dim Constr_FORM = Constr_row.Item("FORM_ID")
+                        ENTITY_ID = Constr_row.Item("FORM_ID")
+                        CURRENT_ENTITY_ID = ENTITY_ID
                        Dim expression As String = String.Format("ENTITY_ID = {0}", Constr_FORM)
                        Dim matchingRows() As DataRow = DT_PROXY_ENTITY.Select(expression)
                        'Prüfen ob Form in Config Proxy vorhanden
@@ -3279,6 +3281,7 @@ Public Class frmConstructor_Main
                End If
                bStaticItem1.Caption = msg & Get_Grid_Row_Count()
            End If
+            RibbonPageGroupSuchen.Enabled = True
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in LoadGrid_Records", ex.Message, ex.StackTrace)
            Return False
@@ -3778,39 +3781,36 @@ Public Class frmConstructor_Main
        Try
            Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {ENTITY_ID}"
            CURRENT_DOCSEARCH_SQL = ClassDatabase.Execute_Scalar(oSQL, True)
-            Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
-            If USER_LANGUAGE <> "de-De" Then
-                oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
-            End If
-            MsgBox(oText, vbOKOnly, "Information")
+            If CURRENT_DOCSEARCH_SQL <> String.Empty Then
+                Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
+                If USER_LANGUAGE <> "de-De" Then
+                    oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
+                End If
+                MsgBox(oText, vbOKOnly, "Information")


-            If CURRENT_DOCSEARCH_SQL = "" Then
-                CURRENT_DOCSEARCH_SQL = $"SELECT DISTINCT T.* 
-                                FROM 
-                                TBPMO_DOCRESULT_LIST T INNER JOIN TBPMO_DOC_RECORD_LINK T1 ON T.DocID = T1.DOC_ID
-                                INNER JOIN TBPMO_RECORD T2 ON T1.RECORD_ID = T2.GUID
-                                WHERE T2.FORM_ID = {ENTITY_ID} AND T2.DELETED = 0)"
-            Else
                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", ENTITY_ID)
                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE)
                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_ECM_ID", USERID_FK_INT_ECM)
                CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_ID", USER_GUID)
-            End If


-            If USER_LANGUAGE <> "de-DE" Then
-                CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
+                If USER_LANGUAGE <> "de-DE" Then
+                    CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
+                Else
+                    CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
+                End If
+                Dim myformThread = New Thread(Sub()
+                                                  Using frm As New frmDocSearchResult
+                                                      Application.Run(frm)
+
+                                                  End Using
+                                              End Sub)
+                myformThread.Start()
            Else
-                CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
+                MsgBox("Please config the entity-search properly! " & vbNewLine & oSQL, vbOKOnly, "Information")
            End If
-            Dim myformThread = New Thread(Sub()
-                                              Using frm As New frmDocSearchResult
-                                                  Application.Run(frm)

-                                              End Using
-                                          End Sub)
-            myformThread.Start()

        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error RUN_ENTITY_DOC_SEARCH", ex.Message, ex.StackTrace)
@@ -7219,12 +7219,14 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")

    Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_Showlinks.Click
        Try
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+
+            Dim oDocID = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "DocID")
+            If IsNothing(oDocID) Then
+                MsgBox("Could not get DocID!", MsgBoxStyle.Exclamation)
                Exit Sub
            End If
-            Refresh_Selected_Table()
+            CURRENT_DOC_ID = oDocID
+
            Dim frm As New frmDoc_Links
            frm.Show()
            frm.BringToFront()
@@ -7405,4 +7407,9 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
        CURRENT_SEARCH_TYPE = "ENTITY"
        RUN_ENTITY_DOC_SEARCH()
    End Sub
+
+    Private Sub BarButtonItem1_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        CURRENT_SEARCH_TYPE = "ENTITY"
+        RUN_ENTITY_DOC_SEARCH()
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
+++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmDocSearchResult
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -23,14 +23,8 @@ Partial Class frmDocSearchResult
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult))
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripLabelCaption = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
@@ -42,72 +36,31 @@ Partial Class frmDocSearchResult
        Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator()
        Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
-        Me.StatusStrip1.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiDocID = New DevExpress.XtraBars.BarStaticItem()
+        Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStripResultFiles.SuspendLayout()
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocID})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 623)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(1083, 22)
-        Me.StatusStrip1.TabIndex = 0
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'tslblDocID
-        '
-        Me.tslblDocID.Name = "tslblDocID"
-        Me.tslblDocID.Size = New System.Drawing.Size(92, 17)
-        Me.tslblDocID.Text = "No row selected"
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25)
-        Me.ToolStrip1.TabIndex = 1
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripLabelCaption
-        '
-        Me.ToolStripLabelCaption.Name = "ToolStripLabelCaption"
-        Me.ToolStripLabelCaption.Size = New System.Drawing.Size(87, 22)
-        Me.ToolStripLabelCaption.Text = "ToolStripLabel1"
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(95, 22)
-        Me.ToolStripButton1.Text = "Aktualisieren"
-        '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
-        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(120, 22)
-        Me.ToolStripButton2.Text = "Export nach Excel"
-        Me.ToolStripButton2.ToolTipText = "Export nach Excel"
-        '
        'GridControlDocSearch
        '
        Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles
        Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
-        GridLevelNode2.RelationName = "Level1"
-        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
-        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25)
+        GridLevelNode1.RelationName = "Level1"
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
+        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 158)
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
-        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 598)
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 463)
        Me.GridControlDocSearch.TabIndex = 8
        Me.GridControlDocSearch.TabStop = False
        Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@@ -189,44 +142,98 @@ Partial Class frmDocSearchResult
        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
        '
-        'ToolStripButton3
+        'RibbonControl1
        '
-        Me.ToolStripButton3.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete
-        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(134, 22)
-        Me.ToolStripButton3.Text = "Layout zurücksetzen"
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiDocID, Me.bsiInfo})
+        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+        Me.RibbonControl1.MaxItemId = 5
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.Size = New System.Drawing.Size(1083, 158)
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Export Excel"
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "Layout zurücksetzen"
+        Me.BarButtonItem2.Id = 2
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'bsiDocID
+        '
+        Me.bsiDocID.Id = 3
+        Me.bsiDocID.Name = "bsiDocID"
+        '
+        'bsiInfo
+        '
+        Me.bsiInfo.Caption = "BarStaticItem1"
+        Me.bsiInfo.Id = 4
+        Me.bsiInfo.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True
+        Me.bsiInfo.Name = "bsiInfo"
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        Me.RibbonPage1.Text = "DocResults"
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.AllowTextClipping = False
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "Funktionen"
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 621)
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1083, 24)
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        Me.RibbonPage2.Text = "RibbonPage2"
        '
        'frmDocSearchResult
        '
+        Me.Appearance.Options.UseFont = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1083, 645)
        Me.Controls.Add(Me.GridControlDocSearch)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.StatusStrip1)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.IconOptions.Icon = CType(resources.GetObject("frmDocSearchResult.IconOptions.Icon"), System.Drawing.Icon)
        Me.Name = "frmDocSearchResult"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "frmDocSearchResult"
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ContextMenuStripResultFiles.ResumeLayout(False)
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub
-
-    Friend WithEvents StatusStrip1 As StatusStrip
-    Friend WithEvents ToolStrip1 As ToolStrip
    Friend WithEvents GridControlDocSearch As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewDoc_Search As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents tslblDocID As ToolStripStatusLabel
-    Friend WithEvents ToolStripLabelCaption As ToolStripLabel
    Friend WithEvents ContextMenuStripResultFiles As ContextMenuStrip
    Friend WithEvents docCM_Open As ToolStripMenuItem
    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
@@ -236,7 +243,13 @@ Partial Class frmDocSearchResult
    Friend WithEvents ToolStripSeparator22 As ToolStripSeparator
    Friend WithEvents docCM_PropertiesFile As ToolStripMenuItem
    Friend WithEvents ToolStripSeparator25 As ToolStripSeparator
-    Friend WithEvents ToolStripButton1 As ToolStripButton
-    Friend WithEvents ToolStripButton2 As ToolStripButton
-    Friend WithEvents ToolStripButton3 As ToolStripButton
+    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bsiDocID As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
 End Class
--- a/app/DD-Record-Organizer/frmDocSearchResult.resx
+++ b/app/DD-Record-Organizer/frmDocSearchResult.resx
@@ -117,12 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>134, 17</value>
-  </metadata>
  <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>241, 17</value>
  </metadata>
@@ -135,7 +129,47 @@
        WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC
 </value>
  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
+        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
+        MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
+        b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
+        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iUmVzZXRfUmFuZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg
+        MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9
+        CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh
+        c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI5LDJIM0MyLjUsMiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41
+        LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41LDIsMjksMnogTTI4LDEyaC0zLjJs
+        LTQsNGwyLDIgICBIMjh2MTBINFYxNGg1LjJsLTItMkg0VjRoMTJ2NGgzLjJMMjAsNy4yTDIwLjgsOEgy
+        OFYxMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxwb2x5Z29uIHBvaW50cz0iMjIsMTIgMjAs
+        MTAgMTYsMTQgMTIsMTAgMTAsMTIgMTQsMTYgMTAsMjAgMTIsMjIgMTYsMTggMjAsMjIgMjIsMjAgMTgs
+        MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="frmDocSearchResult.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA
        CACoDgAAHgsAACAgAAABAAgAqAgAAMYZAAAQEAAAAQAIAGgFAABuIgAAAAAAAAEAIAC6hAAA1icAADAw
--- a/app/DD-Record-Organizer/frmDocSearchResult.vb
+++ b/app/DD-Record-Organizer/frmDocSearchResult.vb
@@ -30,6 +30,8 @@ Public Class frmDocSearchResult
    Private Const SEE_MASK_FLAG_NO_UI = &H400
    Public Const SW_SHOW As Short = 5
    Private DT_RESULT As DataTable
+    Private SelectedDocID As Int64
+    Private SelectedFULL_FILEPATH As String
    Public Sub LoadDocSearch(reload As Boolean)
        Try
            Cursor = Cursors.WaitCursor
@@ -43,16 +45,21 @@ Public Class frmDocSearchResult
            GridViewDoc_Search.Columns.Clear()
            GridControlDocSearch.DataSource = DT_RESULT
            GridViewDoc_Search.BestFitColumns(True)
-            ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)"
+            bsiInfo.Caption = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)"
            Load_DocGrid_Layout()
            GridControlDocSearch.DataSource = DT_RESULT
            GridControlDocSearch.DataSource = DT_RESULT
+            Try
+                GridViewDoc_Search.Columns.Item("FULL_FILENAME").Visible = False
+            Catch ex As Exception
+
+            End Try
+
            'If GridViewDoc_Search.RowCount > 15000 Then
            '    ToolStripButton2.Enabled = False
            'Else
            '    ToolStripButton2.Enabled = True
            'End If
-            ToolStripButton2.Enabled = True
        Catch ex As Exception
            LOGGER.Warn("Unexpected Error in LoadDocSearch: " & ex.Message)
        End Try
@@ -61,7 +68,7 @@ Public Class frmDocSearchResult
    End Sub
    Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
        If GridViewDoc_Search.RowCount > 0 Then
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            GetDocID()
            Refresh_DocID()
        End If

@@ -69,25 +76,39 @@ Public Class frmDocSearchResult

    Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
        If GridViewDoc_Search.RowCount > 0 Then
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            GetDocID()
            Refresh_DocID()
        End If
    End Sub
    Sub Refresh_DocID()
-        If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
-            Dim msg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
-            tslblDocID.Text = msg
+        If SelectedDocID <> 0 Then
+            Dim msg = "Doc-ID: " & SelectedDocID.ToString
+            bsiDocID.Caption = msg

        Else
-            tslblDocID.Text = "DocRow not selected"
+            bsiDocID.Caption = "DocRow not selected"

        End If
    End Sub
+    Sub GetDocID()
+        Try
+            Dim oDocID = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "DocID")
+            SelectedFULL_FILEPATH = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "FULL_FILENAME")
+            If Not IsNothing(oDocID) Then
+                    SelectedDocID = oDocID
+                SelectedFULL_FILEPATH = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "FULL_FILENAME")
+            End If
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+    End Sub
+
    Sub Open_File()
        Me.Cursor = Cursors.WaitCursor
        Dim allow_Open As Boolean = False
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-        Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+        GetDocID()
+        Dim Result = ClassDOC_SEARCH.Get_File_Rights(SelectedDocID)
        If Not IsNothing(Result) Then
            Select Case Result.ToString
                Case "R"
@@ -100,14 +121,13 @@ Public Class frmDocSearchResult
            End Select
        End If
        If allow_Open = True Then
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            If IsNothing(SelectedDocID) Then
                MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
                Exit Sub
            End If
-            For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-                ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
-                If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True)
-            Next
+            ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID)
+            If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True)
+
        Else
            ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!")
        End If
@@ -119,13 +139,13 @@ Public Class frmDocSearchResult
    End Sub

    Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(SelectedFULL_FILEPATH) Then
            MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
            Exit Sub
        End If
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            ClassHelper.Open_Folder(row.Item("DOC_PATH"), row.Item("DOC_ID"))
-        Next
+
+        ClassHelper.Open_Folder(SelectedFULL_FILEPATH, SelectedDocID)
+
    End Sub

    Private Sub docCM_Copy_Click(sender As Object, e As EventArgs) Handles docCM_Copy.Click
@@ -162,29 +182,28 @@ Public Class frmDocSearchResult
    End Sub

    Private Sub docCM_PropertiesFile_Click(sender As Object, e As EventArgs) Handles docCM_PropertiesFile.Click
-
+        Show_File_Properties()
    End Sub
    Sub Show_File_Properties()
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(SelectedFULL_FILEPATH) Then
            MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
            Exit Sub
        End If
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            If row.Item("DOC_PATH") <> "" Then
-                Cursor = Cursors.WaitCursor
-                Dim sei As New SHELLEXECUTEINFO
-                sei.cbSize = Marshal.SizeOf(sei)
-                sei.lpVerb = "properties"
-                sei.lpFile = row.Item("DOC_PATH")
-                sei.nShow = SW_SHOW
-                sei.fMask = SEE_MASK_INVOKEIDLIST
-                If Not ShellExecuteEx(sei) Then
-                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
-                    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message)
-                End If
+        If SelectedFULL_FILEPATH <> "" Then
+            Cursor = Cursors.WaitCursor
+            Dim sei As New SHELLEXECUTEINFO
+            sei.cbSize = Marshal.SizeOf(sei)
+            sei.lpVerb = "properties"
+            sei.lpFile = SelectedFULL_FILEPATH
+            sei.nShow = SW_SHOW
+            sei.fMask = SEE_MASK_INVOKEIDLIST
+            If Not ShellExecuteEx(sei) Then
+                Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file properties:", ex.Message)
            End If
-            Cursor = Cursors.Default
-        Next
+        End If
+        Cursor = Cursors.Default
+
    End Sub

    Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -224,24 +243,32 @@ Public Class frmDocSearchResult
    End Sub

    Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+        GetDocID()
        Refresh_DocID()
    End Sub

    Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged
-        ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])"
-        If GridViewDoc_Search.RowCount > 12000 Then
-            ToolStripButton2.Enabled = False
-        Else
-            ToolStripButton2.Enabled = True
-        End If
+        bsiInfo.Caption = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])"
+
    End Sub

-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs)
        LoadDocSearch(False)
    End Sub

-    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
+
+
+
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Dim XMLPath = Get_DocGrid_Layout_Filename()
+        If File.Exists(XMLPath) Then
+            File.Delete(XMLPath)
+            LoadDocSearch(True)
+        End If
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
        Try
            Dim saveFileDialogDocSearchResult As New SaveFileDialog
            saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx"
@@ -267,12 +294,4 @@ Public Class frmDocSearchResult
        End Try
        Cursor = Cursors.Default
    End Sub
-
-    Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click
-        Dim XMLPath = Get_DocGrid_Layout_Filename()
-        If File.Exists(XMLPath) Then
-            File.Delete(XMLPath)
-            LoadDocSearch(True)
-        End If
-    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb
+++ b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmDoc_Links
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -23,45 +23,33 @@ Partial Class frmDoc_Links
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDoc_Links))
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.tslbl = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripButtonDelete = New System.Windows.Forms.ToolStripButton()
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.dgRecords = New DevExpress.XtraGrid.GridControl()
+        Me.GridControlRecords = New DevExpress.XtraGrid.GridControl()
        Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.ToolStrip1.SuspendLayout()
-        CType(Me.dgRecords, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarStaticItemStatus = New DevExpress.XtraBars.BarStaticItem()
+        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbl, Me.ToolStripButtonDelete})
-        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
-        Me.ToolStrip1.Name = "ToolStrip1"
-        '
-        'tslbl
-        '
-        resources.ApplyResources(Me.tslbl, "tslbl")
-        Me.tslbl.Name = "tslbl"
-        '
-        'ToolStripButtonDelete
-        '
-        Me.ToolStripButtonDelete.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete
-        resources.ApplyResources(Me.ToolStripButtonDelete, "ToolStripButtonDelete")
-        Me.ToolStripButtonDelete.Name = "ToolStripButtonDelete"
-        '
        'StatusStrip1
        '
        resources.ApplyResources(Me.StatusStrip1, "StatusStrip1")
        Me.StatusStrip1.Name = "StatusStrip1"
        '
-        'dgRecords
+        'GridControlRecords
        '
-        resources.ApplyResources(Me.dgRecords, "dgRecords")
-        Me.dgRecords.MainView = Me.grvwGrid
-        Me.dgRecords.Name = "dgRecords"
-        Me.dgRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid})
+        resources.ApplyResources(Me.GridControlRecords, "GridControlRecords")
+        Me.GridControlRecords.MainView = Me.grvwGrid
+        Me.GridControlRecords.Name = "GridControlRecords"
+        Me.GridControlRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid})
        '
        'grvwGrid
        '
@@ -74,7 +62,7 @@ Partial Class frmDoc_Links
        Me.grvwGrid.Appearance.SelectedRow.BackColor = System.Drawing.Color.Yellow
        Me.grvwGrid.Appearance.SelectedRow.Options.UseBackColor = True
        Me.grvwGrid.Appearance.SelectedRow.Options.UseForeColor = True
-        Me.grvwGrid.GridControl = Me.dgRecords
+        Me.grvwGrid.GridControl = Me.GridControlRecords
        Me.grvwGrid.Name = "grvwGrid"
        Me.grvwGrid.OptionsBehavior.Editable = False
        Me.grvwGrid.OptionsBehavior.ReadOnly = True
@@ -89,27 +77,91 @@ Partial Class frmDoc_Links
        Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True
        Me.grvwGrid.OptionsView.ShowAutoFilterRow = True
        '
+        'RibbonControl1
+        '
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarStaticItemStatus, Me.BarButtonItem2})
+        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
+        Me.RibbonControl1.MaxItemId = 4
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'BarButtonItem1
+        '
+        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarStaticItemStatus
+        '
+        Me.BarStaticItemStatus.Id = 2
+        Me.BarStaticItemStatus.ItemAppearance.Normal.Font = CType(resources.GetObject("BarStaticItemStatus.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.BarStaticItemStatus.ItemAppearance.Normal.Options.UseFont = True
+        Me.BarStaticItemStatus.Name = "BarStaticItemStatus"
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemStatus)
+        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
+        '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 3
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
        'frmDoc_Links
        '
        resources.ApplyResources(Me, "$this")
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.dgRecords)
+        Me.Controls.Add(Me.GridControlRecords)
        Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(Me.ToolStrip1)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.Icon = CType(resources.GetObject("frmDoc_Links.IconOptions.Icon"), System.Drawing.Icon)
        Me.Name = "frmDoc_Links"
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        CType(Me.dgRecords, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
+        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub
-
-    Friend WithEvents ToolStrip1 As ToolStrip
    Friend WithEvents StatusStrip1 As StatusStrip
-    Friend WithEvents dgRecords As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridControlRecords As DevExpress.XtraGrid.GridControl
    Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents ToolStripButtonDelete As ToolStripButton
-    Friend WithEvents tslbl As ToolStripLabel
+    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarStaticItemStatus As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/app/DD-Record-Organizer/frmDoc_Links.resx
+++ b/app/DD-Record-Organizer/frmDoc_Links.resx
@@ -117,62 +117,17 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tslbl.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt, style=Bold, Italic</value>
-  </data>
-  <data name="tslbl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>32, 22</value>
-  </data>
-  <data name="tslbl.Text" xml:space="preserve">
-    <value>tslbl</value>
-  </data>
-  <data name="ToolStripButtonDelete.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButtonDelete.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 22</value>
-  </data>
-  <data name="ToolStripButtonDelete.Text" xml:space="preserve">
-    <value>ausgewählte Links löschen</value>
-  </data>
-  <data name="ToolStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>800, 25</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="ToolStrip1.Text" xml:space="preserve">
-    <value>ToolStrip1</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip1.Name" xml:space="preserve">
-    <value>ToolStrip1</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>124, 17</value>
  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 428</value>
+    <value>0, 404</value>
  </data>
  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>800, 22</value>
  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
@@ -192,30 +147,126 @@
    <value>1</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="dgRecords.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="GridControlRecords.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
-  <data name="dgRecords.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+  <data name="GridControlRecords.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 158</value>
  </data>
-  <data name="dgRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>800, 403</value>
+  <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 246</value>
  </data>
-  <data name="dgRecords.TabIndex" type="System.Int32, mscorlib">
+  <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
    <value>16</value>
  </data>
-  <data name="&gt;&gt;dgRecords.Name" xml:space="preserve">
-    <value>dgRecords</value>
+  <data name="&gt;&gt;GridControlRecords.Name" xml:space="preserve">
+    <value>GridControlRecords</value>
  </data>
-  <data name="&gt;&gt;dgRecords.Type" xml:space="preserve">
+  <data name="&gt;&gt;GridControlRecords.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;dgRecords.Parent" xml:space="preserve">
+  <data name="&gt;&gt;GridControlRecords.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="&gt;&gt;dgRecords.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;GridControlRecords.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
+  <data name="BarButtonItem1.Caption" xml:space="preserve">
+    <value>Ausgewählte Links löschen</value>
+  </data>
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N
+        CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu
+        NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w
+        LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt
+        MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks
+        Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44
+        LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarStaticItemStatus.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>Export Excel</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
+        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
+        MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
+        b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
+        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Aktionen</value>
+  </data>
+  <data name="RibbonPage1.Text" xml:space="preserve">
+    <value>Doc-Links</value>
+  </data>
+  <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 158</value>
+  </data>
+  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 426</value>
+  </data>
+  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 24</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
+    <value>RibbonStatusBar1</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
+    <value>RibbonControl1</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="RibbonPage2.Text" xml:space="preserve">
+    <value>RibbonPage2</value>
+  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -225,10 +276,7 @@
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>800, 450</value>
  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmDoc_Links.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAYAEBAQAAEABAAoAQAAZgAAABAQAAABAAgAaAUAAI4BAAAQEAAAAQAgAGgEAAD2BgAAICAQAAEA
        BADoAgAAXgsAACAgAAABAAgAqAgAAEYOAAAgIAAAAQAgAKgQAADuFgAAKAAAABAAAAAgAAAAAQAEAAAA
@@ -404,28 +452,52 @@
  <data name="$this.Text" xml:space="preserve">
    <value>Doc-Links</value>
  </data>
-  <data name="&gt;&gt;tslbl.Name" xml:space="preserve">
-    <value>tslbl</value>
-  </data>
-  <data name="&gt;&gt;tslbl.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStripButtonDelete.Name" xml:space="preserve">
-    <value>ToolStripButtonDelete</value>
-  </data>
-  <data name="&gt;&gt;ToolStripButtonDelete.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;grvwGrid.Name" xml:space="preserve">
    <value>grvwGrid</value>
  </data>
  <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
+    <value>BarButtonItem1</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarStaticItemStatus.Name" xml:space="preserve">
+    <value>BarStaticItemStatus</value>
+  </data>
+  <data name="&gt;&gt;BarStaticItemStatus.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
+    <value>RibbonPage1</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
+    <value>RibbonPageGroup1</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
+    <value>RibbonPage2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDoc_Links</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/app/DD-Record-Organizer/frmDoc_Links.vb
+++ b/app/DD-Record-Organizer/frmDoc_Links.vb
@@ -2,12 +2,13 @@
 Public Class frmDoc_Links
    Private Sub frmDoc_DocLinks_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
+
+            Refresh_Grid_Data()
            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
                Me.Text = $"Document-Links for file: {ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")}"
            Else
                Me.Text = $"Document-Links for file: NODOC-ID"
            End If
-            Refresh_Grid_Data()
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDoc_DocLinks_Load", ex.Message, ex.StackTrace)
        End Try
@@ -15,38 +16,51 @@ Public Class frmDoc_Links
    Sub Refresh_Grid_Data()
        Try
            Dim DT_RECORDS As DataTable
-            Dim oSql = $"select * FROM VWPMO_CUST_DOC_OBJECT_LINKS WHERE DOC_ID = {ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_ID")}"
+            Dim oSql = $"select * FROM VWPMO_CUST_DOC_OBJECT_LINKS WHERE DocID = {CURRENT_DOC_ID}"
            DT_RECORDS = clsDatabase.Return_Datatable(oSql)
+            If Not IsNothing(DT_RECORDS) Then
+                BarStaticItemStatus.Caption = $"{DT_RECORDS.Rows.Count} links for Document found!"
+                grvwGrid.Columns.Clear()
+                GridControlRecords.DataSource = DT_RECORDS
+                'grvwGrid.Columns.Item("already linked").Fixed = True
+                Try
+                    grvwGrid.Columns.Item("DocID").Visible = False
+                    grvwGrid.Columns.Item("RecordID").Visible = False
+                    grvwGrid.Columns.Item("FULL_FILENAME").Visible = False
+                    Try
+                        grvwGrid.Columns.Item("VALUE").Visible = False
+                    Catch ex1 As Exception
+                        LOGGER.Warn("Column VALUE not part of VWPMO_CUST_DOC_OBJECT_LINKS" & ex1.Message)
+                    End Try
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                End Try

-            tslbl.Text = $"{DT_RECORDS.Rows.Count} links for Document found!"
-            grvwGrid.Columns.Clear()
-            dgRecords.DataSource = DT_RECORDS
-            'grvwGrid.Columns.Item("already linked").Fixed = True
-            Try
-                grvwGrid.Columns.Item("DOC_ID").Visible = False
-                grvwGrid.Columns.Item("RECORD_ID").Visible = False
-                grvwGrid.Columns.Item("VALUE").Visible = False
-            Catch ex As Exception
+                GridControlRecords.RefreshDataSource()
+                If DT_RECORDS.Rows.Count > 10000 Then
+                    BarButtonItem2.Enabled = False
+                Else
+                    BarButtonItem2.Enabled = True
+                End If
+            Else
+                MsgBox($"Please check Your link-object-relation: {oSql}", MsgBoxStyle.Exclamation)
+            End If

-            End Try
-
-            dgRecords.RefreshDataSource()
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Sub Refresh_Grid_Data", ex.Message, ex.StackTrace)
        End Try

    End Sub

-    Private Sub ToolStripButtonDelete_Click(sender As Object, e As EventArgs) Handles ToolStripButtonDelete.Click
-        Dim selectedRows As Integer() = grvwGrid.GetSelectedRows()
-        Dim i As Integer = 0
-        For Each rowhandle As Integer In selectedRows
-            Dim oDocID = grvwGrid.GetRowCellValue(rowhandle, "DOC_ID")
-            Dim oRECORD_ID = grvwGrid.GetRowCellValue(rowhandle, "RECORD_ID")
-            If IsNothing(oDocID) Then
-                Continue For
-            End If
-            LOGGER.Debug($"RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ")
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+
+
+        Dim oDocID = grvwGrid.GetRowCellValue(grvwGrid.FocusedRowHandle, "DocID")
+        Dim oRECORD_ID = grvwGrid.GetRowCellValue(grvwGrid.FocusedRowHandle, "RecordID")
+        If IsNothing(oDocID) Then
+            Exit Sub
+        End If
+        LOGGER.Debug($"RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ")
            Try
                If ClassFileResult.Delete_ResultFile(oDocID, oRECORD_ID, 0) = True Then
                    ClassHelper.InsertEssential_Log(oDocID, "DOC-ID", $"RECORD LINK {oRECORD_ID} REMOVED FROM DOC-SEARCH")
@@ -54,7 +68,34 @@ Public Class frmDoc_Links
            Catch ex As Exception
                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace)
            End Try
-        Next
+
        Refresh_Grid_Data()
    End Sub
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Try
+            Dim saveFileDialogDocSearchResult As New SaveFileDialog
+            saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx"
+            saveFileDialogDocSearchResult.Title = "Export to Excel:"
+            saveFileDialogDocSearchResult.ShowDialog()
+            If saveFileDialogDocSearchResult.FileName <> "" Then
+                Cursor = Cursors.WaitCursor
+                GridControlRecords.MainView.ExportToXlsx(saveFileDialogDocSearchResult.FileName)
+                Dim result As MsgBoxResult
+                Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("File was created. Do You want to open excel?")
+                End If
+                result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = MsgBoxResult.Yes Then
+                    Process.Start(saveFileDialogDocSearchResult.FileName)
+                End If
+            End If
+
+        Catch ex As Exception
+            MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+        Cursor = Cursors.Default
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
+++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmGlobalSearch
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -33,17 +33,15 @@ Partial Class frmGlobalSearch
        Me.ToolStripRecords = New System.Windows.Forms.ToolStrip()
        Me.tslblRecordsResult = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.tsbtnviewDetail = New System.Windows.Forms.ToolStripButton()
        Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
        Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripMain = New System.Windows.Forms.ToolStrip()
        Me.tsbtnRefresh = New System.Windows.Forms.ToolStripButton()
        Me.Label1 = New System.Windows.Forms.Label()
@@ -55,7 +53,14 @@ Partial Class frmGlobalSearch
        Me.txtSearch = New System.Windows.Forms.TextBox()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -69,6 +74,7 @@ Partial Class frmGlobalSearch
        Me.ToolStripMain.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'SplitContainerMain
@@ -130,7 +136,7 @@ Partial Class frmGlobalSearch
        '
        'ToolStripRecords
        '
-        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.tsbtnviewDetail})
+        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1})
        resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords")
        Me.ToolStripRecords.Name = "ToolStripRecords"
        '
@@ -144,18 +150,6 @@ Partial Class frmGlobalSearch
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
-        resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        '
-        'tsbtnviewDetail
-        '
-        Me.tsbtnviewDetail.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_view_detail
-        resources.ApplyResources(Me.tsbtnviewDetail, "tsbtnviewDetail")
-        Me.tsbtnviewDetail.Name = "tsbtnviewDetail"
-        '
        'GridControlFiles
        '
        Me.GridControlFiles.ContextMenuStrip = Me.ContextMenuStrip1
@@ -187,6 +181,12 @@ Partial Class frmGlobalSearch
        Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem"
        resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem")
        '
+        'VerknüpfungenAnzeigenToolStripMenuItem
+        '
+        Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link
+        Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem"
+        resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem")
+        '
        'GridViewFiles
        '
        Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange
@@ -209,7 +209,7 @@ Partial Class frmGlobalSearch
        '
        Me.ToolStripDokumente.AllowDrop = True
        resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente")
-        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView, Me.ToolStripButton2})
+        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView})
        Me.ToolStripDokumente.Name = "ToolStripDokumente"
        '
        'tslblDocView
@@ -217,13 +217,6 @@ Partial Class frmGlobalSearch
        resources.ApplyResources(Me.tslblDocView, "tslblDocView")
        Me.tslblDocView.Name = "tslblDocView"
        '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
-        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        '
        'ToolStripMain
        '
        resources.ApplyResources(Me.ToolStripMain, "ToolStripMain")
@@ -296,11 +289,62 @@ Partial Class frmGlobalSearch
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.TabStop = False
        '
-        'VerknüpfungenAnzeigenToolStripMenuItem
+        'RibbonControl1
        '
-        Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link
-        Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem"
-        resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem")
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiInfo})
+        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
+        Me.RibbonControl1.MaxItemId = 4
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'BarButtonItem1
+        '
+        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 2
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'bsiInfo
+        '
+        Me.bsiInfo.Id = 3
+        Me.bsiInfo.ItemAppearance.Normal.Font = CType(resources.GetObject("bsiInfo.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True
+        Me.bsiInfo.Name = "bsiInfo"
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
+        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
        '
        'frmGlobalSearch
        '
@@ -308,8 +352,13 @@ Partial Class frmGlobalSearch
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.SplitContainerMain)
        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.Icon = CType(resources.GetObject("frmGlobalSearch.IconOptions.Icon"), System.Drawing.Icon)
        Me.KeyPreview = True
        Me.Name = "frmGlobalSearch"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerMain.ResumeLayout(False)
        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit()
@@ -328,7 +377,9 @@ Partial Class frmGlobalSearch
        Me.Panel1.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
+        Me.PerformLayout()

    End Sub
    Friend WithEvents ToolStripMain As System.Windows.Forms.ToolStrip
@@ -350,17 +401,22 @@ Partial Class frmGlobalSearch
    Friend WithEvents tslblDocView As System.Windows.Forms.ToolStripLabel
    Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton
    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
    Friend WithEvents cmsRecords As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents ExportExcelToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents ShowRecordToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents Panel1 As System.Windows.Forms.Panel
-    Friend WithEvents tsbtnviewDetail As System.Windows.Forms.ToolStripButton
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents DateiÖffnenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
 End Class
--- a/app/DD-Record-Organizer/frmGlobalSearch.resx
+++ b/app/DD-Record-Organizer/frmGlobalSearch.resx
@@ -123,7 +123,7 @@
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="SplitContainerMain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 117</value>
+    <value>0, 275</value>
  </data>
  <metadata name="cmsRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>454, 17</value>
@@ -156,7 +156,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>751, 313</value>
+    <value>751, 131</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
@@ -186,24 +186,6 @@
  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>6, 25</value>
  </data>
-  <data name="ToolStripButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 22</value>
-  </data>
-  <data name="ToolStripButton1.Text" xml:space="preserve">
-    <value>Export</value>
-  </data>
-  <data name="tsbtnviewDetail.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbtnviewDetail.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 22</value>
-  </data>
-  <data name="tsbtnviewDetail.Text" xml:space="preserve">
-    <value>Detailansicht</value>
-  </data>
  <data name="ToolStripRecords.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@@ -259,7 +241,7 @@
    <value>Verknüpfungen anzeigen</value>
  </data>
  <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 114</value>
+    <value>206, 92</value>
  </data>
  <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
    <value>ContextMenuStrip1</value>
@@ -274,7 +256,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>408, 313</value>
+    <value>408, 131</value>
  </data>
  <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -306,15 +288,6 @@
  <data name="tslblDocView.Text" xml:space="preserve">
    <value>Windream-Dokumente</value>
  </data>
-  <data name="ToolStripButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 22</value>
-  </data>
-  <data name="ToolStripButton2.Text" xml:space="preserve">
-    <value>Export</value>
-  </data>
  <data name="ToolStripDokumente.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@@ -343,7 +316,7 @@
    <value>Panel2</value>
  </data>
  <data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 338</value>
+    <value>1169, 156</value>
  </data>
  <data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
@@ -616,7 +589,7 @@
    <value>Top</value>
  </data>
  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+    <value>0, 158</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
    <value>1169, 117</value>
@@ -636,6 +609,111 @@
  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
+  <data name="BarButtonItem1.Caption" xml:space="preserve">
+    <value>Export Excel</value>
+  </data>
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
+        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
+        MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
+        b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
+        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>Detailansicht</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQFAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGV0YWlsZWQiPg0KICAgIDxwYXRo
+        IGQ9Ik04LDhINlY2aDJWOHogTTgsMTBINnYyaDJWMTB6IE04LDE0SDZ2MmgyVjE0eiBNOCwxOEg2djJo
+        MlYxOHogTTgsMjJINnYyaDJWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8cGF0aCBkPSJNMiwyOFYy
+        aDIydjEyLjNjMC43LDAuMiwxLjQsMC41LDIsMC44VjFjMC0wLjUtMC41LTEtMS0xSDFDMC41LDAsMCww
+        LjUsMCwxdjI4YzAsMC41LDAuNSwxLDEsMWgyMSAgIGMtMiwwLTMuOS0wLjgtNS4zLTJIMnoiIGNsYXNz
+        PSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMzEuNiwyOS45TDI3LDI1LjNjMC42LTAuOSwxLTIuMSwx
+        LTMuM2MwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNnMyLjcsNiw2LDZjMS4yLDAsMi4zLTAuNCwzLjMt
+        MWw0LjYsNC42ICAgYzAuNSwwLjUsMS4zLDAuNSwxLjcsMEMzMi4xLDMxLjIsMzIuMSwzMC40LDMxLjYs
+        MjkuOXogTTIyLDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNC4yLDI2LDIy
+        LDI2eiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPGcgY2xhc3M9InN0MCI+DQogICAgICA8cGF0aCBkPSJN
+        MTYuNywxNkgxMHYtMmgxMHYwLjNDMTguOCwxNC42LDE3LjYsMTUuMiwxNi43LDE2eiBNMjAsNkgxMHYy
+        aDEwVjZ6IE0yMCwxMEgxMHYyaDEwVjEweiBNMTQsMjJoLTR2Mmg0LjMgICAgQzE0LjEsMjMuNCwxNCwy
+        Mi43LDE0LDIyeiBNMTUuMSwxOEgxMHYyaDQuM0MxNC40LDE5LjMsMTQuNywxOC42LDE1LjEsMTh6IiBj
+        bGFzcz0iQmxhY2siIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="bsiInfo.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold, Italic</value>
+  </data>
+  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Aktionen</value>
+  </data>
+  <data name="RibbonPage1.Text" xml:space="preserve">
+    <value>Global Search</value>
+  </data>
+  <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1169, 158</value>
+  </data>
+  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 431</value>
+  </data>
+  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1169, 24</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
+    <value>RibbonStatusBar1</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
+    <value>RibbonControl1</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="RibbonPage2.Text" xml:space="preserve">
+    <value>RibbonPage2</value>
+  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -645,10 +723,7 @@
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>1169, 455</value>
  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmGlobalSearch.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
        AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA
@@ -733,18 +808,6 @@
  <data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;ToolStripButton1.Name" xml:space="preserve">
-    <value>ToolStripButton1</value>
-  </data>
-  <data name="&gt;&gt;ToolStripButton1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tsbtnviewDetail.Name" xml:space="preserve">
-    <value>tsbtnviewDetail</value>
-  </data>
-  <data name="&gt;&gt;tsbtnviewDetail.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Name" xml:space="preserve">
    <value>DateiÖffnenToolStripMenuItem</value>
  </data>
@@ -763,6 +826,12 @@
  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Name" xml:space="preserve">
+    <value>VerknüpfungenAnzeigenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;GridViewFiles.Name" xml:space="preserve">
    <value>GridViewFiles</value>
  </data>
@@ -775,28 +844,52 @@
  <data name="&gt;&gt;tslblDocView.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;ToolStripButton2.Name" xml:space="preserve">
-    <value>ToolStripButton2</value>
-  </data>
-  <data name="&gt;&gt;ToolStripButton2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;tsbtnRefresh.Name" xml:space="preserve">
    <value>tsbtnRefresh</value>
  </data>
  <data name="&gt;&gt;tsbtnRefresh.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Name" xml:space="preserve">
-    <value>VerknüpfungenAnzeigenToolStripMenuItem</value>
+  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
+    <value>BarButtonItem1</value>
  </data>
-  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;bsiInfo.Name" xml:space="preserve">
+    <value>bsiInfo</value>
+  </data>
+  <data name="&gt;&gt;bsiInfo.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
+    <value>RibbonPage1</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
+    <value>RibbonPageGroup1</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
+    <value>RibbonPage2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmGlobalSearch</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/app/DD-Record-Organizer/frmGlobalSearch.vb
+++ b/app/DD-Record-Organizer/frmGlobalSearch.vb
@@ -5,7 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports System.Runtime.InteropServices

 Public Class frmGlobalSearch
-    Inherits Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
    End Function
@@ -32,6 +32,7 @@ Public Class frmGlobalSearch
    Public Const SW_SHOW As Short = 5
    Private _Helper As ClassHelper
    Dim sel_Records, sel_FT As String
+    Private SelectedGrid As DevExpress.XtraGrid.GridControl
    Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click
        Refresh_Search()
    End Sub
@@ -145,25 +146,25 @@ Public Class frmGlobalSearch
        End If
    End Function

-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
-        Export_Excel(GridControlRecords)
-    End Sub

-    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
-        Export_Excel(GridControlFiles)
-    End Sub
+
+

    Private Sub ExportExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportExcelToolStripMenuItem.Click
-        Export_Excel(GridControlRecords)
+        Export_Excel()
    End Sub
-    Sub Export_Excel(Grid As DevExpress.XtraGrid.GridControl)
+    Sub Export_Excel()
+        If IsNothing(SelectedGrid) Then
+            MsgBox("Please choose a grid!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
        Dim saveFileDialog1 As New SaveFileDialog
        saveFileDialog1.Filter = "Excel File|*.xlsx"
        saveFileDialog1.Title = "Export to Excel:"
        saveFileDialog1.ShowDialog()
        If saveFileDialog1.FileName <> "" Then
            Cursor = Cursors.WaitCursor
-            Grid.MainView.ExportToXlsx(saveFileDialog1.FileName)
+            SelectedGrid.MainView.ExportToXlsx(saveFileDialog1.FileName)
            Dim result As MsgBoxResult
            Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")

@@ -203,9 +204,6 @@ Public Class frmGlobalSearch
        End If
    End Sub

-    Private Sub tsbtnviewDetail_Click(sender As Object, e As EventArgs) Handles tsbtnviewDetail.Click
-        Show_Detail_Record()
-    End Sub

    Private Sub GridControlFiles_DoubleClick(sender As Object, e As EventArgs) Handles GridControlFiles.DoubleClick
        File_open()
@@ -346,6 +344,22 @@ Public Class frmGlobalSearch
        End Try
    End Sub

+    Private Sub GridControlRecords_Click(sender As Object, e As EventArgs) Handles GridControlRecords.Click
+        SelectedGrid = sender
+    End Sub
+
+    Private Sub GridControlFiles_Click(sender As Object, e As EventArgs) Handles GridControlFiles.Click
+        SelectedGrid = sender
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Export_Excel()
+    End Sub
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Show_Detail_Record()
+    End Sub
+
    Sub File_open()
        Me.Cursor = Cursors.WaitCursor

--- a/app/Setup_NoUpdaterVS19/Config.wxi
+++ b/app/Setup_NoUpdaterVS19/Config.wxi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define ProgramName="DD-Record-Organizer"?>
+  <?define ProductName="Record Organizer"?>
+  <?define Manufacturer="Digital Data"?>
+  <?define Description="Record Organizer"?>
+  <?define Comments="Record Organizer"?>
+  <?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
+
+  <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
+</Include>
--- a/app/Setup_NoUpdaterVS19/Product.wxs
+++ b/app/Setup_NoUpdaterVS19/Product.wxs
@@ -1,50 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+<?include Config.wxi?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
    <Package
      Id="*"
      Keywords="Installer"
-      Description="Digital Data Record Organizer Setup"
-      Comments="Record Organizer is a registered Trademark of Digital Data"
-      Manufacturer="Digital Data"
+      Description="$(var.Description)"
+      Comments="$(var.Comments)"
+      Manufacturer="$(var.Manufacturer)"
      InstallerVersion="100"
      Languages="1031"
      Compressed="yes"
      SummaryCodepage="1252"
      InstallScope="perMachine"
    />
-    <!-- 
-      InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
-    -->

-    <!-- Nicht entfernen! -->
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value="Record Organizer Install" />
+    <Media Id='1' Cabinet='RecordOrganizer.cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+    <Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />

-    <!-- UPGRADE -->
-    <!-- 
-      Bei neuer Version muss die Versionsnummer unter 
-      My Project >> Anwendung >> Assemblyinformationen und unter Product/@Version geändert werden.
-      Hier die Assemblyversion UND Dateiversion ändern.
-      
-      NICHT den UpdateCode ändern!
-      Darf sich NIE MEHR ändern!
-    -->
    <MajorUpgrade
      AllowDowngrades="no"
      AllowSameVersionUpgrades="no"
-      DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate."
+      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
    />
+    
+    

    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}">
+    <Upgrade Id="$(var.UpgradeCode)">
      <UpgradeVersion
        Minimum="1.0.0.0" Maximum="99.0.0.0"
        Property="PREVIOUSVERSIONSINSTALLED"
        IncludeMinimum="yes" IncludeMaximum="no" />
    </Upgrade>
-    <!-- UPGRADE END -->

    <!-- Legt das Icon fest -->
    <Icon Id="DDRecordOrganizer.exe" SourceFile="DD-Record-Organizer.exe" />
@@ -53,232 +41,239 @@
    <Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />

    <!-- Liest den Installationsort über die Registry aus -->
-    <Property Id="APPLICATIONFOLDER">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
    </Property>

-    <!-- Legt die Ordner-Struktur fest -->
    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="Pfiles">
-        <Directory Id="DD" Name="Digital Data">
-
-          <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Record Organizer">
-
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="DD" Name="$(var.Manufacturer)">
+          <Directory Id="INSTALLDIR" Name="$(var.ProductName)">
            <Directory Id="ADDONDIR" Name="Addons">
-              <Directory Id="RIGHTMANAGERDIR" Name="RightManager">
-
-                <Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
-                  <File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" Source="RecordOrganizer_RightManager.exe" />
-                  <File Id="DD_Rights.dll" Name="DD_Rights.dll" Source="DD_Rights.dll" />
-                  <File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" />
-                </Component>
-
-                <!-- DEVEXPRESS Bibliotheken for RightsManager -->
-                <Component Id="DevExpressLibs_RightsManager" Guid="739740F2-1576-4416-8E3E-748F65358B65">
-                  <File Id="DevExpress.Data.v19.2_" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Data.v19.2.dll" KeyPath="yes" />
-                  <File Id="DevExpress.Sparkline.v19.2_" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Sparkline.v19.2.Core.dll" />
-                  <File Id="DevExpress.Printing.v19.2.Core_" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Printing.v19.2.Core.dll" />
-                  <File Id="DevExpress.Utils.v19.2_" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Utils.v19.2.dll" />
-                  <File Id="DevExpress.XtraEditors.v19.2_" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraEditors.v19.2.dll" />
-                  <File Id="DevExpress.XtraGrid.v19.2_" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraGrid.v19.2.dll" />
-                  <File Id="DevExpress.XtraLayout.v19.2_" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraLayout.v19.2.dll" />
-                  <File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
-                </Component>
-                
-               <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
-                  <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="yes" Checksum="yes"/>
-                </Component>
-
-              </Directory>
-
-              <!--<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
-                
-                <Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
-                  -->
-              <!--<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
-                    <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                    <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                  </File>-->
-              <!--
-                  <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe" />
-               
-                  <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
-                </Component>
-            
-              </Directory>-->
-            </Directory>
-
-            <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-              <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
-                <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-              </File>
-              <!-- Programmordner bei Deinstallation entfernen-->
-              <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-            </Component>
-            <Component Id="Docu" Guid="D6FAF95B-3CF0-4504-B18B-E1181E92DC91">
-              <File Id="releaseNote.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD - RECORD ORGANIZER\ChangeLog.txt" KeyPath="yes"/>
-            </Component>
-            <!-- WINDREAM Bibliotheken -->
-            <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.INDEXLib.dll" KeyPath="yes" />
-              <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="OBJECTLISTCONTROLLibDLL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll" KeyPath="no" />
-              <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
-              <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
-              <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
-            </Component>
-
-            <!-- Oracle-Bibliothek -->
-            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- Commandline Bibliothek -->
-            <Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
-              <File Id="Commandline" Name="Commandline.dll" Source="Commandline.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- DD Bibliotheken -->
-            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
-              <File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
-              <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
-              <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
-            </Component>
-            <!-- DD Bibliotheken -->
-            <Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
-              <File Id="OfficeLib" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
-              <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
-              <File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
-            </Component>
-
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
-            </Component>
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
-              <File Id="ERPConnect45" Name="ERPConnect45.dll" Source="ERPConnect45.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- DEVEXPRESS Bibliotheken -->
-            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Data.v19.2.dll" KeyPath="yes" />
-              <File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Office.v19.2.Core.dll" />
-              <File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Printing.v19.2.Core.dll" />
-              <File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.RichEdit.v19.2.Core.dll" />
-              <File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Utils.v19.2.dll" />
-              <File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraBars.v19.2.dll" />
-              <File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraEditors.v19.2.dll" />
-              <File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraGrid.v19.2.dll" />
-              <File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraLayout.v19.2.dll" />
-              <File Id="DevExpress.XtraNavBar.v19.2" Name="DevExpress.XtraNavBar.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraNavBar.v19.2.dll" />
-              <File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
-              <!--<File Id="DevExpress.XtraRichEdit.v19.2" Name="DevExpress.XtraRichEdit.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraRichEdit.v19.2.dll" />-->
-              <File Id="DevExpress.XtraScheduler.v19.2" Name="DevExpress.XtraScheduler.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.dll" />
-              <File Id="DevExpress.XtraScheduler.v19.2.Core" Name="DevExpress.XtraScheduler.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.Core.dll" />
-              <File Id="DevExpress.XtraScheduler.v19.2.Extensions" Name="DevExpress.XtraScheduler.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.Extensions.dll" />
-              <File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraTreeList.v19.2.dll" />
-              <File Id="DevExpress.XtraVerticalGrid.v19.2" Name="DevExpress.XtraVerticalGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraVerticalGrid.v19.2.dll" />
-              <File Id="DevExpress.XtraWizard.v19.2" Name="DevExpress.XtraWizard.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraWizard.v19.2.dll" />
-              <File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Pdf.v19.2.Core.dll" />
-              <File Id="DevExpress.Pdf.v19.2.Drwawing" Name="DevExpress.Pdf.v19.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Pdf.v19.2.Drawing.dll" />
-              <File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPdfViewer.v19.2.dll" />
-              <File Id="DevExpress.Sparkline.v19.2" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Sparkline.v19.2.Core.dll" />
-              <!--<File Id="DevExpress.Charts.Designer.v19.2_" Name="DevExpress.Charts.Designer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.Designer.v19.2.dll" />-->
-              <File Id="DevExpress.Charts.v19.2.Core_" Name="DevExpress.Charts.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.v19.2.Core.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2_" Name="DevExpress.XtraCharts.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2.Extensions_" Name="DevExpress.XtraCharts.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.Extensions.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2.UI_" Name="DevExpress.XtraCharts.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.UI.dll" />
-              <File Id="DevExpress.XtraDiagram.v19.2_" Name="DevExpress.XtraDiagram.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraDiagram.v19.2.dll" />
-              <File Id="DevExpress.XtraCharts.Wizard" Name="DevExpress.XtraCharts.v19.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.Wizard.dll" />
-              <File Id="DevExpress.XtraMap.v19.2" Name="DevExpress.XtraMap.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraMap.v19.2.dll" />
-              <File Id="DevExpress.Map.v19.2.Core" Name="DevExpress.Map.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Map.v19.2.Core.dll" />
-            </Component>
-
-            <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
-            <Directory Id="LOCALE_DE" Name="de">
-              <Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
-                <File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
-              </Component>
-
-              <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
-                <File Id="DevExpress.XtraScheduler.v19.2.Core.resources" Name="DevExpress.XtraScheduler.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.XtraScheduler.v19.2.Extensions.resources" Name="DevExpress.XtraScheduler.v19.2.Extensions.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Extensions.resources.dll"></File>
-                <File Id="DevExpress.XtraScheduler.v19.2.resources" Name="DevExpress.XtraScheduler.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Data.v19.2.resources" Name="DevExpress.Data.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Data.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Office.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Reporting.resources.dll"></File>
-                <File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.RichEdit.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Utils.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraBars.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraEditors.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraGrid.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraLayout.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraNavBar.v19.2.resources" Name="DevExpress.XtraNavBar.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraNavBar.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraPrinting.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraTreeList.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraVerticalGrid.v19.2.resources" Name="DevExpress.XtraVerticalGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraVerticalGrid.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraWizard.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Charts.Designer.v19.2.resources" Name="DevExpress.Charts.Designer.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Charts.Designer.v19.2.resources.dll" />
-                <File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraCharts.v19.2.resources.dll" />
-              </Component>
-            </Directory>
-
-            <Directory Id="LOCALE_EN_GB" Name="en-GB">
-              <Component Id="RecordOrganizer.Locales.en_gb" Guid="7FAA9173-9012-4EBB-A408-04AB25D3C9DF">
-                <File Id="DDRecordOrganizer.resource.en_gb" Name="DD-Record-Organizer.resources.dll" Source="en-GB\DD-Record-Organizer.resources.dll"></File>
-              </Component>
-            </Directory>
-
-            <Directory Id="LOCALE_EN_US" Name="en-US">
-              <Component Id="RecordOrganizer.Locales.en_us" Guid="AC6E160E-8FDE-41F4-98FD-41FD668AF320">
-                <File Id="DDRecordOrganizer.resource.en_us" Name="DD-Record-Organizer.resources.dll" Source="en-US\DD-Record-Organizer.resources.dll"></File>
-              </Component>
+              <Directory Id="RIGHTMANAGERDIR" Name="RightManager" />
+              <Directory Id="VERSIONCHECKERDIR" Name="VERSION_CHECKER" />
            </Directory>
          </Directory>
        </Directory>
      </Directory>

-      <!-- Startmenü Ordner -->
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Record Organizer">
-          <Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-
-            <RegistryKey Root="HKCU" Key="Software">
-
-              <RegistryKey Key="[Manufacturer]">
-                <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
-                  <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
-                </RegistryKey>
-              </RegistryKey>
-
-              <RegistryKey Key="Classes">
-                <RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
-                  <RegistryValue Type="string" Name="URL Protocol" Value="" />
-                  <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe,0&quot;" />
-                  <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe&quot; --data %1" />
-                </RegistryKey>
-              </RegistryKey>
-
-            </RegistryKey>
-
-          </Component>
-        </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
      </Directory>

-      <!-- Desktop Ordner -->
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="DesktopFolder" />
    </Directory>

+    <DirectoryRef Id="VERSIONCHECKERDIR">
+
+      <Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
+        <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe">
+          <Shortcut Id="ApplicationStartMenuShortcut_StartMenu_Update" Directory="ProgramMenuFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ApplicationStartMenuShortcut_Desktop_Update" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+        </File>
+        <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
+      </Component>
+
+    </DirectoryRef>
+
+    <DirectoryRef Id="RIGHTMANAGERDIR">
+      <Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
+        <File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" KeyPath="yes" />
+        <File Id="DD_Rights.dll" Name="DD_Rights.dll" />
+        <File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" />
+      </Component>
+
+      <!-- DEVEXPRESS Bibliotheken for RightsManager -->
+      <Component Id="DevExpressLibs_RightsManager" Guid="739740F2-1576-4416-8E3E-748F65358B65">
+        <File Id="DevExpress.Data.v19.2_" Name="DevExpress.Data.v19.2.dll"  KeyPath="yes" />
+        <File Id="DevExpress.Sparkline.v19.2_" Name="DevExpress.Sparkline.v19.2.Core.dll"  />
+        <File Id="DevExpress.Printing.v19.2.Core_" Name="DevExpress.Printing.v19.2.Core.dll"  />
+        <File Id="DevExpress.Utils.v19.2_" Name="DevExpress.Utils.v19.2.dll"  />
+        <File Id="DevExpress.XtraEditors.v19.2_" Name="DevExpress.XtraEditors.v19.2.dll"  />
+        <File Id="DevExpress.XtraGrid.v19.2_" Name="DevExpress.XtraGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraLayout.v19.2_" Name="DevExpress.XtraLayout.v19.2.dll"  />
+        <File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll"  />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLDIR">
+      <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
+      <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
+        <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes" />
+        <!-- Programmordner bei Deinstallation entfernen-->
+        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      </Component>
+
+      <Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
+        <RegistryKey Root="HKLM" Key="Software">
+          <RegistryKey Key="[Manufacturer]">
+            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+            </RegistryKey>      
+          </RegistryKey>
+
+          <RegistryKey Key="Classes">
+            <RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
+              <RegistryValue Type="string" Name="URL Protocol" Value="" />
+              <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe,0&quot;" />
+              <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe&quot; --data %1" />
+            </RegistryKey>
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+
+      <Component Id="Docu" Guid="D6FAF95B-3CF0-4504-B18B-E1181E92DC91">
+        <File Id="releaseNote.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD - RECORD ORGANIZER\ChangeLog.txt" KeyPath="yes"/>
+      </Component>
+
+      <!-- WINDREAM Bibliotheken -->
+      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
+        <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.INDEXLib.dll" KeyPath="yes" />
+        <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
+        <File Id="OBJECTLISTCONTROLLibDLL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
+        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll" KeyPath="no" />
+        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
+        <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
+        <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
+      </Component>
+
+      <!-- Oracle-Bibliothek -->
+      <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
+      </Component>
+
+      <!-- Commandline Bibliothek -->
+      <Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
+        <File Id="Commandline" Name="Commandline.dll"  KeyPath="yes" />
+      </Component>
+
+      <!-- DD Bibliotheken -->
+      <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
+        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll"  KeyPath="no" />
+        <File Id="DD_Rights" Name="DD_Rights.dll"  KeyPath="no" />
+        <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll"  KeyPath="no" />
+        <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll"  KeyPath="no" Checksum="yes"/>
+      </Component>
+      <!-- DD Bibliotheken -->
+      <Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
+        <File Id="OfficeLib" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
+        <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
+        <File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
+      </Component>
+
+      <!-- MAIL.NET Bibliothek -->
+      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
+        <File Id="MSGLib" Name="Independentsoft.Msg.dll"  KeyPath="yes" />
+      </Component>
+      <!-- MAIL.NET Bibliothek -->
+      <Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
+        <File Id="ERPConnect45" Name="ERPConnect45.dll"  KeyPath="yes" />
+      </Component>
+
+      <!-- Logging -->
+      <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
+        <File Id="NLog" Name="NLog.dll"  KeyPath="yes" Checksum="yes"/>
+      </Component>
+
+      <!-- DEVEXPRESS Bibliotheken -->
+      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
+        <File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll"  KeyPath="yes" />
+        <File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll"  />
+        <File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll"  />
+        <File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll"  />
+        <File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll"  />
+        <File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll"  />
+        <File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll"  />
+        <File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll"  />
+        <File Id="DevExpress.XtraNavBar.v19.2" Name="DevExpress.XtraNavBar.v19.2.dll"  />
+        <File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2" Name="DevExpress.XtraScheduler.v19.2.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2.Core" Name="DevExpress.XtraScheduler.v19.2.Core.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2.Extensions" Name="DevExpress.XtraScheduler.v19.2.Extensions.dll"  />
+        <File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll"  />
+        <File Id="DevExpress.XtraVerticalGrid.v19.2" Name="DevExpress.XtraVerticalGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraWizard.v19.2" Name="DevExpress.XtraWizard.v19.2.dll"  />
+        <File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll"  />
+        <File Id="DevExpress.Pdf.v19.2.Drwawing" Name="DevExpress.Pdf.v19.2.Drawing.dll"  />
+        <File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll"  />
+        <File Id="DevExpress.Sparkline.v19.2" Name="DevExpress.Sparkline.v19.2.Core.dll"  />
+        <File Id="DevExpress.Charts.v19.2.Core_" Name="DevExpress.Charts.v19.2.Core.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2_" Name="DevExpress.XtraCharts.v19.2.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2.Extensions_" Name="DevExpress.XtraCharts.v19.2.Extensions.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2.UI_" Name="DevExpress.XtraCharts.v19.2.UI.dll"  />
+        <File Id="DevExpress.XtraDiagram.v19.2_" Name="DevExpress.XtraDiagram.v19.2.dll"  />
+        <File Id="DevExpress.XtraCharts.Wizard" Name="DevExpress.XtraCharts.v19.2.Wizard.dll"  />
+        <File Id="DevExpress.XtraMap.v19.2" Name="DevExpress.XtraMap.v19.2.dll"  />
+        <File Id="DevExpress.Map.v19.2.Core" Name="DevExpress.Map.v19.2.Core.dll"  />
+      </Component>
+
+      <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
+      <Directory Id="LOCALE_DE" Name="de">
+        <Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
+          <File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+
+        <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
+          <File Id="DevExpress.XtraScheduler.v19.2.Core.resources" Name="DevExpress.XtraScheduler.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.XtraScheduler.v19.2.Extensions.resources" Name="DevExpress.XtraScheduler.v19.2.Extensions.resources.dll" ></File>
+          <File Id="DevExpress.XtraScheduler.v19.2.resources" Name="DevExpress.XtraScheduler.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.Data.v19.2.resources" Name="DevExpress.Data.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraNavBar.v19.2.resources" Name="DevExpress.XtraNavBar.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraVerticalGrid.v19.2.resources" Name="DevExpress.XtraVerticalGrid.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll"  />
+        </Component>
+      </Directory>
+
+      <Directory Id="LOCALE_EN_GB" Name="en-GB">
+        <Component Id="RecordOrganizer.Locales.en_gb" Guid="7FAA9173-9012-4EBB-A408-04AB25D3C9DF">
+          <File Id="DDRecordOrganizer.resource.en_gb" Name="DD-Record-Organizer.resources.dll" Source="en-GB\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+      </Directory>
+
+      <Directory Id="LOCALE_EN_US" Name="en-US">
+        <Component Id="RecordOrganizer.Locales.en_us" Guid="AC6E160E-8FDE-41F4-98FD-41FD668AF320">
+          <File Id="DDRecordOrganizer.resource.en_us" Name="DD-Record-Organizer.resources.dll" Source="en-US\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut_StartMenu" Guid="508a08d6-73fc-43d4-8861-b432ba92e44e">
+        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="ApplicationShortcut_Desktop" Guid="89ff1c33-08f7-4270-a858-2d6c7cbf9ba1">
+        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+    
    <!-- Installierte Features -->
-    <Feature Id="Complete" Level="1">
+    <Feature Id="Complete" Title="$(var.ProductName)" Level="1">
      <ComponentRef Id="MainExecutable" />
      <ComponentRef Id="WindreamLibs" />
      <ComponentRef Id="Docu" />
@@ -291,33 +286,54 @@
      <ComponentRef Id="DevExpressLibs" />
      <ComponentRef Id="DevExpressLibs_RightsManager" />
      <ComponentRef Id="BasicLibs" />
-      <ComponentRef Id="ProgramMenuDir"/>
-      <!--<ComponentRef Id="RegistryEntries"/>-->
+      <ComponentRef Id="RegistryKeys"/>
      <ComponentRef Id="Oracle" />
      <ComponentRef Id="Commandline" />
      <ComponentRef Id="ERPConnectLibs" />
+      <ComponentRef Id="ApplicationShortcut_Desktop" />
+      <ComponentRef Id="ApplicationShortcut_StartMenu" />
      <ComponentRef Id="RecordOrganizer_RightManager"/>
      <ComponentRef Id="NLog"/>
-      <!--<ComponentRef Id="RecordOrganizer_VersionChecker" />-->
+    </Feature>
+
+    <Feature Id="Update_Checker" Title="UpdateChecker" Level="0">
+      <ComponentRef Id="RecordOrganizer_VersionChecker" />
    </Feature>

    <!-- Legt das Standard-Installationsverzeichnis fest-->
    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+    <Property Id="_BrowseProperty" Value="INSTALLDIR" />

    <!-- OBERFLÄCHE -->
    <UI>
-      <UIRef Id="WixUI_InstallDir" />
+      <!--<UIRef Id="WixUI_InstallDir" />-->
+      <UIRef Id="WixUI_FeatureTree"/>
      <UIRef Id="WixUI_ErrorProgressText" />
      <Publish Dialog="WelcomeDlg"
-               Control="Next"
-               Event="NewDialog"
-               Value="InstallDirDlg"
-               Order="2">1</Publish>
+            Control="Next"
+            Event="NewDialog"
+            Value="InstallDirDlg"
+            Order="2">1</Publish>
      <Publish Dialog="InstallDirDlg"
-               Control="Back"
-               Event="NewDialog"
-               Value="WelcomeDlg"
-               Order="2">1</Publish>
+            Control="Back"
+            Event="NewDialog"
+            Value="WelcomeDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="Next"
+            Event="NewDialog"
+            Value="FeaturesDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="ChangeFolder"
+            Event="NewDialog"
+            Value="BrowseDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="FeaturesDlg"
+              Control="Back"
+              Event="NewDialog"
+              Value="InstallDirDlg"
+              Order="2">1</Publish>
    </UI>
    <!-- OBERFLÄCHE END -->
  </Product>
--- a/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj
+++ b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj
@@ -37,6 +37,9 @@
      <Name>WixUIExtension</Name>
    </WixExtension>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config.wxi" />
+  </ItemGroup>
  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
Author	SHA1	Message	Date
Digital Data - Marlon Schreiber	3feb7ebf4d	MS 2.7	2021-06-28 16:02:25 +02:00
Digital Data - Marlon Schreiber	e9fb65eddf	MS DocResult ENtitySearch	2021-06-28 10:32:13 +02:00
Jonathan Jenne	136c4dec6e	Update Installer	2021-06-28 10:25:26 +02:00