EXPANDED-Funktion für Root-Knoten ergänzt

This commit is contained in:
PitzM 2023-04-12 13:46:26 +02:00
parent e85363d35d
commit 32bb0f3c0c
2 changed files with 17 additions and 6 deletions

View File

@ -241,7 +241,7 @@ Partial Class frmMonitor
' '
'lbSearchTime 'lbSearchTime
' '
Me.lbSearchTime.Caption = "BarStaticItem1" Me.lbSearchTime.Caption = "lbSearchTime"
Me.lbSearchTime.Id = 13 Me.lbSearchTime.Id = 13
Me.lbSearchTime.Name = "lbSearchTime" Me.lbSearchTime.Name = "lbSearchTime"
' '

View File

@ -166,6 +166,7 @@ Public Class frmMonitor
SplitContainerFileHTML.Collapsed = True SplitContainerFileHTML.Collapsed = True
SetResultCount(0) SetResultCount(0)
SetSearchTimeValue("")
SetVersion() SetVersion()
Catch ex As Exception Catch ex As Exception
@ -402,7 +403,7 @@ Public Class frmMonitor
ActivateMenuBarButtons(oSearch.ReturnType) ActivateMenuBarButtons(oSearch.ReturnType)
Dim oTotalTime = Now.Subtract(oStartTime) Dim oTotalTime = Now.Subtract(oStartTime)
lbSearchTime.Caption = oTotalTime.ToString("mm':'ss") SetSearchTimeValue(oTotalTime.ToString("mm':'ss"))
Return True Return True
Catch ex As Exception Catch ex As Exception
@ -621,11 +622,16 @@ Public Class frmMonitor
Exit Sub Exit Sub
End If End If
If pRootNode.Item("PARENT_ID") = 0 Then
' Auswertung für Parent-Knoten
ExpandCollapseNode(pRootNode)
End If
For Each oNode As TreeListNode In pRootNode.Nodes For Each oNode As TreeListNode In pRootNode.Nodes
Try Try
Dim oExpanded As TristateBoolean = NotNull(oNode.Item("EXPANDED"), TristateBoolean.Indeterminate) ExpandCollapseNode(oNode)
ExpandCollapseNode(oNode, oExpanded)
' Und rein in die Rekursion
SetExpandedForChildNodes(oNode, pDepth + 1) SetExpandedForChildNodes(oNode, pDepth + 1)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)
@ -860,8 +866,9 @@ Public Class frmMonitor
End If End If
End Sub End Sub
Private Sub ExpandCollapseNode(pNode As TreeListNode, pState As TristateBoolean) Private Sub ExpandCollapseNode(pNode As TreeListNode)
Select Case pState Dim oExpanded As TristateBoolean = NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
Select Case oExpanded
Case TristateBoolean.False Case TristateBoolean.False
pNode.Collapse() pNode.Collapse()
Case TristateBoolean.True Case TristateBoolean.True
@ -1188,6 +1195,10 @@ Public Class frmMonitor
lbResultCount.Caption = String.Format(lbResultCount.Tag, pResults) lbResultCount.Caption = String.Format(lbResultCount.Tag, pResults)
End Sub End Sub
Private Sub SetSearchTimeValue(pValue As String)
lbSearchTime.Caption = pValue
End Sub
Private Sub SetVersion() Private Sub SetVersion()
lbVersion.Caption = String.Format(lbVersion.Tag, System.Reflection.Assembly.GetEntryAssembly().GetName().Version) lbVersion.Caption = String.Format(lbVersion.Tag, System.Reflection.Assembly.GetEntryAssembly().GetName().Version)
End Sub End Sub