Prepare for Version 2.0.0.0

app/DD_Clipboard_Searcher/frmResultDoc.vb

@@ -1,15 +1,16 @@
 Imports System.ComponentModel
 Imports System.IO
-Imports System.Runtime.InteropServices
 Imports DevExpress.Utils
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DD_LIB_Standards
-Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraTab
+Imports DD_Clipboard_Watcher.ClassProfileFilter
 
 Public Class frmResultDoc
+    Implements IResultForm
+
 #Region "Laufzeitvariablen & Konstanten"
     Private Shared BW_DocPath As String
     Private Shared BW_DocID As Integer
@@ -20,6 +21,10 @@ Public Class frmResultDoc
     Private _frmProfileMatch As frmProfileMatch 'You need a reference to Form1
     Private _frmSQL As frmResultSQL 'You need a reference to Form1
     Private _activeGridView As GridView
+
+    Private Current_MatchingProfiles As List(Of ProfileData)
+
+    Public Property ShouldReturnToMatchForm As Boolean = False Implements IResultForm.ShouldReturnToMatchForm
 #End Region
     Public Sub New()
         MyBase.New
@@ -30,12 +35,13 @@ Public Class frmResultDoc
         _frmProfileMatch = Nothing
     End Sub
 
-    Public Sub New(ProfileMatchForm As frmProfileMatch)
+    Public Sub New(ProfileMatchForm As frmProfileMatch, MatchingProfiles As List(Of ProfileData))
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         _frmProfileMatch = ProfileMatchForm
+        Current_MatchingProfiles = MatchingProfiles
     End Sub
 
     Private Class DocSearch
@@ -56,10 +62,6 @@ Public Class frmResultDoc
             Size = ConfigManager.Config.ResultDocWindowSize
         End If
 
-        Dim oFrmResultSQL As New frmResultSQL()
-        _frmSQL = oFrmResultSQL
-        _frmSQL.Show()
-
         GridViewDocSearch1.ShowLoadingPanel()
 
         Dim oSearches = Await LoadSearchesAsync()
@@ -82,12 +84,6 @@ Public Class frmResultDoc
         End Try
 
         _frmDocView?.Close()
-        _frmSQL?.Close()
-
-        If CURRENT_MATCHING_PROFILES.Count > 1 Then
-            _frmProfileMatch?.Show()
-            _frmProfileMatch?.BringToFront()
-        End If
     End Sub
 
     Private Async Function LoadSearchesAsync() As Task(Of List(Of DocSearch))
@@ -95,11 +91,8 @@ Public Class frmResultDoc
     End Function
 
     Private Function DoLoadSearches() As List(Of DocSearch)
-        If IsNothing(CurrDocSearch2Load) Then
-            Throw New ApplicationException("CurrDocSearch2Load is empty")
-        End If
-
-        Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({CurrDocSearch2Load}) ORDER BY TAB_INDEX"
+        Dim oMatchingIds = String.Join(",", Current_MatchingProfiles.Select(Function(p) p.Guid).ToArray())
+        Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
         Dim oSearchesDataTable = clsDatabase.Return_Datatable(oSQL)
         Dim oDocSearches As New List(Of DocSearch)
         Dim oCounter As Integer = 0
@@ -618,4 +611,9 @@ Public Class frmResultDoc
         BringToFront()
         CurrSearchOpen = True
     End Sub
+
+    Private Sub btnBackToMatchForm_Click(sender As Object, e As EventArgs) Handles btnBackToMatchForm.Click
+        ShouldReturnToMatchForm = True
+        Close()
+    End Sub
 End Class