From ae92ac19ffb4a94872ae143a1119c3118eafe738 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 5 Jul 2022 11:32:01 +0200
Subject: [PATCH] Version 0.4.0.0

---
 GUIs.Monitor/Monitor.vbproj                   |  1 +
 GUIs.Monitor/My Project/AssemblyInfo.vb       |  4 +--
 GUIs.Monitor/My Project/Resources.Designer.vb | 10 ++++++
 GUIs.Monitor/My Project/Resources.resx        | 21 +++++++-----
 GUIs.Monitor/Resources/actions_reload.svg     | 15 ++++++++
 GUIs.Monitor/SearchLoader.vb                  |  2 ++
 GUIs.Monitor/frmMonitor.Designer.vb           | 16 +++++++--
 GUIs.Monitor/frmMonitor.vb                    | 34 +++++++++++++++----
 8 files changed, 83 insertions(+), 20 deletions(-)
 create mode 100644 GUIs.Monitor/Resources/actions_reload.svg

diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj
index 88686a1..66e4d51 100644
--- a/GUIs.Monitor/Monitor.vbproj
+++ b/GUIs.Monitor/Monitor.vbproj
@@ -203,6 +203,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ChartType_Line.ico" />
+    <None Include="Resources\actions_reload.svg" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/GUIs.Monitor/My Project/AssemblyInfo.vb b/GUIs.Monitor/My Project/AssemblyInfo.vb
index 39b419b..b6145ab 100644
--- a/GUIs.Monitor/My Project/AssemblyInfo.vb	
+++ b/GUIs.Monitor/My Project/AssemblyInfo.vb	
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Monitor")>
 <Assembly: AssemblyCopyright("Copyright © 2021")>
-<Assembly: AssemblyTrademark("0.3.0.0")>
+<Assembly: AssemblyTrademark("0.4.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.3.0.0")>
+<Assembly: AssemblyVersion("0.4.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/GUIs.Monitor/My Project/Resources.Designer.vb b/GUIs.Monitor/My Project/Resources.Designer.vb
index 7545747..061d81f 100644
--- a/GUIs.Monitor/My Project/Resources.Designer.vb	
+++ b/GUIs.Monitor/My Project/Resources.Designer.vb	
@@ -60,6 +60,16 @@ Namespace My.Resources
             End Set
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_reload() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_reload", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
diff --git a/GUIs.Monitor/My Project/Resources.resx b/GUIs.Monitor/My Project/Resources.resx
index d6c867b..f9f7c5d 100644
--- a/GUIs.Monitor/My Project/Resources.resx	
+++ b/GUIs.Monitor/My Project/Resources.resx	
@@ -118,22 +118,25 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="charttype_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="charttype_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GUIs.Monitor/Resources/actions_reload.svg b/GUIs.Monitor/Resources/actions_reload.svg
new file mode 100644
index 0000000..b6b1422
--- /dev/null
+++ b/GUIs.Monitor/Resources/actions_reload.svg
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Reload_1_">
+    <path d="M16,4c3.3,0,6.3,1.3,8.5,3.5L28,4v10h-0.2h-4.1H18l3.6-3.6C20.2,8.9,18.2,8,16,8c-4.4,0-8,3.6-8,8s3.6,8,8,8   c3.7,0,6.8-2.6,7.7-6h4.1c-1,5.7-5.9,10-11.8,10C9.4,28,4,22.6,4,16C4,9.4,9.4,4,16,4z" class="Green" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/GUIs.Monitor/SearchLoader.vb b/GUIs.Monitor/SearchLoader.vb
index f6c5fbe..01de6b2 100644
--- a/GUIs.Monitor/SearchLoader.vb
+++ b/GUIs.Monitor/SearchLoader.vb
@@ -40,6 +40,8 @@ Public Class SearchLoader
 
     Public Sub LoadSearches()
         Try
+            Searches.Clear()
+
             Dim oSQL = Config.SearchSQL
             Dim oTable = Database.GetDatatable(oSQL)
 
diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb
index 0e1c5fb..87dd88d 100644
--- a/GUIs.Monitor/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/frmMonitor.Designer.vb
@@ -31,6 +31,7 @@ Partial Class frmMonitor
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem4 = 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()
@@ -149,9 +150,9 @@ Partial Class frmMonitor
         '
         Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 7
+        Me.RibbonControl1.MaxItemId = 8
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
@@ -204,6 +205,13 @@ Partial Class frmMonitor
         Me.BarStaticItem1.Name = "BarStaticItem1"
         Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
+        'BarButtonItem4
+        '
+        Me.BarButtonItem4.Caption = "Suchen neuladen"
+        Me.BarButtonItem4.Id = 7
+        Me.BarButtonItem4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.actions_reload
+        Me.BarButtonItem4.Name = "BarButtonItem4"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
@@ -213,6 +221,7 @@ Partial Class frmMonitor
         'RibbonPageGroup1
         '
         Me.RibbonPageGroup1.ItemLinks.Add(Me.buttonSearch)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "Daten"
         '
@@ -563,7 +572,7 @@ Partial Class frmMonitor
         Me.GridControlResults.MainView = Me.GridViewResults
         Me.GridControlResults.MenuManager = Me.RibbonControl1
         Me.GridControlResults.Name = "GridControlResults"
-        Me.GridControlResults.Size = New System.Drawing.Size(368, 158)
+        Me.GridControlResults.Size = New System.Drawing.Size(351, 158)
         Me.GridControlResults.TabIndex = 5
         Me.GridControlResults.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResults})
         Me.GridControlResults.Visible = False
