Compare commits

..

2 Commits

Author SHA1 Message Date
Jonathan Jenne
b5253c14f5 Version 0.8.1.0 2022-07-12 16:06:04 +02:00
Jonathan Jenne
1cf198ac39 Hide tabs on search change 2022-07-12 16:05:46 +02:00
3 changed files with 46 additions and 41 deletions

View File

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")> <Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2022")> <Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("0.8.0.0")> <Assembly: AssemblyTrademark("0.8.1.0")>
<Assembly: AssemblyCulture("")> <Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible ' 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 ' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below: ' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")] ' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("0.8.0.0")> <Assembly: AssemblyVersion("0.8.1.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -40,7 +40,7 @@ Partial Class frmMonitor
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPageFile1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageFile1 = New DevExpress.XtraTab.XtraTabPage()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
Me.XtraTabPageFile2 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageFile2 = New DevExpress.XtraTab.XtraTabPage()
@@ -61,7 +61,7 @@ Partial Class frmMonitor
Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
Me.lbParams = New DevExpress.XtraLayout.SimpleLabelItem() Me.lbParams = New DevExpress.XtraLayout.SimpleLabelItem()
Me.SplitContainerSQL = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerSQL = New DevExpress.XtraEditors.SplitContainerControl()
Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControlSQL = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPageSQL1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageSQL1 = New DevExpress.XtraTab.XtraTabPage()
Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
@@ -81,8 +81,8 @@ Partial Class frmMonitor
Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControlFileHTML, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl1.SuspendLayout() Me.XtraTabControlFileHTML.SuspendLayout()
Me.XtraTabPageFile1.SuspendLayout() Me.XtraTabPageFile1.SuspendLayout()
Me.XtraTabPageFile2.SuspendLayout() Me.XtraTabPageFile2.SuspendLayout()
Me.XtraTabPageHtml1.SuspendLayout() Me.XtraTabPageHtml1.SuspendLayout()
@@ -109,8 +109,8 @@ Partial Class frmMonitor
CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerSQL.Panel2.SuspendLayout() Me.SplitContainerSQL.Panel2.SuspendLayout()
Me.SplitContainerSQL.SuspendLayout() Me.SplitContainerSQL.SuspendLayout()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControlSQL, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl3.SuspendLayout() Me.XtraTabControlSQL.SuspendLayout()
Me.XtraTabPageSQL1.SuspendLayout() Me.XtraTabPageSQL1.SuspendLayout()
CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -250,15 +250,15 @@ Partial Class frmMonitor
Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Name = "RibbonPage2"
Me.RibbonPage2.Text = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2"
' '
'XtraTabControl1 'XtraTabControlFileHTML
' '
Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControlFileHTML.Dock = System.Windows.Forms.DockStyle.Fill
Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlFileHTML.Location = New System.Drawing.Point(0, 0)
Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControlFileHTML.Name = "XtraTabControlFileHTML"
Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageFile1 Me.XtraTabControlFileHTML.SelectedTabPage = Me.XtraTabPageFile1
Me.XtraTabControl1.Size = New System.Drawing.Size(390, 587) Me.XtraTabControlFileHTML.Size = New System.Drawing.Size(390, 587)
Me.XtraTabControl1.TabIndex = 1 Me.XtraTabControlFileHTML.TabIndex = 1
Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageFile1, Me.XtraTabPageFile2, Me.XtraTabPageHtml1, Me.XtraTabPageHtml2}) Me.XtraTabControlFileHTML.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageFile1, Me.XtraTabPageFile2, Me.XtraTabPageHtml1, Me.XtraTabPageHtml2})
' '
'XtraTabPageFile1 'XtraTabPageFile1
' '
@@ -470,23 +470,23 @@ Partial Class frmMonitor
' '
'SplitContainerSQL.Panel2 'SplitContainerSQL.Panel2
' '
Me.SplitContainerSQL.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerSQL.Panel2.Controls.Add(Me.XtraTabControlSQL)
Me.SplitContainerSQL.Panel2.Text = "Panel2" Me.SplitContainerSQL.Panel2.Text = "Panel2"
Me.SplitContainerSQL.Size = New System.Drawing.Size(732, 587) Me.SplitContainerSQL.Size = New System.Drawing.Size(732, 587)
Me.SplitContainerSQL.SplitterPosition = 181 Me.SplitContainerSQL.SplitterPosition = 181
Me.SplitContainerSQL.TabIndex = 5 Me.SplitContainerSQL.TabIndex = 5
' '
'XtraTabControl3 'XtraTabControlSQL
' '
Me.XtraTabControl3.Appearance.BackColor = System.Drawing.SystemColors.Control Me.XtraTabControlSQL.Appearance.BackColor = System.Drawing.SystemColors.Control
Me.XtraTabControl3.Appearance.Options.UseBackColor = True Me.XtraTabControlSQL.Appearance.Options.UseBackColor = True
Me.XtraTabControl3.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControlSQL.Dock = System.Windows.Forms.DockStyle.Fill
Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlSQL.Location = New System.Drawing.Point(0, 0)
Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControlSQL.Name = "XtraTabControlSQL"
Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPageSQL1 Me.XtraTabControlSQL.SelectedTabPage = Me.XtraTabPageSQL1
Me.XtraTabControl3.Size = New System.Drawing.Size(732, 396) Me.XtraTabControlSQL.Size = New System.Drawing.Size(732, 396)
Me.XtraTabControl3.TabIndex = 0 Me.XtraTabControlSQL.TabIndex = 0
Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageSQL1, Me.XtraTabPageSQL2, Me.XtraTabPageSQL3, Me.XtraTabPageSQL4}) Me.XtraTabControlSQL.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageSQL1, Me.XtraTabPageSQL2, Me.XtraTabPageSQL3, Me.XtraTabPageSQL4})
' '
'XtraTabPageSQL1 'XtraTabPageSQL1
' '
@@ -578,7 +578,7 @@ Partial Class frmMonitor
' '
'SplitContainerFileHTML.Panel2 'SplitContainerFileHTML.Panel2
' '
Me.SplitContainerFileHTML.Panel2.Controls.Add(Me.XtraTabControl1) Me.SplitContainerFileHTML.Panel2.Controls.Add(Me.XtraTabControlFileHTML)
Me.SplitContainerFileHTML.Panel2.Text = "Panel2" Me.SplitContainerFileHTML.Panel2.Text = "Panel2"
Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 587) Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 587)
Me.SplitContainerFileHTML.SplitterPosition = 977 Me.SplitContainerFileHTML.SplitterPosition = 977
@@ -641,8 +641,8 @@ Partial Class frmMonitor
Me.Text = "Monitor" Me.Text = "Monitor"
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControlFileHTML, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabControlFileHTML.ResumeLayout(False)
Me.XtraTabPageFile1.ResumeLayout(False) Me.XtraTabPageFile1.ResumeLayout(False)
Me.XtraTabPageFile2.ResumeLayout(False) Me.XtraTabPageFile2.ResumeLayout(False)
Me.XtraTabPageHtml1.ResumeLayout(False) Me.XtraTabPageHtml1.ResumeLayout(False)
@@ -669,8 +669,8 @@ Partial Class frmMonitor
Me.SplitContainerSQL.Panel2.ResumeLayout(False) Me.SplitContainerSQL.Panel2.ResumeLayout(False)
CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerSQL.ResumeLayout(False) Me.SplitContainerSQL.ResumeLayout(False)
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControlSQL, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl3.ResumeLayout(False) Me.XtraTabControlSQL.ResumeLayout(False)
Me.XtraTabPageSQL1.ResumeLayout(False) Me.XtraTabPageSQL1.ResumeLayout(False)
CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -704,14 +704,14 @@ Partial Class frmMonitor
Friend WithEvents buttonSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents buttonSearch As DevExpress.XtraBars.BarButtonItem
Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabControlFileHTML As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPageFile1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageFile1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPageFile2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageFile2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPageHtml1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageHtml1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPageHtml2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageHtml2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents SplitContainerSQL As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerSQL As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents XtraTabControl3 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabControlSQL As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPageSQL1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageSQL1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView

