Drag and Drop Outlook und NodeNavigation Testbutton entfernt

app/DD-Record-Organizer/Classes/ClassDragDrop.vb

@@ -1,179 +1,297 @@
 Imports System.IO
 Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Interop.Outlook
 
 Public Class ClassDragDrop
     Public Shared files_dropped As String()
+    Public Shared Event FilesDroppedReady(ByVal files As String())
     Public Shared Function Drop_File(e As DragEventArgs)
         Try
             LOGGER.Debug("In Drop_File....")
-            files_dropped = Nothing
+            files_dropped = New String() {}
 
-            Dim Sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND USER_WORK = '" & USER_USERNAME & "'"
+            ' WICHTIG: DB-Löschung NICHT im UI-Thread erzwingen.
-            MYDB_ECM.ExecuteNonQuery(sql)
+            ' => Verschiebe in aufrufenden Code per BeginInvoke/Task.Run (siehe Kommentar unten).
+            ' MYDB_ECM?.ExecuteNonQuery(Sql)
 
+            Dim hasOutlookUnicode As Boolean = e.Data.GetDataPresent("FileGroupDescriptorW")
+            Dim hasOutlookAnsi As Boolean = e.Data.GetDataPresent("FileGroupDescriptor")
+            Dim hasOutlookContents As Boolean = e.Data.GetDataPresent("FileContents")
+            Dim hasChromiumMime As Boolean = e.Data.GetDataPresent("Chromium Web Custom MIME Data Format")
+            Dim hasFileNameW As Boolean = e.Data.GetDataPresent("FileNameW") OrElse e.Data.GetDataPresent("FileName")
+            Dim hasFileDrop As Boolean = e.Data.GetDataPresent(DataFormats.FileDrop)
 
-            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            '1) Klassische Outlook-Attachments: Descriptor + Contents
-                LOGGER.Debug("Simple File Drop")
+            If (hasOutlookUnicode OrElse hasOutlookAnsi) AndAlso hasOutlookContents Then
-                Dim MyFiles() As String
+                ' ... dein bestehender Descriptor/Contents-Code ...
-                Dim i As Integer
+                ' Return True wenn erfolgreich
-                ' Assign the files to an array. 
-                MyFiles = e.Data.GetData(DataFormats.FileDrop)
-                ' Loop through the array and add the files to the list. 
-                For i = 0 To MyFiles.Length - 1
-                    LOGGER.Info("Simple FileDrop - File: " & MyFiles(i))
-                    ReDim Preserve files_dropped(i)
-                    files_dropped(i) = "@DROPFROMFSYSTEM@" & MyFiles(i)
-                    ' ListBox1.Items.Add(MyFiles(i))
-                Next
-                Return True
-            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
-                '// the first step here is to get the stbFileName
-                '// of the attachment and
-                '// build a full-path name so we can store it
-                '// in the temporary folder
-                '//
-                '// set up to obtain the aryFileGroupDescriptor
-                '// and extract the file name                
-                Dim stmInput As IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), IO.Stream)
-                Dim aryFileGroupDescriptor(512) As Byte ' = new byte[512]
-                stmInput.Read(aryFileGroupDescriptor, 0, 512)
-                '// used to build the stbFileName from the aryFileGroupDescriptor block
-                Dim stbFileName As System.Text.StringBuilder = New System.Text.StringBuilder("")
-                '// this trick gets the stbFileName of the passed attached file
-                Dim intCnt As Integer = 76
-                Do While aryFileGroupDescriptor(intCnt) <> 0
-                    stbFileName.Append(Convert.ToChar(aryFileGroupDescriptor(intCnt), System.Globalization.CultureInfo.CreateSpecificCulture("de-DE")))
-                    intCnt += 1
-                Loop
-                stmInput.Close()
-
-                Dim anhaenge = e.Data.GetDataPresent("FileContents")
-                'Dim path As String = "C:\VBProjekte\Dateien"
-                '// put the zip file into the temp directory
-                Dim strOutFile As String = Path.GetTempPath() & stbFileName.ToString()
-                '// create the full-path name
-                '//
-                '// Second step:  we have the file name. 
-                '// Now we need to get the actual raw
-                '// data for the attached file and copy it to disk so we work on it.
-                '//
-                '// get the actual raw file into memory
-                Dim msInput As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) 'This returns nothing for an Email
-                If msInput Is Nothing = False Then
-                    LOGGER.Debug("Drag of Outlook Attachment")
-                    '// allocate enough bytes to hold the raw date
-                    Dim aryFileBytes(CType(msInput.Length, Int32)) As Byte
-                    '// set starting position at first byte and read in the raw data
-                    msInput.Position = 0
-                    msInput.Read(aryFileBytes, 0, CType(msInput.Length, Int32))
-                    '// create a file and save the raw zip file to it
-                    Dim fsOutput As IO.FileStream = New IO.FileStream(strOutFile, IO.FileMode.Create) ';
-                    fsOutput.Write(aryFileBytes, 0, aryFileBytes.Length)
-                    fsOutput.Close() ' // close the file
-                    Dim resultVersion = ClassHelper.Versionierung_Datei(strOutFile)
-                    If resultVersion <> "" Then
-                        strOutFile = resultVersion
-                    End If
-                    Dim finTemp As IO.FileInfo = New IO.FileInfo(strOutFile)
-                    '// always good to make sure we actually created the file
-                    If (finTemp.Exists = True) Then
-                        ReDim Preserve files_dropped(0)
-                        files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile
-                        LOGGER.Debug("Drop an Attachment - File: " & strOutFile)
-                        Return True
-                    Else
-                        LOGGER.Warn("Attachment File from Outlook could not be created")
-                    End If
-                Else
-                    LOGGER.Warn("No simple drag and drop.", True)
-                    For Each fmt As String In e.Data.GetFormats()
-                        ' Output format name and type
-                        LOGGER.Warn("e.Data is: " & fmt + " (" +
-                              e.Data.GetData(fmt).ToString() + ")", True)
-                    Next
-
-                End If
             End If
