From ec13c76f15ee2f77f237610c8b9b36d66c663eee Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 25 Nov 2021 15:52:43 +0100
Subject: [PATCH] Monitor: UI Changes

---
 GUIs.Monitor/Monitor.vbproj                   |   5 +
 GUIs.Monitor/My Project/Resources.Designer.vb |  10 +
 GUIs.Monitor/My Project/Resources.resx        |  21 +-
 GUIs.Monitor/Resources/inserttreeview1.svg    |  17 ++
 GUIs.Monitor/frmMonitor.Designer.vb           | 209 ++++++++----------
 GUIs.Monitor/frmMonitor.resx                  |  77 ++-----
 GUIs.Monitor/frmMonitor.vb                    |  59 +++--
 7 files changed, 187 insertions(+), 211 deletions(-)
 create mode 100644 GUIs.Monitor/Resources/inserttreeview1.svg

diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj
index eef51cf2..4c99f529 100644
--- a/GUIs.Monitor/Monitor.vbproj
+++ b/GUIs.Monitor/Monitor.vbproj
@@ -151,6 +151,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Controls.SQLEditor\SQLEditor.vbproj">
+      <Project>{3e7bc8a9-91ef-49b8-8110-2c01f664c24a}</Project>
+      <Name>SQLEditor</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GUIs.Common\Common.vbproj">
       <Project>{d20a6bf2-c7c6-4a7a-b34d-fa27d775a049}</Project>
       <Name>Common</Name>
@@ -197,6 +201,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ChartType_Line.ico" />
+    <None Include="Resources\inserttreeview1.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/Resources.Designer.vb b/GUIs.Monitor/My Project/Resources.Designer.vb
index 75457474..fd58df11 100644
--- a/GUIs.Monitor/My Project/Resources.Designer.vb	
+++ b/GUIs.Monitor/My Project/Resources.Designer.vb	
@@ -110,6 +110,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property inserttreeview() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("inserttreeview", 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 c617373e..55da587a 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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="inserttreeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inserttreeview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GUIs.Monitor/Resources/inserttreeview1.svg b/GUIs.Monitor/Resources/inserttreeview1.svg
new file mode 100644
index 00000000..37993b43
--- /dev/null
+++ b/GUIs.Monitor/Resources/inserttreeview1.svg
@@ -0,0 +1,17 @@
+<?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">
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="InsertTreeView">
+    <path d="M13,8H5C4.4,8,4,7.6,4,7V3c0-0.5,0.4-1,1-1h8c0.6,0,1,0.5,1,1v4C14,7.6,13.6,8,13,8z M26,17v-4   c0-0.6-0.5-1-1-1h-8c-0.5,0-1,0.4-1,1v4c0,0.5,0.5,1,1,1h8C25.5,18,26,17.5,26,17z M26,27v-4c0-0.5-0.5-1-1-1h-8c-0.5,0-1,0.5-1,1   v4c0,0.5,0.5,1,1,1h8C25.5,28,26,27.5,26,27z" class="Yellow" />
+    <polygon points="14,16 14,14 10,14 10,10 8,10 8,26 14,26 14,24 10,24 10,16  " class="Black" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb
index 004e1198..6ce69294 100644
--- a/GUIs.Monitor/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/frmMonitor.Designer.vb
@@ -31,8 +31,9 @@ Partial Class frmMonitor
         Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.buttonSearch = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExportGrid = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExportTreeview = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -41,13 +42,11 @@ Partial Class frmMonitor
         Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
         Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
         Me.cmbSearchKeys = New DevExpress.XtraEditors.ComboBoxEdit()
-        Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit()
         Me.DateEdit1 = New DevExpress.XtraEditors.DateEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutItemSearchValue_Text = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutItemSearchValue_Date = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPageFile1 = New DevExpress.XtraTab.XtraTabPage()
         Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
@@ -61,7 +60,7 @@ Partial Class frmMonitor
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.TreeListResults = New DevExpress.XtraTreeList.TreeList()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
-        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.SplitContainerContent = New DevExpress.XtraEditors.SplitContainerControl()
         Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPageSQL1 = New DevExpress.XtraTab.XtraTabPage()
@@ -74,26 +73,23 @@ Partial Class frmMonitor
         Me.GridControl4 = New DevExpress.XtraGrid.GridControl()
         Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.XtraTabPageSQL4 = New DevExpress.XtraTab.XtraTabPage()
-        Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
         Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
+        Me.tabPageSearch = New DevExpress.XtraTab.XtraTabPage()
+        Me.tabPageDashboard = New DevExpress.XtraTab.XtraTabPage()
         Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
-        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.LayoutControl1.SuspendLayout()
         CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.cmbSearchKeys.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutItemSearchValue_Text, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutItemSearchValue_Date, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
         Me.XtraTabPageFile1.SuspendLayout()
@@ -104,8 +100,8 @@ Partial Class frmMonitor
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainerControl1.SuspendLayout()
+        CType(Me.SplitContainerContent, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerContent.SuspendLayout()
         CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl3.SuspendLayout()
         CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -120,18 +116,18 @@ Partial Class frmMonitor
         CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabPageSQL4.SuspendLayout()
-        CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainerControl2.SuspendLayout()
+        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerMain.SuspendLayout()
         CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl2.SuspendLayout()
-        Me.XtraTabPage3.SuspendLayout()
+        Me.tabPageSearch.SuspendLayout()
         Me.SuspendLayout()
         '
         'RibbonControl1
         '
         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.btnExportGrid, Me.btnExportTreeview, Me.BarStaticItem1})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl1.MaxItemId = 7
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -156,27 +152,34 @@ Partial Class frmMonitor
         '
         'buttonSearch
         '
