Add Text icon, fix EXPANDED setting, fix result count label visibility, add search time label

GUIs.Monitor/GridLoader.vb

@@ -39,6 +39,7 @@ Public Class GridLoader
         DateTime = 10
         Key = 11
         Money = 12
+        Text = 13
     End Enum
 
     Public Sub New(pLogConfig As LogConfig, pSvgImageCollection As SvgImageCollection)
@@ -152,7 +153,8 @@ Public Class GridLoader
             New ImageComboBoxItem("User", "USER", NodeImage.User),
             New ImageComboBoxItem("DateTime", "DATETIME", NodeImage.DateTime),
             New ImageComboBoxItem("KeyValue", "KEYVALUE", NodeImage.Key),
-            New ImageComboBoxItem("Money", "MONEY", NodeImage.Money)
+            New ImageComboBoxItem("Money", "MONEY", NodeImage.Money),
+            New ImageComboBoxItem("Text", "TEXT", NodeImage.Text)
         })
         Return oIconEdit
     End Function

GUIs.Monitor/Monitor.vbproj

@@ -78,27 +78,29 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Base">
+    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Patterns">
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\DDMonorepo\Modules.Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Patterns, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
@@ -222,6 +224,7 @@
     <Content Include="MailLicense.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\actions_deletecircled.svg" />
     <None Include="Resources\logical.svg" />
     <None Include="Resources\about1.svg" />
     <None Include="Resources\about.svg" />

GUIs.Monitor/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -80,6 +80,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_deletecircled() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_deletecircled", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

GUIs.Monitor/My Project/Resources.resx

@@ -139,8 +139,8 @@
   <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="movepivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\movepivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="exporttoxlsx" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exporttoxlsx.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -148,16 +148,19 @@
   <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="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical.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="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>
   <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="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="movepivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\movepivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

GUIs.Monitor/Resources/actions_deletecircled.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="DeleteCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M23.1,20.2l-2.8,2.8L16,18.8l-4.2,4.2   l-2.8-2.8l4.2-4.2l-4.2-4.2l2.8-2.8l4.2,4.2l4.2-4.2l2.8,2.8L18.8,16L23.1,20.2z" class="Red" />
+  </g>
+</svg>

GUIs.Monitor/frmMonitor.Designer.vb

@@ -36,6 +36,7 @@ Partial Class frmMonitor
         Me.btnResetLayout = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.lbVersion = New DevExpress.XtraBars.BarStaticItem()
+        Me.lbSearchTime = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -143,9 +144,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.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3, Me.lbSearchTime})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 12
+        Me.RibbonControl1.MaxItemId = 14
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
@@ -238,6 +239,12 @@ Partial Class frmMonitor
         Me.lbVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.lbVersion.Tag = "Version: {0}"
         '
+        'lbSearchTime
+        '
+        Me.lbSearchTime.Caption = "BarStaticItem1"
+        Me.lbSearchTime.Id = 13
+        Me.lbSearchTime.Name = "lbSearchTime"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4})
@@ -277,6 +284,7 @@ Partial Class frmMonitor
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.lbVersion)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.lbSearchTime)
         Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 749)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -398,6 +406,7 @@ Partial Class frmMonitor
         Me.SvgImageCollection1.Add("datetime", "image://svgimages/scheduling/switchtimescalesto.svg")
         Me.SvgImageCollection1.Add("key", "image://svgimages/icon builder/security_key.svg")
         Me.SvgImageCollection1.Add("money", "image://svgimages/dashboards/currency.svg")
+        Me.SvgImageCollection1.Add("text", "image://svgimages/business objects/bo_list.svg")
         '
         'SplitContainerControl1
         '
@@ -810,4 +819,5 @@ Partial Class frmMonitor
     Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents lbVersion As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem
 End Class

GUIs.Monitor/frmMonitor.resx

@@ -129,6 +129,9 @@
   <metadata name="AdornerUIManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>673, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>35</value>