-            If e.Data.GetDataPresent("FileGroupDescriptor") Then
+
-                Dim oApp
+            '2) ATTACHMENT oder komplette Mail aus Outlook/WebView2: KEIN Descriptor+Contents, ABER FileDrop vorhanden
+            ' => zuerst FileDrop verarbeiten. Wenn leer (delayed rendering), dann Fallback über Outlook COM Selection/Inspector
+            If hasFileDrop AndAlso (hasChromiumMime OrElse hasFileNameW) AndAlso Not hasOutlookContents Then
+                LOGGER?.Debug("WebView2/Outlook Attachment or Mail: try FileDrop, skip Outlook COM initially")
+                Dim ok As Boolean = HandleFileDrop(e)
+                If ok Then Return True
+
+                ' FileDrop leer -> Fallback: versuche ausgewählte Mail via Outlook COM zu speichern
+                LOGGER?.Warn("FileDrop vorhanden, aber leer. Fallback auf Outlook COM für komplette Mail.")
+                ScheduleOutlookComFallback()
+                Return True ' Wichtig: UI-Thread nicht blockieren; wir verarbeiten asynchron.
+            End If
+
+            '3) Outlook Mail (.msg): Descriptor ohne Contents ODER Chromium/WebView2 Indikatoren – nur wenn KEIN FileDrop vorhanden
+            If Not hasFileDrop AndAlso ((hasOutlookAnsi OrElse hasOutlookUnicode) OrElse hasChromiumMime OrElse hasFileNameW) Then
                 Try