-        Me.buttonSearch.Caption = "Sicht laden"
+        Me.buttonSearch.Caption = "Suche starten (F5)"
         Me.buttonSearch.Id = 1
         Me.buttonSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.gettingstarted
         Me.buttonSearch.Name = "buttonSearch"
         Me.buttonSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
-        'BarButtonItem2
+        'btnExportGrid
+        '
+        Me.btnExportGrid.Caption = "Export Grid als XLSX"
+        Me.btnExportGrid.Enabled = False
+        Me.btnExportGrid.Id = 4
+        Me.btnExportGrid.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.export
+        Me.btnExportGrid.Name = "btnExportGrid"
         '
-        Me.BarButtonItem2.Caption = "Export Grid als XLSX"
-        Me.BarButtonItem2.Enabled = False
-        Me.BarButtonItem2.Id = 4
-        Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.export
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        'btnExportTreeview
         '
-        'BarButtonItem3
+        Me.btnExportTreeview.Caption = "Export Treeview als XLSX"
+        Me.btnExportTreeview.Id = 5
+        Me.btnExportTreeview.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.inserttreeview
+        Me.btnExportTreeview.Name = "btnExportTreeview"
+        '
+        'BarStaticItem1
         '
-        Me.BarButtonItem3.Caption = "Export als XLSX"
-        Me.BarButtonItem3.Id = 5
-        Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem3.Name = "BarButtonItem3"
+        Me.BarStaticItem1.Id = 6
+        Me.BarStaticItem1.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarStaticItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.BarStaticItem1.Name = "BarStaticItem1"
+        Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'RibbonPage1
         '
@@ -193,8 +196,8 @@ Partial Class frmMonitor
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportTreeview)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportGrid)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "Export"
         '
@@ -215,7 +218,6 @@ Partial Class frmMonitor
         '
         Me.LayoutControl1.Controls.Add(Me.TextEdit1)
         Me.LayoutControl1.Controls.Add(Me.cmbSearchKeys)
-        Me.LayoutControl1.Controls.Add(Me.TextEdit2)
         Me.LayoutControl1.Controls.Add(Me.DateEdit1)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
