jj: show results over search start

GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb

@@ -30,7 +30,7 @@ Partial Class frmDocumentResultList
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
         Me.labelResultCount = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonBack = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroupNavigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -75,7 +75,7 @@ Partial Class frmDocumentResultList
         'RibbonControl
         '
         Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonItem4, Me.BarButtonItem5})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonItem5})
         Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl.MaxItemId = 11
         Me.RibbonControl.Name = "RibbonControl"
@@ -142,13 +142,13 @@ Partial Class frmDocumentResultList
         Me.labelResultCount.Id = 8
         Me.labelResultCount.Name = "labelResultCount"
         '
-        'BarButtonItem4
+        'BarButtonBack
         '
-        Me.BarButtonItem4.Caption = "Zurück"
+        Me.BarButtonBack.Caption = "Zurück"
-        Me.BarButtonItem4.Id = 9
+        Me.BarButtonBack.Id = 9
-        Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonBack.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.BarButtonBack.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem4.Name = "BarButtonItem4"
+        Me.BarButtonBack.Name = "BarButtonBack"
         '
         'BarButtonItem5
         '
@@ -166,7 +166,7 @@ Partial Class frmDocumentResultList
         'RibbonPageGroupNavigation
         '
         Me.RibbonPageGroupNavigation.AllowTextClipping = False
-        Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonItem4)
+        Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonBack)
         Me.RibbonPageGroupNavigation.Name = "RibbonPageGroupNavigation"
         Me.RibbonPageGroupNavigation.Text = "Navigation"
         '
@@ -440,7 +440,7 @@ Partial Class frmDocumentResultList
     Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog
-    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonBack As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroupNavigation As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents EigenschaftenToolStripMenuItem As Windows.Forms.ToolStripMenuItem

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -62,9 +62,7 @@ Public Class frmDocumentResultList
             SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
             SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
 
-            If _IsLegacy = True Then
+            If _IsLegacy = False Then
-                RibbonPageGroupNavigation.Visible = True
-            Else
                 ' Location and size will be managed by the ZooFlow Search Window
                 If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
                     If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then
@@ -75,10 +73,8 @@ Public Class frmDocumentResultList
                     End If
                 End If
 
-                RibbonPageGroupNavigation.Visible = False
                 SwitchMainContainerHorizontal.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                 SwitchDetailContainerHorizontal.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-
             End If
 
             RibbonControl.Minimized = True
@@ -569,7 +565,7 @@ Public Class frmDocumentResultList
         UpdateGridHeader(_ResultLists, 2, oRowCount)
     End Sub
 
-    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonBack.ItemClick
         ShouldReturnToPreviousForm = True
         Close()
     End Sub

GUIs.ZooFlow/frmSearchStart.vb

@@ -567,17 +567,34 @@ Public Class frmSearchStart
     End Function
 
     Private Sub BarButtonStartSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonStartSearch.ItemClick
+        Prepare_Search()
+    End Sub
+
+    Private Sub Prepare_Search()
         RenewSearchAttributes()
 
         ' Minimize the search form, but only if results were found
         If Start_Search() Then
-            MinimizeSearchForm()
+            Hide()
 
             ' Position Result Window below this window
             LastSearchForm.Location = GetResultFormLocation()
             LastSearchForm.Size = GetResultFormSize()
+
+            AddHandler LastSearchForm.FormClosed, AddressOf LastSearchForm_FormClosed
         End If
     End Sub
+
+    Private Sub LastSearchForm_FormClosed(sender As Object, e As EventArgs)
+        If LastSearchForm.ShouldReturnToPreviousForm = True Then
+            Show()
+            LastSearchForm = Nothing
+        Else
+            Close()
+            LastSearchForm = Nothing
+        End If
+    End Sub
+
     Private Function Start_Search() As Boolean
         Dim oHandle As IOverlaySplashScreenHandle = Nothing
         Dim oItemsFound As Boolean = False
@@ -620,10 +637,6 @@ Public Class frmSearchStart
                     Dim oForm As New frmDocumentResultList(My.LogConfig, oEnvironment, oParams)
                     oForm.Show()
 
-                    AddHandler oForm.FormClosed, Sub()
-                                                     LastSearchForm = Nothing
-                                                 End Sub
-
                     LastSearchForm = oForm
                 End If
 
@@ -641,42 +654,35 @@ Public Class frmSearchStart
     End Function
 
     Private Function GetResultFormLocation() As Point
-        Dim oX = Location.X
+        Return Location
-        Dim oY = Location.Y + Size.Height
-
-        Return New Point(oX, oY)
     End Function
 
     Private Function GetResultFormSize() As Size
-        Dim oWidth = Size.Width
+        Return Size
-        ' TODO: Smarter height calculation, maybe depending on screen height and parent form location
-        Dim oHeight = 400
-
-        Return New Size(oWidth, oHeight)
     End Function
 
     Private Sub frmSearchStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
         If e.KeyCode = Keys.F2 Then
-            Start_Search()
+            Prepare_Search()
         End If
     End Sub
 
-    Private Sub MinimizeSearchForm()
+    'Private Sub MinimizeSearchForm()
-        HeightBeforeMinimizing = Height
+    '    HeightBeforeMinimizing = Height
-        Height = 200
+    '    Height = 200
 
-        BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+    '    BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
-    End Sub
+    'End Sub
 
-    Private Sub RestoreSearchForm()
+    'Private Sub RestoreSearchForm()
-        Height = HeightBeforeMinimizing
+    '    Height = HeightBeforeMinimizing
 
-        If LastSearchForm IsNot Nothing Then
+    '    If LastSearchForm IsNot Nothing Then
-            LastSearchForm.Location = GetResultFormLocation()
+    '        LastSearchForm.Location = GetResultFormLocation()
-        End If
+    '    End If
 
-        BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+    '    BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-    End Sub
+    'End Sub
 
 
 
@@ -710,11 +716,11 @@ Public Class frmSearchStart
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        RestoreSearchForm()
+        'RestoreSearchForm()
     End Sub
 
     Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
-        RestoreSearchForm()
+        'RestoreSearchForm()
     End Sub
 
     Private Sub RibbonControl1_MinimizedRibbonHiding(sender As Object, e As DevExpress.XtraBars.Ribbon.MinimizedRibbonEventArgs) Handles RibbonControl1.MinimizedRibbonHiding

Modules.Database/MSSQLServer.vb

@@ -213,6 +213,12 @@ Public Class MSSQLServer
         Return ExecuteNonQuery(SQLCommand, _Timeout)
     End Function
 
+    Public Async Function ExecuteNonQueryAsync(SQLCommand As String) As Task(Of Boolean)
+        Return Await Task.Run(Function()
+                                  Return ExecuteNonQuery(SQLCommand, _Timeout)
+                              End Function)
+    End Function
+
     Public Function GetScalarValue(SQLCommand As String, Timeout As Integer) As Object Implements IDatabase.GetScalarValue
         Try
             If TestCanConnect() = False Then