View File

@@ -139,10 +139,6 @@ Public Class frmMonitor
GridBuilder.SetClipboardHandler(oGrids) GridBuilder.SetClipboardHandler(oGrids)
GridBuilder.SetReadOnlyOptions(oGrids) GridBuilder.SetReadOnlyOptions(oGrids)
SQLResultGrids = New List(Of GridControl) From {GridControl1, GridControl2, GridControl3, GridControl4} SQLResultGrids = New List(Of GridControl) From {GridControl1, GridControl2, GridControl3, GridControl4}
SQLResultTabs = New List(Of XtraTabPage) From {XtraTabPageSQL1, XtraTabPageSQL2, XtraTabPageSQL3, XtraTabPageSQL4} SQLResultTabs = New List(Of XtraTabPage) From {XtraTabPageSQL1, XtraTabPageSQL2, XtraTabPageSQL3, XtraTabPageSQL4}
@@ -416,9 +412,13 @@ Public Class frmMonitor
DisposeGrid() DisposeGrid()
InitGrid() InitGrid()
SplitContainerSQL.Collapsed = True
SplitContainerFileHTML.Collapsed = True
lbResultCount.Caption = String.Format(lbResultCount.Tag, 0) lbResultCount.Caption = String.Format(lbResultCount.Tag, 0)
LoadSearch() LoadSearch()
HideAllTabs()
End Sub End Sub
Private Sub LoadSearch() Private Sub LoadSearch()
@@ -703,7 +703,7 @@ Public Class frmMonitor
oTabPage.PageVisible = True oTabPage.PageVisible = True
oTabPage.Text = NotNull(Title, oTabPage.Text) oTabPage.Text = NotNull(Title, oTabPage.Text)
XtraTabControl1.SelectedTabPage = oTabPage XtraTabControlFileHTML.SelectedTabPage = oTabPage
End Sub End Sub
Private Sub FillResultViewer(DocumentViewer As DocumentViewer, Path As String, Title As String) Private Sub FillResultViewer(DocumentViewer As DocumentViewer, Path As String, Title As String)
@@ -713,7 +713,7 @@ Public Class frmMonitor
oTabPage.PageVisible = True oTabPage.PageVisible = True
oTabPage.Text = NotNull(Title, oTabPage.Text) oTabPage.Text = NotNull(Title, oTabPage.Text)
XtraTabControl1.SelectedTabPage = oTabPage XtraTabControlFileHTML.SelectedTabPage = oTabPage
End Sub End Sub
Private Sub FillResultGrid(GridControl As GridControl, Table As DataTable, Title As String) Private Sub FillResultGrid(GridControl As GridControl, Table As DataTable, Title As String)
@@ -723,7 +723,7 @@ Public Class frmMonitor
oTabPage.PageVisible = True oTabPage.PageVisible = True
oTabPage.Text = NotNull(Title, oTabPage.Text) oTabPage.Text = NotNull(Title, oTabPage.Text)
XtraTabControl3.SelectedTabPage = oTabPage XtraTabControlSQL.SelectedTabPage = oTabPage
End Sub End Sub
Private Function GetValuesFromNode(Node As TreeListNode, ColumnNames As List(Of String)) As Dictionary(Of String, String) Private Function GetValuesFromNode(Node As TreeListNode, ColumnNames As List(Of String)) As Dictionary(Of String, String)
@@ -1007,6 +1007,7 @@ Public Class frmMonitor
InitGrid() InitGrid()
LoadSearch() LoadSearch()
HideAllTabs()
lbResultCount.Caption = String.Format(lbResultCount.Tag, 0) lbResultCount.Caption = String.Format(lbResultCount.Tag, 0)
End If End If
@@ -1028,6 +1029,8 @@ Public Class frmMonitor
GridControlResults.ForceInitialize() GridControlResults.ForceInitialize()
GridViewResults = DirectCast(GridControlResults.DefaultView, GridView) GridViewResults = DirectCast(GridControlResults.DefaultView, GridView)
AddHandler GridViewResults.FocusedRowChanged, AddressOf GridViewResults_FocusedRowChanged
GridBuilder.SetDefaults(GridViewResults) GridBuilder.SetDefaults(GridViewResults)
GridBuilder.SetClipboardHandler(GridViewResults) GridBuilder.SetClipboardHandler(GridViewResults)
GridBuilder.SetReadOnlyOptions(GridViewResults) GridBuilder.SetReadOnlyOptions(GridViewResults)
@@ -1049,6 +1052,8 @@ Public Class frmMonitor
TreeListResults.KeyFieldName = "GUID" TreeListResults.KeyFieldName = "GUID"
TreeListResults.ParentFieldName = "PARENT_ID" TreeListResults.ParentFieldName = "PARENT_ID"
AddHandler TreeListResults.FocusedNodeChanged, AddressOf TreeListResults_FocusedNodeChanged
GridBuilder.SetDefaults(TreeListResults) GridBuilder.SetDefaults(TreeListResults)
GridBuilder.SetClipboardHandler(TreeListResults) GridBuilder.SetClipboardHandler(TreeListResults)
GridBuilder.SetReadOnlyOptions(TreeListResults) GridBuilder.SetReadOnlyOptions(TreeListResults)