Version 0.11.0.0

GUIs.Monitor/My Project/AssemblyInfo.vb

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Monitor")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("0.10.0.0")>
+<Assembly: AssemblyTrademark("0.11.0.0")>
 <Assembly: AssemblyCulture("")>
 
 ' Setting ComVisible to false makes the types in this assembly not visible 
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 ' [assembly: AssemblyVersion("1.0.*")]
-<Assembly: AssemblyVersion("0.10.0.0")>
+<Assembly: AssemblyVersion("0.11.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

GUIs.Monitor/frmMonitor.vb

@@ -52,8 +52,6 @@ Public Class frmMonitor
 
     Private MarkedColumns As New List(Of GridColumn)
     Private ActiveSearch As Search = Nothing
-    'Private LastSearch As Search = Nothing
-    'Private LastLoadedSearch As Search = Nothing
 
     Private GridBuilder As GridBuilder
     Private ControlHelper As Common.ControlHelper
@@ -150,7 +148,7 @@ Public Class frmMonitor
             SplitContainerSQL.Collapsed = True
             SplitContainerFileHTML.Collapsed = True
 
-            lbResultCount.Caption = String.Format(lbResultCount.Tag, 0)
+            SetResultCount(0)
 
         Catch ex As Exception
             FormHelper.ShowErrorMessage(ex, "frmStart_Load")
@@ -179,10 +177,6 @@ Public Class frmMonitor
 
             Dim oSearch As Search = cmbSearches.EditValue
 
-            'If LastLoadedSearch IsNot Nothing AndAlso oSearch.Id = LastLoadedSearch.Id Then
-            '    Workspace.SaveWorkspace(oSearch.Id.ToString)
-            'End If
-
             MarkedColumns.Clear()
             HideAllTabs()
 
@@ -235,7 +229,7 @@ Public Class frmMonitor
                                        End Function)
                 Next
 
-                lbResultCount.Caption = String.Format(lbResultCount.Tag, TreeListResults.AllNodesCount)
+                SetResultCount(TreeListResults.AllNodesCount)
             Else
                 GridControlResults.Visible = True
                 GridControlResults.Dock = DockStyle.Fill
@@ -263,13 +257,13 @@ Public Class frmMonitor
                     oColumn.VisibleIndex = -1
                 Next
 
-                lbResultCount.Caption = String.Format(lbResultCount.Tag, GridViewResults.RowCount)
+                SetResultCount(GridViewResults.RowCount)
             End If
 
             GridViewResults.FocusInvalidRow()
+            GridViewResults.BestFitColumns()
 
             Workspace.LoadWorkspace(oSearch.Id.ToString)
-            'LastLoadedSearch = oSearch
 
             btnExportMain.Enabled = True
 
@@ -303,12 +297,6 @@ Public Class frmMonitor
         End Try
     End Sub
 
-
-
-
-
-
-
     Private Sub cmbSearches_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbSearches.SelectedValueChanged
         DisposeTreeList()
         InitTreeList()
@@ -322,7 +310,7 @@ Public Class frmMonitor
         btnExportMain.Enabled = False
         btnExportDetails.Enabled = False
 
-        lbResultCount.Caption = String.Format(lbResultCount.Tag, 0)
+        SetResultCount(0)
 
         LoadSearch()
         HideAllTabs()
@@ -336,11 +324,6 @@ Public Class frmMonitor
 
             Dim oSearch As Search = CType(cmbSearches.SelectedItem, Search)
 
-            'If ActiveSearch IsNot Nothing Then
-            '    Workspace.SaveWorkspace(ActiveSearch.Id.ToString)
-            'End If
-
-            'LastSearch = ActiveSearch
             ActiveSearch = oSearch
 
             AdornerUIManager2.Hide()
@@ -412,8 +395,6 @@ Public Class frmMonitor
             SplitContainerSQL.Collapsed = True
             SplitContainerFileHTML.Collapsed = True
 
-
-
             For Each oSQLCommand As KeyValuePair(Of String, String) In oSQLCommands
                 Try
                     Dim oExtracted = ExtractTitle(oSQLCommand.Value)
@@ -440,8 +421,6 @@ Public Class frmMonitor
                 End Try
             Next
 
-
-
             For Each oFile As KeyValuePair(Of String, String) In oFilePaths
                 Try
                     Dim oExtracted = ExtractTitle(oFile.Value)
@@ -699,11 +678,14 @@ Public Class frmMonitor
     End Sub
 
     Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadSearches.ItemClick
+        Try
+            LoadSearches()
 
-        LoadSearches()
-
-        TreeListResults.DataSource = Nothing
-        GridControlResults.DataSource = Nothing
+            TreeListResults.DataSource = Nothing
+            GridControlResults.DataSource = Nothing
+        Catch ex As Exception
+            FormHelper.ShowErrorMessage(ex, "Suchen neu laden")
+        End Try
     End Sub
 
     Private Sub GridViewResults_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs)
@@ -787,6 +769,11 @@ Public Class frmMonitor
         End Try
     End Sub
 
+    Private Sub GridViewResults_ColumnFilterChanged(sender As Object, e As EventArgs)
+        Dim oView As GridView = sender
+        SetResultCount(oView.DataRowCount)
+    End Sub
+
     Private Sub HideAllTabs()
         Dim oAllTabs = SQLResultTabs.
                 Concat(FileResultTabs).
@@ -799,17 +786,9 @@ Public Class frmMonitor
         SplitContainerFileHTML.Collapsed = True
     End Sub
 
-    'Private Sub frmMonitor_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
-    '    If ActiveSearch IsNot Nothing Then
-    '        Workspace.SaveWorkspace(ActiveSearch.Id.ToString)
-    '    End If
-    'End Sub
-
-    Private Sub btnResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnResetLayout.ItemClick
+    Private Async Sub btnResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnResetLayout.ItemClick
         If ActiveSearch IsNot Nothing Then
             Workspace.ResetWorkspace(ActiveSearch.Id.ToString)
-            'LastLoadedSearch = Nothing
-            'ActiveSearch = Nothing
 
             DisposeTreeList()
             InitTreeList()
@@ -817,12 +796,10 @@ Public Class frmMonitor
             DisposeGrid()
             InitGrid()
 
-            'LoadSearch()
             HideAllTabs()
+            Await LoadData()
 
-            LoadData()
-
-            lbResultCount.Caption = String.Format(lbResultCount.Tag, 0)
+            SetResultCount(0)
         End If
     End Sub
 
@@ -833,11 +810,16 @@ Public Class frmMonitor
         GridControlResults = Nothing
     End Sub
 
+    Private Sub SetResultCount(pResults As Integer)
+        lbResultCount.Caption = String.Format(lbResultCount.Tag, pResults)
+    End Sub
+
     Private Sub InitGrid()
         GridControlResults = GridLoader.InitGrid()
         GridViewResults = DirectCast(GridControlResults.DefaultView, GridView)
 
         AddHandler GridViewResults.FocusedRowChanged, AddressOf GridViewResults_FocusedRowChanged
+        AddHandler GridViewResults.ColumnFilterChanged, AddressOf GridViewResults_ColumnFilterChanged
 
         SplitContainerSQL.Panel1.Controls.Add(GridControlResults)
     End Sub