@@ -244,16 +246,6 @@ Partial Class frmMonitor
         Me.cmbSearchKeys.StyleController = Me.LayoutControl1
         Me.cmbSearchKeys.TabIndex = 5
         '
-        'TextEdit2
-        '
-        Me.TextEdit2.Location = New System.Drawing.Point(15, 169)
-        Me.TextEdit2.MenuManager = Me.RibbonControl1
-        Me.TextEdit2.Name = "TextEdit2"
-        Me.TextEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.TextEdit2.Size = New System.Drawing.Size(205, 20)
-        Me.TextEdit2.StyleController = Me.LayoutControl1
-        Me.TextEdit2.TabIndex = 6
-        '
         'DateEdit1
         '
         Me.DateEdit1.EditValue = Nothing
@@ -270,7 +262,7 @@ Partial Class frmMonitor
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutItemSearchValue_Text, Me.LayoutControlItem2, Me.LayoutItemSearchValue_Date, Me.LayoutControlItem3})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutItemSearchValue_Text, Me.LayoutControlItem2, Me.LayoutItemSearchValue_Date})
         Me.Root.Name = "Root"
         Me.Root.Size = New System.Drawing.Size(235, 564)
         Me.Root.TextVisible = False
@@ -282,7 +274,7 @@ Partial Class frmMonitor
         Me.LayoutItemSearchValue_Text.Name = "LayoutItemSearchValue_Text"
         Me.LayoutItemSearchValue_Text.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutItemSearchValue_Text.Size = New System.Drawing.Size(215, 46)
-        Me.LayoutItemSearchValue_Text.Text = "Parameter"
+        Me.LayoutItemSearchValue_Text.Text = "Text Parameter"
         Me.LayoutItemSearchValue_Text.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(88, 13)
         '
@@ -293,7 +285,7 @@ Partial Class frmMonitor
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 46)
-        Me.LayoutControlItem2.Text = "Sicht Titel"
+        Me.LayoutControlItem2.Text = "Suche nach"
         Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutControlItem2.TextSize = New System.Drawing.Size(88, 13)
         '
@@ -303,23 +295,12 @@ Partial Class frmMonitor
         Me.LayoutItemSearchValue_Date.Location = New System.Drawing.Point(0, 92)
         Me.LayoutItemSearchValue_Date.Name = "LayoutItemSearchValue_Date"
         Me.LayoutItemSearchValue_Date.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 46)
+        Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 452)
         Me.LayoutItemSearchValue_Date.Text = "Datum Parameter"
         Me.LayoutItemSearchValue_Date.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(88, 13)
         Me.LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never
         '
-        'LayoutControlItem3
-        '
-        Me.LayoutControlItem3.Control = Me.TextEdit2
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 138)
-        Me.LayoutControlItem3.Name = "LayoutControlItem3"
-        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(215, 406)
-        Me.LayoutControlItem3.Text = "Auswertung"
-        Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(88, 13)
-        '
         'XtraTabControl1
         '
         Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
@@ -422,7 +403,6 @@ Partial Class frmMonitor
         Me.TreeListResults.Location = New System.Drawing.Point(0, 0)
         Me.TreeListResults.MenuManager = Me.RibbonControl1
         Me.TreeListResults.Name = "TreeListResults"
-        Me.TreeListResults.OptionsView.ShowColumns = False
         Me.TreeListResults.Size = New System.Drawing.Size(713, 181)
         Me.TreeListResults.TabIndex = 4
         '
@@ -439,19 +419,19 @@ Partial Class frmMonitor
         Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg")
         Me.SvgImageCollection1.Add("highimportance", "image://svgimages/outlook inspired/highimportance.svg")
         '
-        'SplitContainerControl1
+        'SplitContainerContent
         '