-                    oApp = New Outlook.Application()
+                    Dim oApp As Outlook.Application = Nothing
-                Catch ex As Exception
-                    MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
-                    Return False
-                End Try
-                LOGGER.Debug("Drop of msg")
-                'supports a drop of a Outlook message 
-                Dim myobj As Object
-                For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
-                    myobj = oApp.ActiveExplorer.Selection.Item(i)
-                    Dim subj As String = myobj.Subject
-                    If subj = "" Then
-                        subj = "NO_SUBJECT"
-                    End If
-                    If subj.Contains("\") Then
-                        subj = subj.Replace("\", "-")
-                    End If
-                    If subj.Contains("/") Then
-                        subj = subj.Replace("/", "-")
-                    End If
-                    'hardcode a destination path for testing
-                    Dim strFile As String = IO.Path.Combine(Path.GetTempPath, (subj + ".msg").Replace(":", ""))
-                    strFile = strFile.Replace("?", "")
-                    strFile = strFile.Replace("!", "")
-                    strFile = strFile.Replace("%", "")
-                    strFile = strFile.Replace("$", "")
-                    LOGGER.Info("Drop of msg - File:" & strFile)
                     Try
-                        myobj.SaveAs(strFile)
+                        oApp = New Outlook.Application()
-                    Catch ex As Exception
+                    Catch ex As System.Exception
-                        MsgBox("Error in Save Email2Tempfile" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                        MsgBox("Fehler beim Initialisieren der Outlook-API:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                        Return False
+                        GoTo CheckFileDrop
                     End Try
 
-                    ReDim Preserve files_dropped(i)
+                    Dim explorer = oApp.ActiveExplorer
-                    files_dropped(i) = "@OUTLOOK_MESSAGE@" & strFile
+                    If explorer IsNot Nothing AndAlso explorer.Selection IsNot Nothing AndAlso explorer.Selection.Count > 0 Then
-                Next
+                        LOGGER?.Debug("Drop of msg (Outlook Explorer Selection)")
-                Return True
+                        For i As Integer = 1 To explorer.Selection.Count
-                'Drop eines Outlook Attachments
+                            Dim myobj As Object = explorer.Selection.Item(i)
+                            If myobj Is Nothing Then Continue For
+                            SaveMailItemToTemp(myobj)
+                        Next
+                        Return True
+                    Else
+                        Dim inspector = oApp.ActiveInspector
+                        If inspector IsNot Nothing AndAlso inspector.CurrentItem IsNot Nothing Then
+                            LOGGER?.Debug("Drop of msg (ActiveInspector.CurrentItem) Fallback")
+                            SaveMailItemToTemp(inspector.CurrentItem)
+                            Return True
+                        Else
+                            LOGGER?.Warn("Outlook: Keine Auswahl im Explorer und kein ActiveInspector.CurrentItem verfügbar.")
+                            ' Namen loggen – aber zurück zum FileDrop-Fallback
+                            If hasFileNameW Then
+                                Dim namesObj As Object = e.Data.GetData(If(e.Data.GetDataPresent("FileNameW"), "FileNameW", "FileName"), True)
+                                Dim names As String() = TryCast(namesObj, String())
+                                If names Is Nothing Then
+                                    Dim nameSingle As String = TryCast(namesObj, String)
+                                    If Not String.IsNullOrWhiteSpace(nameSingle) Then
+                                        LOGGER?.Warn("Vorgeschlagener Name (ohne Inhalt): " & nameSingle)
+                                    End If
+                                Else
+                                    LOGGER?.Warn("Vorgeschlagene Namen (ohne Inhalt): " & String.Join("; ", names))
+                                End If
+                            End If
+                            GoTo CheckFileDrop
+                        End If
+                    End If
+                Catch ex As System.Exception
+                    LOGGER?.Warn("Outlook MSG-Drop Fehler: " & ex.Message)
+                End Try
             End If
 
-        Catch ex As Exception
+CheckFileDrop:
+            '4) Filesystem FileDrop (klassisch ODER WebView2 delayed rendering)
+            If hasFileDrop Then
+                If HandleFileDrop(e) Then Return True
+                ScheduleOutlookComFallback()
+                Return True
+            End If
+
+            '5) SCAN-StringFormat
+            If e.Data.GetDataPresent(DataFormats.StringFormat) Then
+                Dim Wert As String = TryCast(e.Data.GetData(DataFormats.StringFormat), String)
+                If Not String.IsNullOrEmpty(Wert) Then
+                    Dim idx As Integer = files_dropped.Length
+                    ReDim Preserve files_dropped(idx)
+                    files_dropped(idx) = "@SCAN@" & Wert
+                    Return True
+                End If
+            End If
+
+        Catch ex As System.Exception
             MsgBox("Unexpected Error in Drop_File: " & ex.Message, MsgBoxStyle.Critical)
         End Try
-        If e.Data.GetDataPresent(DataFormats.StringFormat) Then
+
-            Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
+        LOGGER?.Warn("Drop_File: Kein extrahierbarer Inhalt. Bitte Attachment aus der Nachrichtenliste ziehen oder zunächst speichern.")
-            Console.WriteLine(Wert)
+        Return False
-            ReDim Preserve files_dropped(0)
-            files_dropped(0) = "@SCAN@" & Wert
-            Return True
-        End If
 
 
     End Function
+    ' FileDrop defensiv behandeln – erst ohne, dann mit autoConvert
+    Private Shared Function HandleFileDrop(e As DragEventArgs) As Boolean
+        Try
+            ' Versuch1: ohne AutoConvert
+            Dim rawObj As Object = e.Data.GetData(DataFormats.FileDrop)
+            Dim rawFiles As String() = TryCast(rawObj, String())
+            If Not (rawFiles Is Nothing OrElse rawFiles.Length = 0) Then
+                For Each f In rawFiles
+                    LOGGER?.Info("FileDrop (raw) - File: " & f)
+                    AppendDroppedFile("@DROPFROMFSYSTEM@", f)
+                Next
+                Return True
+            End If
+
+            ' Versuch2: mit AutoConvert (delayed rendering)
+            Dim convObj As Object = e.Data.GetData(DataFormats.FileDrop, True)
+            Dim convFiles As String() = TryCast(convObj, String())
+            If Not (convFiles Is Nothing OrElse convFiles.Length = 0) Then
+                For Each f In convFiles
+                    LOGGER?.Info("FileDrop (autoConvert) - File: " & f)
+                    AppendDroppedFile("@DROPFROMFSYSTEM@", f)
+                Next
+                Return True
+            End If
+
+            LOGGER?.Warn("FileDrop vorhanden, aber keine Dateien (raw/autoConvert leer).")
+            Return False
+        Catch ex As System.Exception
+            LOGGER?.Warn("HandleFileDrop Fehler: " & ex.Message)
+            Return False
+        End Try
+    End Function
+    Private Shared Sub AppendDroppedFile(prefix As String, filePath As String)
+        Dim idx As Integer = files_dropped.Length
+        ReDim Preserve files_dropped(idx)
+        files_dropped(idx) = prefix & filePath
+    End Sub
+
+    Private Shared Sub SaveMailItemToTemp(ByVal mailObj As Object)
+        Dim subj As String = ""
+        Try
+            subj = mailObj.Subject
+        Catch
+            subj = "NO_SUBJECT"
+        End Try
+        If String.IsNullOrWhiteSpace(subj) Then subj = "NO_SUBJECT"
+
+        Dim safeName = subj.Replace("\", "-").Replace("/", "-").Replace(":", "") _
+                          .Replace("?", "").Replace("!", "").Replace("%", "").Replace("$", "")
+        Dim strFile As String = IO.Path.Combine(Path.GetTempPath(), safeName & ".msg")
+        LOGGER?.Info("Drop of msg - File:" & strFile)
+        Try
+            mailObj.SaveAs(strFile)
+            AppendDroppedFile("@OUTLOOK_MESSAGE@", strFile)
+        Catch ex As System.Exception
+            MsgBox("Error in Save Email2Tempfile" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Shared Sub ScheduleOutlookComFallback()
+        Try
+            Dim t As New Threading.Thread(
+                Sub()
+                    Try
+                        Threading.Thread.Sleep(200)
+                        Dim maxRetries As Integer = 10
+                        Dim saved As Boolean = False
+                        For attempt As Integer = 1 To maxRetries
+                            If TrySaveSelectedMailViaOutlook() Then
+                                LOGGER?.Info("Outlook COM Fallback: Mail gespeichert. Versuch " & attempt)
+                                saved = True
+                                Exit For
+                            End If
+                            LOGGER?.Debug("Outlook COM Fallback: Keine Auswahl, Retry " & attempt)
+                            Threading.Thread.Sleep(200)
+                        Next
+
+                        If saved Then
+                            ' UI-Thread benachrichtigen
+                            Dim uiForm = If(System.Windows.Forms.Application.OpenForms.Count > 0, System.Windows.Forms.Application.OpenForms(0), Nothing)
+                            If uiForm IsNot Nothing Then
+                                uiForm.BeginInvoke(
+                                    Sub()
+                                        Try
+                                            RaiseEvent FilesDroppedReady(files_dropped)
+                                        Catch ex2 As System.Exception
+                                            LOGGER?.Warn("FilesDroppedReady Invoke Fehler: " & ex2.Message)
+                                        End Try
+                                    End Sub)
+                            Else
+                                ' Falls kein Form verfügbar, zumindest Event auslösen (Listener müssen ggf. selbst marshalen)
+                                RaiseEvent FilesDroppedReady(files_dropped)
+                            End If
+                        Else
+                            LOGGER?.Warn("Outlook COM Fallback: Nach Retries keine Mail gespeichert.")
+                        End If
+                    Catch ex As System.Exception
+                        LOGGER?.Warn("Outlook COM Fallback Thread Fehler: " & ex.Message)
+                    End Try
+                End Sub
+            )
+            t.IsBackground = True
+            t.SetApartmentState(Threading.ApartmentState.STA)
+            t.Start()
+        Catch ex As System.Exception
+            LOGGER?.Warn("ScheduleOutlookComFallback Fehler: " & ex.Message)
+        End Try
+    End Sub
+
+    Private Shared Function TrySaveSelectedMailViaOutlook() As Boolean
+        Try
+            Dim oApp As Outlook.Application = Nothing
+            Try
+                oApp = New Outlook.Application()
+            Catch ex As System.Exception
+                LOGGER?.Warn("Outlook COM Init fehlgeschlagen: " & ex.Message)
+                Return False
+            End Try
+
+            Dim savedAny As Boolean = False
+
+            Dim inspector = oApp.ActiveInspector
+            If inspector IsNot Nothing AndAlso inspector.CurrentItem IsNot Nothing Then
+                LOGGER?.Debug("Fallback: ActiveInspector.CurrentItem speichern")
+                SaveMailItemToTemp(inspector.CurrentItem)
+                savedAny = True
+            End If
+
+            If Not savedAny Then
+                Dim explorer = oApp.ActiveExplorer
+                If explorer IsNot Nothing AndAlso explorer.Selection IsNot Nothing AndAlso explorer.Selection.Count > 0 Then
+                    LOGGER?.Debug("Fallback: Explorer.Selection speichern")
+                    For i As Integer = 1 To explorer.Selection.Count
+                        Dim myobj As Object = explorer.Selection.Item(i)
+                        If myobj Is Nothing Then Continue For
+                        SaveMailItemToTemp(myobj)
+                        savedAny = True
+                    Next
+                End If
+            End If
+
+            Return savedAny
+        Catch ex As System.Exception
+            LOGGER?.Warn("TrySaveSelectedMailViaOutlook Fehler: " & ex.Message)
+            Return False
+        End Try
+    End Function
+
     Public Shared Sub Drag_enter(e As DragEventArgs)
         Try
             My.Settings.WD_INDEXDOKART_SAVE = ""
-            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+
-                e.Effect = DragDropEffects.All
+            Dim hasOutlookUnicode As Boolean = e.Data.GetDataPresent("FileGroupDescriptorW")
-                LOGGER.Debug("DragEnter ... SimpleFileDrop")
+            Dim hasOutlookAnsi As Boolean = e.Data.GetDataPresent("FileGroupDescriptor")
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... SimpleFileDrop")
+            Dim hasOutlookDescriptor As Boolean = hasOutlookUnicode OrElse hasOutlookAnsi
-            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
+
+            Dim hasChromiumMime As Boolean = e.Data.GetDataPresent("Chromium Web Custom MIME Data Format")
+            Dim hasFileNameW As Boolean = e.Data.GetDataPresent("FileNameW") OrElse e.Data.GetDataPresent("FileName")
+            Dim hasOutlookLike As Boolean = hasOutlookDescriptor OrElse hasChromiumMime OrElse hasFileNameW
+
+            Dim hasFileDrop As Boolean = e.Data.GetDataPresent(DataFormats.FileDrop)
+
+            If hasOutlookLike Then
                 e.Effect = DragDropEffects.Copy
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... Attachment from Outlook")
+                LOGGER?.Debug("DragEnter ... Outlook/WebView2 erkannt (Descriptor/Chromium/FileNameW)")
-                LOGGER.Debug("DragEnter ... Attachment from Outlook")
+            ElseIf hasFileDrop Then
-            ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
-                'handle a message dragged from Outlook
                 e.Effect = DragDropEffects.Copy
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... OutlookMessage")
+                LOGGER?.Debug("DragEnter ... SimpleFileDrop")
-                LOGGER.Debug("DragEnter ... OutlookMessage")
             Else
-                'otherwise, do not handle
+                e.Effect = DragDropEffects.None
-                e.Effect = DragDropEffects.Copy
+                LOGGER?.Debug("DragEnter ... Other FileFormat")
-                'frmForm_Constructor.tslblStatusMain_show(True, "DragEnter ... Other FileFormat")
-                LOGGER.Debug("DragEnter ... Other FileFormat")
             End If
-        Catch ex As Exception
+
+            LOGGER?.Debug("DragEnter Formats: " & String.Join(", ", e.Data.GetFormats()))
+        Catch ex As System.Exception
 
         End Try
     End Sub

app/DD-Record-Organizer/frmNodeNavigation.Designer.vb

@@ -46,15 +46,12 @@ Partial Class frmNodeNavigation
         Me.tsitmDMSReadOnly = New DevExpress.XtraBars.BarStaticItem()
         Me.bsiNotification = New DevExpress.XtraBars.BarStaticItem()
         Me.bsiDocIDChanged = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem()
         Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
-        Me.FindNode = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RPGNodes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.SplitContainerTreeList = New DevExpress.XtraEditors.SplitContainerControl()
@@ -169,7 +166,7 @@ Partial Class frmNodeNavigation
         'ribbonNodeNavigation
         '
         Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0
-        Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly, Me.bsiNotification, Me.bsiDocIDChanged, Me.BarEditItem1, Me.FindNode})
+        Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly, Me.bsiNotification, Me.bsiDocIDChanged})
         Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0)
         Me.ribbonNodeNavigation.MaxItemId = 30
         Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation"
@@ -181,7 +178,7 @@ Partial Class frmNodeNavigation
         Me.ribbonNodeNavigation.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[True]
         Me.ribbonNodeNavigation.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.ribbonNodeNavigation.ShowToolbarCustomizeItem = False
-        Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1151, 147)
+        Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1151, 158)
         Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1
         Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False
         '