@@ -852,4 +861,5 @@ Partial Class frmMonitor
     Friend WithEvents AdornerUIManager2 As DevExpress.Utils.VisualEffects.AdornerUIManager
     Friend WithEvents GridControlResults As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridViewResults As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
 End Class
diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb
index ceb4b88..40f29aa 100644
--- a/GUIs.Monitor/frmMonitor.vb
+++ b/GUIs.Monitor/frmMonitor.vb
@@ -115,12 +115,17 @@ Public Class frmMonitor
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
             SearchLoader = New SearchLoader(LogConfig, ConfigManager.Config, Database)
-            GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4, GridViewResults})
-            GridBuilder.
-                WithDefaults().
-                WithDefaults(TreeListResults).
-                WithReadOnlyOptions().
-                WithReadOnlyOptions(TreeListResults)
+            GridBuilder = New GridBuilder()
+
+            Dim oGrids As GridView() = New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4, GridViewResults}.ToArray
+            GridBuilder.SetDefaults(oGrids)
+            GridBuilder.SetClipboardHandler(oGrids)
+            GridBuilder.SetReadOnlyOptions(oGrids)
+
+            GridBuilder.SetDefaults(TreeListResults)
+            GridBuilder.SetClipboardHandler(TreeListResults)
+            GridBuilder.SetReadOnlyOptions(TreeListResults)
+
 
             SQLResultGrids = New List(Of GridControl) From {GridControl1, GridControl2, GridControl3, GridControl4}
             SQLResultTabs = New List(Of XtraTabPage) From {XtraTabPageSQL1, XtraTabPageSQL2, XtraTabPageSQL3, XtraTabPageSQL4}
@@ -282,6 +287,15 @@ Public Class frmMonitor
 
             cmbSearches.Properties.Items.Clear()
             cmbSearches.Properties.Items.AddRange(SearchLoader.Searches)
+
+            If cmbSearches.EditValue IsNot Nothing Then
+                Dim oOldSearch As Search = DirectCast(cmbSearches.EditValue, Search)
+                Dim oNewSearch As Search = SearchLoader.Searches.Where(Function(search) search.Id = oOldSearch.Id).SingleOrDefault()
+
+                If oNewSearch IsNot Nothing Then
+                    cmbSearches.EditValue = oNewSearch
+                End If
+            End If
         Catch ex As Exception
             FormHelper.ShowErrorMessage(ex, "LoadSearches")
         End Try
@@ -764,5 +778,13 @@ Public Class frmMonitor
             End If
         End If
     End Sub
+
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+        SearchLoader.LoadSearchParameters()
+        LoadSearches()
+
+        TreeListResults.DataSource = Nothing
+        GridControlResults.DataSource = Nothing
+    End Sub
 End Class