-        Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
-        Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainerControl1.Name = "SplitContainerControl1"
-        Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl1)
-        Me.SplitContainerControl1.Panel1.Text = "Panel1"
-        Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl3)
-        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(958, 564)
-        Me.SplitContainerControl1.SplitterPosition = 235
-        Me.SplitContainerControl1.TabIndex = 9
+        Me.SplitContainerContent.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
+        Me.SplitContainerContent.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerContent.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainerContent.Name = "SplitContainerContent"
+        Me.SplitContainerContent.Panel1.Controls.Add(Me.LayoutControl1)
+        Me.SplitContainerContent.Panel1.Text = "Panel1"
+        Me.SplitContainerContent.Panel2.Controls.Add(Me.SplitContainerControl3)
+        Me.SplitContainerContent.Panel2.Text = "Panel2"
+        Me.SplitContainerContent.Size = New System.Drawing.Size(958, 564)
+        Me.SplitContainerContent.SplitterPosition = 235
+        Me.SplitContainerContent.TabIndex = 9
         '
         'SplitContainerControl3
         '
@@ -554,58 +534,51 @@ Partial Class frmMonitor
         Me.XtraTabPageSQL4.Size = New System.Drawing.Size(711, 350)
         Me.XtraTabPageSQL4.Text = "SQL 4"
         '
-        'SplitContainerControl2
+        'SplitContainerMain
         '
-        Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
-        Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainerControl2.Name = "SplitContainerControl2"
-        Me.SplitContainerControl2.Panel1.Controls.Add(Me.SplitContainerControl1)
-        Me.SplitContainerControl2.Panel1.Text = "Panel1"
-        Me.SplitContainerControl2.Panel2.Controls.Add(Me.XtraTabControl1)
-        Me.SplitContainerControl2.Panel2.Text = "Panel2"
-        Me.SplitContainerControl2.Size = New System.Drawing.Size(1377, 564)
-        Me.SplitContainerControl2.SplitterPosition = 958
-        Me.SplitContainerControl2.TabIndex = 10
+        Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainerMain.Name = "SplitContainerMain"
+        Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerContent)
+        Me.SplitContainerMain.Panel1.Text = "Panel1"
+        Me.SplitContainerMain.Panel2.Controls.Add(Me.XtraTabControl1)
+        Me.SplitContainerMain.Panel2.Text = "Panel2"
+        Me.SplitContainerMain.Size = New System.Drawing.Size(1377, 564)
+        Me.SplitContainerMain.SplitterPosition = 958
+        Me.SplitContainerMain.TabIndex = 10
         '
         'XtraTabControl2
         '
         Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.XtraTabControl2.Location = New System.Drawing.Point(0, 159)
         Me.XtraTabControl2.Name = "XtraTabControl2"
-        Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3
+        Me.XtraTabControl2.SelectedTabPage = Me.tabPageSearch
         Me.XtraTabControl2.Size = New System.Drawing.Size(1379, 590)
         Me.XtraTabControl2.TabIndex = 11
-        Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4})
+        Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSearch, Me.tabPageDashboard})
         '
-        'XtraTabPage3
+        'tabPageSearch
         '
-        Me.XtraTabPage3.Controls.Add(Me.SplitContainerControl2)
-        Me.XtraTabPage3.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
-        Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 564)
-        Me.XtraTabPage3.Text = "Auswahl Sicht"
+        Me.tabPageSearch.Controls.Add(Me.SplitContainerMain)
+        Me.tabPageSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
+        Me.tabPageSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
+        Me.tabPageSearch.Name = "tabPageSearch"
+        Me.tabPageSearch.Size = New System.Drawing.Size(1377, 564)
+        Me.tabPageSearch.Text = "Suche"
         '
-        'XtraTabPage4
+        'tabPageDashboard
         '