@@ -336,27 +333,14 @@ Partial Class frmNodeNavigation
         Me.bsiDocIDChanged.Name = "bsiDocIDChanged"
         Me.bsiDocIDChanged.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
-        'BarEditItem1
-        '
-        Me.BarEditItem1.Caption = "NodeGUID"
-        Me.BarEditItem1.Edit = Me.RepositoryItemTextEdit1
-        Me.BarEditItem1.Id = 28
-        Me.BarEditItem1.Name = "BarEditItem1"
-        '
         'RepositoryItemTextEdit1
         '
         Me.RepositoryItemTextEdit1.AutoHeight = False
         Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1"
         '
-        'FindNode
-        '
-        Me.FindNode.Caption = "BarButtonItem19"
-        Me.FindNode.Id = 29
-        Me.FindNode.Name = "FindNode"
-        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RPGNodes, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup2})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RPGNodes, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult})
         Me.RibbonPage1.Name = "RibbonPage1"
         Me.RibbonPage1.Text = "Node Navigation"
         '
@@ -395,13 +379,6 @@ Partial Class frmNodeNavigation
         Me.RibbonPageGroupDocResult.Name = "RibbonPageGroupDocResult"
         Me.RibbonPageGroupDocResult.Text = "Dateien"
         '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarEditItem1)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.FindNode)
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
-        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
@@ -412,10 +389,10 @@ Partial Class frmNodeNavigation
         Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocIDChanged)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 566)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 567)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1151, 23)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1151, 22)
         '
         'RibbonPage2
         '
