Compare commits

...

2 Commits

Author SHA1 Message Date
Jonathan Jenne
6556781708 Version 0.6.0.0 2022-07-05 15:56:58 +02:00
Jonathan Jenne
a98959bea1 result count 2022-07-05 15:48:50 +02:00
3 changed files with 17 additions and 13 deletions

View File

@@ -10,8 +10,8 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyConfiguration("")>
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2021")>
<Assembly: AssemblyTrademark("0.5.0.0")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("0.6.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.5.0.0")>
<Assembly: AssemblyVersion("0.6.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -30,7 +30,7 @@ Partial Class frmMonitor
Me.buttonSearch = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
Me.lbResultCount = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -150,7 +150,7 @@ 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.BarButtonItem4})
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.lbResultCount, Me.BarButtonItem4})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 8
Me.RibbonControl1.Name = "RibbonControl1"
@@ -197,13 +197,14 @@ Partial Class frmMonitor
Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonItem3.Name = "BarButtonItem3"
'
'BarStaticItem1
'lbResultCount
'
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
Me.lbResultCount.Caption = "Ergebnisse: {0}"
Me.lbResultCount.Id = 6
Me.lbResultCount.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
Me.lbResultCount.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image)
Me.lbResultCount.Name = "lbResultCount"
Me.lbResultCount.Tag = "Ergebnisse: {0}"
'
'BarButtonItem4
'
@@ -235,7 +236,7 @@ Partial Class frmMonitor
'
'RibbonStatusBar1
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount)
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 749)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -844,7 +845,7 @@ Partial Class frmMonitor
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents lbResultCount As DevExpress.XtraBars.BarStaticItem
Friend WithEvents ParameterRoot As DevExpress.XtraLayout.LayoutControlGroup
Friend WithEvents colCOLUMN1 As DevExpress.XtraTreeList.Columns.TreeListColumn
Friend WithEvents colCOLUMN2 As DevExpress.XtraTreeList.Columns.TreeListColumn

View File

@@ -273,6 +273,8 @@ Public Class frmMonitor
Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE)
End Function)
Next
lbResultCount.Caption = String.Format(lbResultCount.Tag, TreeListResults.AllNodesCount)
Else
GridControlResults.Visible = True
GridControlResults.Dock = DockStyle.Fill
@@ -293,6 +295,7 @@ Public Class frmMonitor
oColumn.VisibleIndex = -1
Next
lbResultCount.Caption = String.Format(lbResultCount.Tag, GridViewResults.RowCount)
End If
GridViewResults.FocusInvalidRow()