-        Me.XtraTabPage4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard
-        Me.XtraTabPage4.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.XtraTabPage4.Name = "XtraTabPage4"
-        Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 564)
-        Me.XtraTabPage4.Text = "Dashboard"
+        Me.tabPageDashboard.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard
+        Me.tabPageDashboard.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
+        Me.tabPageDashboard.Name = "tabPageDashboard"
+        Me.tabPageDashboard.Size = New System.Drawing.Size(1377, 564)
+        Me.tabPageDashboard.Text = "Dashboard"
         '
         'XtraSaveFileDialog1
         '
         Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
         '
-        'BarStaticItem1
-        '
-        Me.BarStaticItem1.Id = 6
-        Me.BarStaticItem1.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarStaticItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarStaticItem1.Name = "BarStaticItem1"
-        '
         'frmMonitor
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -625,14 +598,12 @@ Partial Class frmMonitor
         Me.LayoutControl1.ResumeLayout(False)
         CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.cmbSearchKeys.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutItemSearchValue_Text, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutItemSearchValue_Date, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl1.ResumeLayout(False)
         Me.XtraTabPageFile1.ResumeLayout(False)
@@ -643,8 +614,8 @@ Partial Class frmMonitor
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerControl1.ResumeLayout(False)
+        CType(Me.SplitContainerContent, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerContent.ResumeLayout(False)
         CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerControl3.ResumeLayout(False)
         CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -659,11 +630,11 @@ Partial Class frmMonitor
         CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabPageSQL4.ResumeLayout(False)
-        CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerControl2.ResumeLayout(False)
+        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerMain.ResumeLayout(False)
         CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl2.ResumeLayout(False)
-        Me.XtraTabPage3.ResumeLayout(False)
+        Me.tabPageSearch.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -680,9 +651,7 @@ Partial Class frmMonitor
     Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
     Friend WithEvents LayoutItemSearchValue_Text As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents buttonSearch As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents TextEdit2 As DevExpress.XtraEditors.ComboBoxEdit
     Friend WithEvents TreeListResults As DevExpress.XtraTreeList.TreeList
     Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
@@ -691,7 +660,7 @@ Partial Class frmMonitor
     Friend WithEvents XtraTabPageFile2 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents XtraTabPageHtml1 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents XtraTabPageHtml2 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents SplitContainerContent As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents XtraTabControl3 As DevExpress.XtraTab.XtraTabControl
     Friend WithEvents XtraTabPageSQL1 As DevExpress.XtraTab.XtraTabPage
@@ -704,10 +673,10 @@ Partial Class frmMonitor
     Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView4 As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents XtraTabPageSQL4 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl
-    Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents XtraTabPage4 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents tabPageSearch As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents tabPageDashboard As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DocumentViewer
     Friend WithEvents DocumentViewer2 As Controls.DocumentViewer.DocumentViewer
     Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
@@ -717,9 +686,9 @@ Partial Class frmMonitor
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
     Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExportGrid As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
-    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExportTreeview As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
 End Class
diff --git a/GUIs.Monitor/frmMonitor.resx b/GUIs.Monitor/frmMonitor.resx
index 1d78dfe6..0f39436a 100644
--- a/GUIs.Monitor/frmMonitor.resx
+++ b/GUIs.Monitor/frmMonitor.resx
@@ -121,73 +121,28 @@
     <value>183, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="BarButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA
-        AY1JREFUOE9j+P//PwMQMJ6fZr/v/FS7/+cm2/4/O9Hm/5kJ1v9P9ljsB8oxgdTgwhCCgYH57ETr/78e
-        L/z/4/6c/99vT/3/7Vrf/33FmiBJVnRNyBhCMDCwnOwy///1au//z6cq/388Wvz/47HK/ztzVEGSbOia
-        kDGEANpytNHw/4djFf/f7s74/3pbIhAn/9+apgySZEfXhIwhBNAFu0q09+zIVvm/LV35/5ZUxf+bkxX+
-        r4mV3wuUYwNiRiBmQsIgPooBIAFWIOYorJ0BEuACYk4gZj831W4/vsCFOwWGC2pn/s+vns6QVz0NqIZw
-        4GIYkF0x5X9m2aT/GaUT/6cW9v0nFLgYBqQBNaUU9DIk53WDXEAwcDEMiM/p+B+X1c4Qm9EKMgBf4GL3
-        QlRq8/+I5EaGsKR6kAGgwAXFAihAuYGYB0qzAzH2QAyJr/0fHFvDEBhTBVRDOIljGOAfWfHfN6KMwSe8
-        FGQA6bHgFVJ83jO46L9HUOF/t4A80mMBGYNsITkWkDEQEIiF/wwAEzc5In1OcF0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BarButtonItem3.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
   <data name="BarStaticItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAMdEVYdFRpdGxlAEFib3V0O1VEZxsAAADVSURBVDhPpdPNCcJAEIbhnBTFUhSEgNiETdmAnvwB
-        ISkjB/GmLQgqYhWKosb3C0Z2lzUh5PAcnJn9THQnGI0TV4glTnjhhiNWGMCaNz80oYNvpAUitGAFNLCB
-        74DPFm38AubwDRaJkQV0oXf1DeVf4OvJUM2pU6wiVsDeKZrKnuCs5t0pmsoCHnUDUjXrvMJFzYlTNJUF
-        RGrqb3waRVNRgG5smA/MvsUqtBvWVV7DN+izg3WVRQuywL9bKeppmTrIzpkBuR60G1ph/TZXHKBH7sOY
-        TYIP2fNBkIMCKs8AAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0
+        bGUAQWJvdXQ7VURnGwAAANVJREFUOE+l080JwkAQhuGcFMVSFISA2IRN2YCe/AEhKSMH8aYtCCpiFYqi
+        xvcLRnaXNSHk8Bycmf1MdCcYjRNXiCVOeOGGI1YYwJo3PzShg2+kBSK0YAU0sIHvgM8WbfwC5vANFomR
+        BXShd/UN5V/g68lQzalTrCJWwN4pmsqe4Kzm3SmaygIedQNSNeu8wkXNiVM0lQVEaupvfBpFU1GAbmyY
+        D8y+xSq0G9ZVXsM36LODdZVFC7LAv1sp6mmZOsjOmQG5HrQbWmH9NlccoEfuw5hNgg/Z80GQgwIqzwAA
+        AABJRU5ErkJggg==
 </value>
   </data>
   <data name="BarStaticItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAMdEVYdFRpdGxlAEFib3V0O1VEZxsAAAHFSURBVFhHxda9SkNBEIbh3ERUECxEUMErESwtxM5K
-        hICVIFZGvAbBwlIQhAiiWNkoeAla2FgKBv8QFH+O74STcHZm2GSDORZPsZOZ+ZYTTVLJsuxfucUyucUy
-        ucUymcJc/SxmDGs4wR2e8YhbHKGGYXizLTrPFLwhSPA+vpB18YFdDMHs0nmm4Awt4hVeWMwDZhHs03mm
-        oAbW4S3vlTyxJXR26jxTKDTLoLc0lVyi8yR0ninkjRN4g7ewH/J2VGHyTEGa0IC3SGv3e69pOzB5pkDT
-        JH7yoW5SLiD/HVWdFxwETZuFob+2rPOCg6DpUg3FpDwBcajzgoOgST7dvGFP6gWudV5wEM5QTOoFmjov
-        OAhnKGYgFxjkW3Cj84KDoOlKDcWkXqCh84KDoGlbDcWkXqCm84KDoGlGDcWkXOATIzovOAiaxGk+1E3K
-        BfZg8kxBmjAN+ej0FvXjCaMweaYgTTn5eeUtSyXfK/No7dV5ptBuzG3BW9orCV9FZ6fOM4Vic24F7/AC
-        Yl6wgGCfzjMFPZCbwjF6+Zr+xgHkh6zZpfNMwRsqkD/OOi7QRDv0HufYwDi82RadZwplc4tlcotlcovl
-        ySq/BghXOy4DehcAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0
+        bGUAQWJvdXQ7VURnGwAAAcVJREFUWEfF1r1KQ0EQhuHcRFQQLERQwSsRLC3EzkqEgJUgVka8BsHCUhCE
+        CKJY2Sh4CVrYWAoG/xAUf47vhJNwdmbYZIM5Fk+xk5n5lhNNUsmy7F+5xTK5xTK5xTKZwlz9LGYMazjB
+        HZ7xiFscoYZheLMtOs8UvCFI8D6+kHXxgV0MwezSeabgDC3iFV5YzANmEezTeaagBtbhLe+VPLEldHbq
+        PFMoNMugtzSVXKLzJHSeKeSNE3iDt7Af8nZUYfJMQZrQgLdIa/d7r2k7MHmmQNMkfvKhblIuIP8dVZ0X
+        HARNm4Whv7as84KDoOlSDcWkPAFxqPOCg6BJPt28YU/qBa51XnAQzlBM6gWaOi84CGcoZiAXGORbcKPz
+        goOg6UoNxaReoKHzgoOgaVsNxaReoKbzgoOgaUYNxaRc4BMjOi84CJrEaT7UTcoF9mDyTEGaMA356PQW
+        9eMJozB5piBNOfl55S1LJd8r82jt1Xmm0G7MbcFb2isJX0Vnp84zhWJzbgXv8AJiXrCAYJ/OMwU9kJvC
+        MXr5mv7GAeSHrNml80zBGyqQP846LtBEO/Qe59jAOLzZFp1nCmVzi2Vyi2Vyi+XJKr8GCFc7LgN6FwAA
+        AABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb
index d727ac60..85e2f547 100644
--- a/GUIs.Monitor/frmMonitor.vb
+++ b/GUIs.Monitor/frmMonitor.vb
@@ -1,12 +1,12 @@
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraTreeList.Nodes
-Imports DigitalData.Controls.SQLConfig
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language.Utils
+Imports DigitalData.Controls.SQLConfig
 Imports DevExpress.XtraTab
 Imports DigitalData.Controls.DocumentViewer
 Imports DevExpress.XtraEditors
@@ -100,7 +100,7 @@ Public Class frmMonitor
                 Console.WriteLine(ConfigManager.Config.SearchKeySQL)
 
             End If
-                Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
+            Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
             GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4})
             GridBuilder.