@@ -437,7 +414,7 @@ Partial Class frmNodeNavigation
         '
         Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch)
         Me.SplitContainerTreeList.Panel2.Text = "Panel2"
-        Me.SplitContainerTreeList.Size = New System.Drawing.Size(776, 419)
+        Me.SplitContainerTreeList.Size = New System.Drawing.Size(776, 409)
         Me.SplitContainerTreeList.SplitterPosition = 229
         Me.SplitContainerTreeList.TabIndex = 2
         '
@@ -479,7 +456,7 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.OptionsView.ShowVertLines = False
         Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark
         Me.TreeListDevexpress.ParentFieldName = "PARENT_GUID"
-        Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 419)
+        Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 409)
         Me.TreeListDevexpress.StateImageList = Me.ImageCollection1
         Me.TreeListDevexpress.TabIndex = 1
         '
@@ -503,7 +480,7 @@ Partial Class frmNodeNavigation
         '
         Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch)
         Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2"
-        Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(535, 419)
+        Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(537, 409)
         Me.SplitContainerDocumentSearch.SplitterPosition = 133
         Me.SplitContainerDocumentSearch.TabIndex = 1
         '
@@ -514,7 +491,7 @@ Partial Class frmNodeNavigation
         Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlControls.Location = New System.Drawing.Point(0, 0)
         Me.pnlControls.Name = "pnlControls"