+  </metadata>
   <metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>836, 17</value>
   </metadata>

GUIs.Monitor/frmMonitor.vb

@@ -1,9 +1,5 @@
-Imports System.ComponentModel
+Imports System.Text.RegularExpressions
-Imports System.Text.RegularExpressions
 Imports DevExpress.Utils
-Imports DevExpress.XtraEditors
-Imports DevExpress.XtraEditors.Controls
-Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
@@ -13,7 +9,6 @@ Imports DevExpress.XtraTreeList
 Imports DevExpress.XtraTreeList.Columns
 Imports DevExpress.XtraTreeList.Nodes
 Imports DigitalData.Controls.DocumentViewer
-Imports DigitalData.Controls.SQLConfig
 Imports DigitalData.GUIs.Common
 Imports DigitalData.GUIs.Monitor.Constants
 Imports DigitalData.Modules.Config
@@ -173,6 +168,7 @@ Public Class frmMonitor
         Return Database.GetScalarValue(oSQL)
     End Function
 
+
     Private Async Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
         Await LoadData()
     End Sub
@@ -203,6 +199,7 @@ Public Class frmMonitor
             Dim oControls As List(Of Control) = LayoutControl1.Controls.Cast(Of Control).ToList()
             Dim oSQL = Patterns.ReplaceControlValues(oSearch.SQLCommand, oControls)
             Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL)
+            Dim oStartTime = Now
 
             If oSearch.ReturnType = Constants.ReturnTypeEnum.TreeView Then
                 GridControlResults.Visible = False
@@ -213,6 +210,8 @@ Public Class frmMonitor
 
                 TreeListResults.DataSource = oTable
 
+                lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+
                 Dim oMaxLength = 0
                 For Each oRow As DataRow In oTable.Rows
                     Dim oProcess = oRow.Item("COLUMN1")
@@ -240,12 +239,7 @@ Public Class frmMonitor
                 Next
 
                 For Each oNode As TreeListNode In TreeListResults.Nodes
-                    Try
+                    SetExpandedForChildNodes(oNode)
-                        Dim oExpanded As TristateBoolean = Utils.NotNull(oNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
-                        ExpandCollapseNode(oNode, oExpanded)
-                    Catch ex As Exception
-                        Logger.Error(ex)
-                    End Try
                 Next
 
                 SetResultCount(TreeListResults.AllNodesCount)
@@ -262,6 +256,8 @@ Public Class frmMonitor
                 GridViewResults.PopulateColumns()
                 GridBuilder.SetDateTimeColumns(GridViewResults)
 
+                lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+
                 For Each oColumn As GridColumn In GridViewResults.Columns
                     If oColumn.ColumnType = GetType(Integer) Then
                         oColumn.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center
@@ -290,6 +286,9 @@ Public Class frmMonitor
 
             btnExportMain.Enabled = True
 
+            Dim oTotalTime = Now.Subtract(oStartTime)
+            lbSearchTime.Caption = oTotalTime.ToString("mm':'ss")
+
             Return True
         Catch ex As Exception
             FormHelper.ShowErrorMessage(ex, "LoadData")
@@ -299,6 +298,23 @@ Public Class frmMonitor
         End Try
     End Function
 
+    Private Sub SetExpandedForChildNodes(pRootNode As TreeListNode, Optional pDepth As Integer = 0)
+        If pDepth > 10 Then
+            Exit Sub
+        End If
+
+        For Each oNode As TreeListNode In pRootNode.Nodes
+            Try
+                Dim oExpanded As TristateBoolean = NotNull(oNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
+                ExpandCollapseNode(oNode, oExpanded)
+
+                SetExpandedForChildNodes(oNode, pDepth + 1)
+            Catch ex As Exception
+                Logger.Error(ex)
+            End Try
+        Next
+    End Sub
+
     Private Sub LoadSearches()
         Try
             SearchLoader.LoadSearchParameters()