@@ -125,21 +125,23 @@ Public Class frmMonitor
             For Each oGrid In SQLResultGrids
                 AddHandler oGrid.Enter, Sub()
                                             ActiveSQLResultGrid = oGrid
-                                            BarButtonItem2.Enabled = True
+                                            btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                                         End Sub
 
                 AddHandler oGrid.Leave, Sub()
                                             ActiveSQLResultGrid = Nothing
-                                            BarButtonItem2.Enabled = False
+                                            btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                                         End Sub
             Next
 
+            AddHandler TreeListResults.Enter, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            AddHandler TreeListResults.Leave, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
 
             For Each oViewer As DocumentViewer In FileResultViewers
                 oViewer.Init(LogConfig, oLicense)
             Next
             SplitContainerControl3.Collapsed = True
-            SplitContainerControl2.Collapsed = True
+            SplitContainerMain.Collapsed = True
         Catch ex As Exception
             ShowErrorMessage(ex)
         End Try
@@ -147,19 +149,27 @@ Public Class frmMonitor
 
     Private Function LoadGDPicture() As String
         Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
-        Return Database.GetScalarValue(oSQL)
+        Return Database.GetScalarValue(oSQL)?.ToString
     End Function
 
     Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
-        LoadData()
+        If cmbSearchKeys.EditValue Is Nothing Then
+            Exit Sub
+        End If
+        Dim oAttributeId As Integer = cmbSearchKeys.EditValue
+        Dim oAttributeValue As String = TextEdit1.EditValue.ToString
+
+        LoadData(oAttributeId, oAttributeValue)
     End Sub
 