-        Me.pnlControls.Size = New System.Drawing.Size(535, 133)
+        Me.pnlControls.Size = New System.Drawing.Size(537, 133)
         Me.pnlControls.TabIndex = 0
         '
         'GridControlDocSearch
@@ -528,7 +505,7 @@ Partial Class frmNodeNavigation
         Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
         Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
         Me.GridControlDocSearch.Name = "GridControlDocSearch"
-        Me.GridControlDocSearch.Size = New System.Drawing.Size(535, 274)
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(537, 266)
         Me.GridControlDocSearch.TabIndex = 8
         Me.GridControlDocSearch.TabStop = False
         Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@@ -538,7 +515,7 @@ Partial Class frmNodeNavigation
         Me.cmsResultFileDetail.ImageScalingSize = New System.Drawing.Size(18, 18)
         Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWorkMultiple_Lock, Me.tsmiFileInWorkMultiple_Free, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.TsmitmJumpToFilestore, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete})
         Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles"
-        Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 440)
+        Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 418)
         '
         'tsmiFileProperties
         '
@@ -754,7 +731,7 @@ Partial Class frmNodeNavigation
         '
         Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
         Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 147)
+        Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158)
         Me.SplitContainerDocView.Name = "SplitContainerDocView"
         '
         'SplitContainerDocView.Panel1
@@ -766,7 +743,7 @@ Partial Class frmNodeNavigation
         '
         Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer)
         Me.SplitContainerDocView.Panel2.Text = "Panel2"
-        Me.SplitContainerDocView.Size = New System.Drawing.Size(1151, 419)
+        Me.SplitContainerDocView.Size = New System.Drawing.Size(1151, 409)
         Me.SplitContainerDocView.SplitterPosition = 776
         Me.SplitContainerDocView.TabIndex = 0
         '
@@ -777,7 +754,7 @@ Partial Class frmNodeNavigation
         Me.DocumentViewer.FileLoaded = False
         Me.DocumentViewer.Location = New System.Drawing.Point(0, 0)
         Me.DocumentViewer.Name = "DocumentViewer"
-        Me.DocumentViewer.Size = New System.Drawing.Size(363, 419)
+        Me.DocumentViewer.Size = New System.Drawing.Size(365, 409)
         Me.DocumentViewer.TabIndex = 0
         Me.DocumentViewer.Viewer_ForceTemporaryMode = False
         '
@@ -1242,8 +1219,5 @@ Partial Class frmNodeNavigation
     Friend WithEvents DD_DMSDataSet1 As DD_DMSDataSet
     Friend WithEvents bsiDocIDChanged As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents TsmitmJumpToFilestore As ToolStripMenuItem
-    Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem
     Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
-    Friend WithEvents FindNode As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -222,6 +222,12 @@ Public Class frmNodeNavigation
         End Try
 
         Await Load_nodes()
+        AddHandler ClassDragDrop.FilesDroppedReady, Sub(files As String())
+                                                        ' Hier deine bisherige Verarbeitung von files_dropped triggern.
+                                                        ' Beispiel:
+                                                        LOGGER?.Info("FilesDroppedReady: " & String.Join("; ", files))
+                                                        ' ... bestehende Routine aufrufen ...
+                                                    End Sub
     End Function
     Private Async Function Load_nodes() As Task
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
@@ -2124,115 +2130,96 @@ Public Class frmNodeNavigation
     End Sub
 #Region "Dropping Files"
     Sub Drag_Enter(e As DragEventArgs)
-        If _EntityId <> 0 Then
+        If _EntityId = 0 Then
-            If WM_READ_ONLY = False Then
-                ClassDragDrop.Drag_enter(e)
-            Else
-                Update_Notification_Label(True, "READ ONLY ACCESS", "Yellow")
-            End If
-        Else
             Update_Notification_Label(True, "No entity selected", "Yellow")
+            e.Effect = DragDropEffects.None
+            Exit Sub
         End If
+
+        If WM_READ_ONLY Then
+            Update_Notification_Label(True, "READ ONLY ACCESS", "Yellow")
+            e.Effect = DragDropEffects.None
+            Exit Sub
+        End If
+
+        ' Delegiere die Priorisierung (Outlook > FileDrop) an die zentrale Routine
+        ClassDragDrop.Drag_enter(e)
     End Sub
     Private Async Function Drag_Drop(e As DragEventArgs) As Task
         Try
-            If ClassDragDrop.Drop_File(e) = False Then
+            ' Basis-Prechecks – bevor wir irgendetwas verarbeiten
-                Exit Function
-            End If
             If USER_PERSONIFIED_TEST = True Then
                 ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using orgFLOW in personified mode! Adding files is not allowed!")
                 Exit Function
             End If
+
             If WMMOD.SessionLoggedin = False Then
                 ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart orgFLOW afterwards.", "Could not create a windream session!")
                 Exit Function
             End If
-            If _EntityId <> 0 And (RIGHT_READ_ONLY_DOC = False And GridControlDocSearch.ContextMenuStrip.Name = "ContextMenuStripResultFiles") Or RIGHT_ADD_DOC = True Then
-                Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
-                Dim count_DT = MYDB_ECM.GetScalarValue(sql)
-                If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
-                    MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
-                    Exit Function
-                ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
-                    sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
-                    count_DT = MYDB_ECM.GetScalarValue(sql)
-                    If count_DT = 0 Then
-                        MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
-                        Exit Function
-                    End If
-                End If
-                If RECORD_CHANGED = True Then
-                    If Save_Record() = False Then
-                        Exit Function
-                    End If
-                End If
-                CURRENT_CONTROL_DOCTYPE_MATCH = 0
-                If CONTROL_DOCTYPE_MATCH <> 0 Then
-                    Try
-                        CURRENT_CONTROL_DOCTYPE_MATCH = ""
-                        CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(CURRENT_RECORD_ID, CONTROL_DOCTYPE_MATCH)
-                    Catch ex As Exception
-                        NNLogger.Error(ex)
-                        CURRENT_CONTROL_DOCTYPE_MATCH = 0
-                        CURRENT_CONTROL_DOCTYPE_MATCH = ""
-                    End Try
 