-    Private Function LoadData() As Boolean
+    Private Function LoadData(pAttribute As Integer, pValue As String) As Boolean
         Try
+            TreeListResults.ShowLoadingPanel()
+            SplitContainerContent.Enabled = False
 
-
-            Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{cmbSearchKeys.EditValue}','{TextEdit1.EditValue.ToString}',1"
+            Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{pAttribute}','{pValue}',1"
             Dim oTable As DataTable = Database.GetDatatable(oSQL)
+            Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")
 
             TreeListResults.DataSource = oTable
             TreeListResults.PopulateColumns()
@@ -171,19 +181,14 @@ Public Class frmMonitor
                 oColumn.Visible = DisplayColumns.Contains(oColumn.FieldName)
                 If oColumn.FieldName = "ADDED_WHEN" Then
                     oColumn.Format.FormatType = FormatType.DateTime
-                    oColumn.Format.FormatString = "dd.MM.yyyy  HH:MM:ss"
+                    oColumn.Format.FormatString = "dd.MM.yyyy  HH:mm:ss"
                 End If
 
             Next
-            'Dim edit As New RepositoryItemDateEdit()
-            'TreeListResults.Columns("ADDED_WHEN").ColumnEdit = edit
-            'edit.Mask.EditMask = "g"
-            'edit.Mask.UseMaskAsDisplayFormat = True
-            Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")
 
             For Each oNode As TreeListNode In TreeListResults.Nodes
                 ExpandNodes(oNode, Function(n)
-                                       Dim oObjectValue = n.GetValue(oStateColumn)
+                                       Dim oObjectValue = n.GetValue(oStateColumn)?.ToString
                                        Dim oValue As String = NotNull(oObjectValue, String.Empty)
                                        Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE)
                                    End Function)