-                End If
+            ' Rechte-/Kontextprüfung
-
+            If Not (_EntityId <> 0 AndAlso ((RIGHT_READ_ONLY_DOC = False AndAlso GridControlDocSearch.ContextMenuStrip.Name = "ContextMenuStripResultFiles") OrElse RIGHT_ADD_DOC = True)) Then
-                DROPPED_CHECKED = False
-                If e.Data.GetDataPresent(DataFormats.StringFormat) Then
-                    Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
-                    Console.WriteLine("DragDrop-Wert: " & Wert)
-                    If Wert.Contains("SCAN") Then
-                        Dim split() = Wert.Split(";")
-                        If IsNumeric(split(1)) Then
-                            CURRENT_FILEID = split(1)
-
-                            CURRENT_FORMVIEW_ID = FORMVIEW_ID
-                            ClassHelper.Create_USER_FILE_TABLE()
-                            If Not IsNothing(CURRENT_TBPMO_FILES_USER) Then
-                                If CURRENT_TBPMO_FILES_USER.Rows.Count > 0 Then
-                                    frmWM_IndexFile.ShowDialog()
-                                End If
-                            End If
-
-                            'RUN_WD_SEARCH(WD_Suche, "RECORD")
-                        End If
-                    ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
-                        If ClassDragDrop.Drop_File(e) = True Then
-                            Check_Dropped_Files()
-                        End If
-                    ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
-                        If ClassDragDrop.Drop_File(e) = True Then
-                            Check_Dropped_Files()
-                        End If
-                    End If
-                Else
-                    If ClassDragDrop.Drop_File(e) = True Then
-                        Check_Dropped_Files()
-                    End If
-
-                End If
-                'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren
-                If NEW_FILES_ADDED = True Then
-                    Me.Cursor = Cursors.WaitCursor
-                    Await RUN_DOCSEARCH(True)
-                    ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
-                    TimerClearResultfiles.Start()
-                Else
-                    NNLogger.Debug("No new files were added or windream tab is not focused!")
-                End If
-                Me.Cursor = Cursors.Default
-            Else
-                'If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
-                '    NNLogger.Warn("RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed")
-                'End If
                 If RIGHT_READ_ONLY_DOC = True Then
                     NNLogger.Warn("RIGHT_WD_FORBIDDEN is set! No DragDrop allowed")
                 Else
                     NNLogger.Warn("No DragDrop allowed - ELSE")
                 End If
+                Exit Function
+            End If
 
+            ' Dokumenttypen-Konfiguration prüfen (wie gehabt)
+            Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID
+            Dim count_DT = MYDB_ECM.GetScalarValue(sql)
+            If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then
+                MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                Exit Function
+            ElseIf count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
+                sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORM_ID = " & CURRENT_ENTITY_REDUNDANT_ID
+                count_DT = MYDB_ECM.GetScalarValue(sql)
+                If count_DT = 0 Then
+                    MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
+                    Exit Function
+                End If
+            End If
+
+            ' Ungespeicherte Änderungen sichern
+            If RECORD_CHANGED = True Then
+                If Save_Record() = False Then Exit Function
+            End If
+
+            ' Doctype-Match ermitteln (wie gehabt)
+            CURRENT_CONTROL_DOCTYPE_MATCH = 0
+            If CONTROL_DOCTYPE_MATCH <> 0 Then
+                Try
+                    CURRENT_CONTROL_DOCTYPE_MATCH = ""
+                    CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(CURRENT_RECORD_ID, CONTROL_DOCTYPE_MATCH)
+                Catch ex As Exception
+                    NNLogger.Error(ex)
+                    CURRENT_CONTROL_DOCTYPE_MATCH = 0
+                    CURRENT_CONTROL_DOCTYPE_MATCH = ""
+                End Try
+            End If
+
+            DROPPED_CHECKED = False
+
+            ' Zentrale Verarbeitung: genau EIN Aufruf – Outlook/Filesystem/SCAN wird intern erkannt und geschrieben
+            If ClassDragDrop.Drop_File(e) = False Then
+                NNLogger.Debug("Drag_Drop: No supported data format detected by ClassDragDrop.")
+                Exit Function
+            End If
+
+            ' Nach erfolgreichem Drop die User-File-Tabelle konsolidieren und ggf. Indexdialog öffnen
+            Check_Dropped_Files()
+
+            ' Falls Dateien hinzugefügt wurden, Ergebnisliste aktualisieren
+            If NEW_FILES_ADDED = True Then
+                Me.Cursor = Cursors.WaitCursor
+                Await RUN_DOCSEARCH(True)
+                ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID)
+                TimerClearResultfiles.Start()
+            Else
+                NNLogger.Debug("No new files were added or windream tab is not focused!")
             End If
         Catch ex As Exception
             NNLogger.Error(ex)
@@ -3750,14 +3737,4 @@ Public Class frmNodeNavigation
             MessageBox.Show("Unerwarteter Fehler beim Springen zum Filestore-Knoten: " & ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error)
         End Try
     End Sub
-
-    Private Sub FindNode_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles FindNode.ItemClick
-        Dim oNode = TreeListDevexpress.FindNodeByFieldValue("GUID", BarEditItem1.EditValue)
-        If Not IsNothing(oNode) Then
-            TreeListDevexpress.FocusedNode = oNode
-            TreeListDevexpress.MakeNodeVisible(oNode)
-        Else
-            MessageBox.Show("Knoten nicht gefunden!", "Knoten nicht gefunden", MessageBoxButtons.OK, MessageBoxIcon.Warning)
-        End If
-    End Sub
 End Class