@@ -192,6 +197,9 @@ Public Class frmMonitor
         Catch ex As Exception
             ShowErrorMessage(ex)
             Return False
+        Finally
+            SplitContainerContent.Enabled = False
+            TreeListResults.HideLoadingPanel()
         End Try
     End Function
 
@@ -321,7 +329,7 @@ Public Class frmMonitor
         Next
 
         SplitContainerControl3.Collapsed = oSQLCommands.Count = 0
-        SplitContainerControl2.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0
+        SplitContainerMain.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0
 
         For Each oSQLCommand As KeyValuePair(Of String, String) In oSQLCommands
             Try
@@ -542,7 +550,7 @@ Public Class frmMonitor
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Dim oSQLConfig As New frmSQLConfig(LogConfig)
+        Dim oSQLConfig As New DigitalData.Controls.SQLConfig.frmSQLConfig(LogConfig)
         If oSQLConfig.ShowDialog() = DialogResult.OK Then
             ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
             ConfigManager.Save()
@@ -553,7 +561,7 @@ Public Class frmMonitor
         End If
     End Sub
 
-    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportGrid.ItemClick
         If ActiveSQLResultGrid IsNot Nothing Then
             XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"
 
@@ -563,13 +571,22 @@ Public Class frmMonitor
         End If
     End Sub
 
-    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportTreeview.ItemClick
         XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"
 
         If XtraSaveFileDialog1.ShowDialog() = DialogResult.OK Then
             TreeListResults.ExportToXlsx(XtraSaveFileDialog1.FileName)
         End If
     End Sub
+
+    Private Sub TextEdit1_KeyDown(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyDown
+        If e.KeyCode = Keys.Enter Or e.KeyCode = Keys.F5 Then
+            Dim oAttributeId As Integer = cmbSearchKeys.EditValue
+            Dim oAttributeValue As String = TextEdit1.EditValue.ToString
+
+            LoadData(oAttributeId, oAttributeValue)
+        End If
+    End Sub
 End Class
 
 Friend Class SearchKey