From 45ba0c847cb83fbd11e20c53e7e602a422c2fba2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 15:08:32 +0200 Subject: [PATCH] Workspaces/Layout --- GUIs.Monitor/frmMonitor.Designer.vb | 99 ++++++++++++++++------------- GUIs.Monitor/frmMonitor.resx | 7 +- GUIs.Monitor/frmMonitor.vb | 58 +++++++++++++---- 3 files changed, 104 insertions(+), 60 deletions(-) diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb index a75022f..dafedb1 100644 --- a/GUIs.Monitor/frmMonitor.Designer.vb +++ b/GUIs.Monitor/frmMonitor.Designer.vb @@ -24,14 +24,15 @@ Partial Class frmMonitor Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMonitor)) + Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() 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.btnExportGrid = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.lbResultCount = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.btnReloadSearches = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -90,6 +91,7 @@ Partial Class frmMonitor Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) + Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -150,7 +152,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.lbResultCount, Me.BarButtonItem4}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportGrid, Me.BarButtonItem3, Me.lbResultCount, Me.btnReloadSearches}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" @@ -181,13 +183,13 @@ Partial Class frmMonitor Me.buttonSearch.Name = "buttonSearch" Me.buttonSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large ' - 'BarButtonItem2 + '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" + 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" ' 'BarButtonItem3 ' @@ -201,17 +203,18 @@ Partial Class frmMonitor ' 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.ImageOptions.Image = CType(resources.GetObject("lbResultCount.ImageOptions.Image"), System.Drawing.Image) + Me.lbResultCount.ImageOptions.LargeImage = CType(resources.GetObject("lbResultCount.ImageOptions.LargeImage"), System.Drawing.Image) Me.lbResultCount.Name = "lbResultCount" + Me.lbResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lbResultCount.Tag = "Ergebnisse: {0}" ' - 'BarButtonItem4 + 'btnReloadSearches ' - Me.BarButtonItem4.Caption = "Suchen neuladen" - Me.BarButtonItem4.Id = 7 - Me.BarButtonItem4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.actions_reload - Me.BarButtonItem4.Name = "BarButtonItem4" + Me.btnReloadSearches.Caption = "Suchen neuladen" + Me.btnReloadSearches.Id = 7 + Me.btnReloadSearches.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.actions_reload + Me.btnReloadSearches.Name = "btnReloadSearches" ' 'RibbonPage1 ' @@ -222,7 +225,7 @@ Partial Class frmMonitor 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.buttonSearch) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadSearches) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' @@ -230,7 +233,7 @@ Partial Class frmMonitor ' 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.btnExportGrid) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Export" ' @@ -304,7 +307,7 @@ Partial Class frmMonitor Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageFile1 - Me.XtraTabControl1.Size = New System.Drawing.Size(409, 563) + Me.XtraTabControl1.Size = New System.Drawing.Size(390, 563) Me.XtraTabControl1.TabIndex = 1 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageFile1, Me.XtraTabPageFile2, Me.XtraTabPageHtml1, Me.XtraTabPageHtml2}) ' @@ -312,7 +315,7 @@ Partial Class frmMonitor ' Me.XtraTabPageFile1.Controls.Add(Me.DocumentViewer1) Me.XtraTabPageFile1.Name = "XtraTabPageFile1" - Me.XtraTabPageFile1.Size = New System.Drawing.Size(407, 540) + Me.XtraTabPageFile1.Size = New System.Drawing.Size(388, 540) Me.XtraTabPageFile1.Text = "File 1" ' 'DocumentViewer1 @@ -321,14 +324,14 @@ Partial Class frmMonitor Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(407, 540) + Me.DocumentViewer1.Size = New System.Drawing.Size(388, 540) Me.DocumentViewer1.TabIndex = 0 ' 'XtraTabPageFile2 ' Me.XtraTabPageFile2.Controls.Add(Me.DocumentViewer2) Me.XtraTabPageFile2.Name = "XtraTabPageFile2" - Me.XtraTabPageFile2.Size = New System.Drawing.Size(407, 540) + Me.XtraTabPageFile2.Size = New System.Drawing.Size(388, 540) Me.XtraTabPageFile2.Text = "File 2" ' 'DocumentViewer2 @@ -337,14 +340,14 @@ Partial Class frmMonitor Me.DocumentViewer2.FileLoaded = False Me.DocumentViewer2.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer2.Name = "DocumentViewer2" - Me.DocumentViewer2.Size = New System.Drawing.Size(407, 540) + Me.DocumentViewer2.Size = New System.Drawing.Size(388, 540) Me.DocumentViewer2.TabIndex = 1 ' 'XtraTabPageHtml1 ' Me.XtraTabPageHtml1.Controls.Add(Me.RichEditControl1) Me.XtraTabPageHtml1.Name = "XtraTabPageHtml1" - Me.XtraTabPageHtml1.Size = New System.Drawing.Size(407, 540) + Me.XtraTabPageHtml1.Size = New System.Drawing.Size(388, 540) Me.XtraTabPageHtml1.Text = "HTML 1" ' 'RichEditControl1 @@ -357,14 +360,14 @@ Partial Class frmMonitor Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditControl1.Size = New System.Drawing.Size(407, 540) + Me.RichEditControl1.Size = New System.Drawing.Size(388, 540) Me.RichEditControl1.TabIndex = 0 ' 'XtraTabPageHtml2 ' Me.XtraTabPageHtml2.Controls.Add(Me.RichEditControl2) Me.XtraTabPageHtml2.Name = "XtraTabPageHtml2" - Me.XtraTabPageHtml2.Size = New System.Drawing.Size(407, 540) + Me.XtraTabPageHtml2.Size = New System.Drawing.Size(388, 540) Me.XtraTabPageHtml2.Text = "HTML 2" ' 'RichEditControl2 @@ -375,7 +378,7 @@ Partial Class frmMonitor Me.RichEditControl2.Location = New System.Drawing.Point(0, 0) Me.RichEditControl2.MenuManager = Me.RibbonControl1 Me.RichEditControl2.Name = "RichEditControl2" - Me.RichEditControl2.Size = New System.Drawing.Size(407, 540) + Me.RichEditControl2.Size = New System.Drawing.Size(388, 540) Me.RichEditControl2.TabIndex = 1 ' 'GridControl1 @@ -385,7 +388,7 @@ Partial Class frmMonitor Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(711, 349) + Me.GridControl1.Size = New System.Drawing.Size(730, 349) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -543,7 +546,7 @@ Partial Class frmMonitor ' Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerSQL) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(958, 563) + Me.SplitContainerControl1.Size = New System.Drawing.Size(977, 563) Me.SplitContainerControl1.SplitterPosition = 235 Me.SplitContainerControl1.TabIndex = 9 ' @@ -555,17 +558,17 @@ Partial Class frmMonitor Me.SplitContainerSQL.Location = New System.Drawing.Point(0, 0) Me.SplitContainerSQL.Name = "SplitContainerSQL" ' - 'SplitContainerSQL.SplitContainerSQL_Panel1 + 'SplitContainerSQL.Panel1 ' Me.SplitContainerSQL.Panel1.Controls.Add(Me.GridControlResults) Me.SplitContainerSQL.Panel1.Controls.Add(Me.TreeListResults) Me.SplitContainerSQL.Panel1.Text = "Panel1" ' - 'SplitContainerSQL.SplitContainerSQL_Panel2 + 'SplitContainerSQL.Panel2 ' Me.SplitContainerSQL.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerSQL.Panel2.Text = "Panel2" - Me.SplitContainerSQL.Size = New System.Drawing.Size(713, 563) + Me.SplitContainerSQL.Size = New System.Drawing.Size(732, 563) Me.SplitContainerSQL.SplitterPosition = 181 Me.SplitContainerSQL.TabIndex = 5 ' @@ -591,7 +594,7 @@ Partial Class frmMonitor Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPageSQL1 - Me.XtraTabControl3.Size = New System.Drawing.Size(713, 372) + Me.XtraTabControl3.Size = New System.Drawing.Size(732, 372) Me.XtraTabControl3.TabIndex = 0 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageSQL1, Me.XtraTabPageSQL2, Me.XtraTabPageSQL3, Me.XtraTabPageSQL4}) ' @@ -599,7 +602,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL1.Controls.Add(Me.GridControl2) Me.XtraTabPageSQL1.Name = "XtraTabPageSQL1" - Me.XtraTabPageSQL1.Size = New System.Drawing.Size(711, 349) + Me.XtraTabPageSQL1.Size = New System.Drawing.Size(730, 349) Me.XtraTabPageSQL1.Text = "SQL 1" ' 'GridControl2 @@ -609,7 +612,7 @@ Partial Class frmMonitor Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(711, 349) + Me.GridControl2.Size = New System.Drawing.Size(730, 349) Me.GridControl2.TabIndex = 1 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -622,7 +625,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL2.Controls.Add(Me.GridControl3) Me.XtraTabPageSQL2.Name = "XtraTabPageSQL2" - Me.XtraTabPageSQL2.Size = New System.Drawing.Size(711, 349) + Me.XtraTabPageSQL2.Size = New System.Drawing.Size(730, 349) Me.XtraTabPageSQL2.Text = "SQL 2" ' 'GridControl3 @@ -632,7 +635,7 @@ Partial Class frmMonitor Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl1 Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(711, 349) + Me.GridControl3.Size = New System.Drawing.Size(730, 349) Me.GridControl3.TabIndex = 1 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -645,7 +648,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL3.Controls.Add(Me.GridControl4) Me.XtraTabPageSQL3.Name = "XtraTabPageSQL3" - Me.XtraTabPageSQL3.Size = New System.Drawing.Size(711, 349) + Me.XtraTabPageSQL3.Size = New System.Drawing.Size(730, 349) Me.XtraTabPageSQL3.Text = "SQL 3" ' 'GridControl4 @@ -655,7 +658,7 @@ Partial Class frmMonitor Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.MenuManager = Me.RibbonControl1 Me.GridControl4.Name = "GridControl4" - Me.GridControl4.Size = New System.Drawing.Size(711, 349) + Me.GridControl4.Size = New System.Drawing.Size(730, 349) Me.GridControl4.TabIndex = 1 Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -668,7 +671,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL4.Controls.Add(Me.GridControl1) Me.XtraTabPageSQL4.Name = "XtraTabPageSQL4" - Me.XtraTabPageSQL4.Size = New System.Drawing.Size(711, 349) + Me.XtraTabPageSQL4.Size = New System.Drawing.Size(730, 349) Me.XtraTabPageSQL4.Text = "SQL 4" ' 'SplitContainerFileHTML @@ -678,17 +681,17 @@ Partial Class frmMonitor Me.SplitContainerFileHTML.Location = New System.Drawing.Point(0, 0) Me.SplitContainerFileHTML.Name = "SplitContainerFileHTML" ' - 'SplitContainerFileHTML.SplitContainerFileHTML_Panel1 + 'SplitContainerFileHTML.Panel1 ' Me.SplitContainerFileHTML.Panel1.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerFileHTML.Panel1.Text = "Panel1" ' - 'SplitContainerFileHTML.SplitContainerFileHTML_Panel2 + 'SplitContainerFileHTML.Panel2 ' Me.SplitContainerFileHTML.Panel2.Controls.Add(Me.XtraTabControl1) Me.SplitContainerFileHTML.Panel2.Text = "Panel2" Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 563) - Me.SplitContainerFileHTML.SplitterPosition = 958 + Me.SplitContainerFileHTML.SplitterPosition = 977 Me.SplitContainerFileHTML.TabIndex = 10 ' 'XtraTabControl2 @@ -726,6 +729,11 @@ Partial Class frmMonitor ' Me.AdornerUIManager2.Owner = Me ' + 'WorkspaceManager1 + ' + Me.WorkspaceManager1.TargetControl = Me + Me.WorkspaceManager1.TransitionType = PushTransition1 + ' 'frmMonitor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -841,7 +849,7 @@ 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 @@ -864,5 +872,6 @@ Partial Class frmMonitor Friend WithEvents AdornerUIManager2 As DevExpress.Utils.VisualEffects.AdornerUIManager Friend WithEvents GridControlResults As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewResults As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnReloadSearches As DevExpress.XtraBars.BarButtonItem + Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager End Class diff --git a/GUIs.Monitor/frmMonitor.resx b/GUIs.Monitor/frmMonitor.resx index 05c922d..8abaa25 100644 --- a/GUIs.Monitor/frmMonitor.resx +++ b/GUIs.Monitor/frmMonitor.resx @@ -166,7 +166,7 @@ q6y9RcvvZHEJIj7KGs2/P84ZFqX5IpcAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0 bGUAQWJvdXQ7VURnGwAAANVJREFUOE+l080JwkAQhuGcFMVSFISA2IRN2YCe/AEhKSMH8aYtCCpiFYqi @@ -176,7 +176,7 @@ AABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0 bGUAQWJvdXQ7VURnGwAAAcVJREFUWEfF1r1KQ0EQhuHcRFQQLERQwSsRLC3EzkqEgJUgVka8BsHCUhCE @@ -199,4 +199,7 @@ 494, 17 + + 657, 17 + \ No newline at end of file diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index 81495ba..257663f 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -21,15 +21,9 @@ Imports DigitalData.GUIs.Monitor.SearchLoader Imports DevExpress.XtraLayout Imports DevExpress.XtraTreeList Imports DevExpress.XtraGrid.Columns +Imports System.ComponentModel Public Class frmMonitor - Public Property LogConfig As LogConfig - Public Property Logger As Logger - Public Property ConfigManager As ConfigManager(Of Config) - Public Property Database As MSSQLServer - Public Property FormHelper As FormHelper - Public Property Patterns As Patterns2 - Private ReadOnly ColumnMarkers As New List(Of String) From {"[HTML]", "[SQL]", "[FILENAME]"} Private ReadOnly SQLColumns As New List(Of String) From {"SELECT1", "SELECT2", "SELECT3", "SELECT4"} Private ReadOnly DocViewColumns As New List(Of String) From {"DOCVIEW1", "DOCVIEW2"} @@ -41,7 +35,7 @@ Public Class frmMonitor Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3", "ADDED_WHEN", "STATE", "ICON"} - Private SearchLoader As SearchLoader + Private SQLResultGrids As List(Of GridControl) @@ -57,6 +51,7 @@ Public Class frmMonitor Private HtmlResultTabs As List(Of XtraTabPage) + Private Const STATE_SUCCESS As String = "SUCCESS" Private Const STATE_FAILURE As String = "FAILURE" Private Const STATE_WARNING As String = "WARNING" @@ -64,7 +59,7 @@ Public Class frmMonitor Private Const STATE_HIGHLIGHT As String = "HIGHLIGHT" Private MarkedColumns As New List(Of GridColumn) - + Private ActiveSearch As Search = Nothing Private Enum NodeImage [Default] = 0 @@ -86,6 +81,14 @@ Public Class frmMonitor Private GridBuilder As GridBuilder Private ControlHelper As Common.ControlHelper + Private SearchLoader As SearchLoader + Private LogConfig As LogConfig + Private Logger As Logger + Private ConfigManager As ConfigManager(Of Config) + Private Database As MSSQLServer + Private FormHelper As FormHelper + Private Patterns As Patterns2 + Private Workspace As Common.DocumentResultList.Workspace(Of Config) Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try @@ -96,6 +99,7 @@ Public Class frmMonitor Patterns = New Patterns2(LogConfig) FormHelper = New FormHelper(LogConfig, Me) ControlHelper = New Common.ControlHelper(LogConfig) + Workspace = New DocumentResultList.Workspace(Of Config)(LogConfig, ConfigManager, WorkspaceManager1) If ConfigManager.Config.ConnectionString = String.Empty Then Dim oSQLConfig As New frmSQLConfig(LogConfig) @@ -151,12 +155,12 @@ Public Class frmMonitor For Each oGrid In SQLResultGrids AddHandler oGrid.Enter, Sub() ActiveSQLResultGrid = oGrid - BarButtonItem2.Enabled = True + btnExportGrid.Enabled = True End Sub AddHandler oGrid.Leave, Sub() ActiveSQLResultGrid = Nothing - BarButtonItem2.Enabled = False + btnExportGrid.Enabled = False End Sub Next @@ -166,6 +170,8 @@ Public Class frmMonitor Next SplitContainerSQL.Collapsed = True SplitContainerFileHTML.Collapsed = True + + Catch ex As Exception FormHelper.ShowErrorMessage(ex, "frmStart_Load") End Try @@ -192,6 +198,8 @@ Public Class frmMonitor Dim oSearch As Search = cmbSearches.EditValue Dim oMissingParams = False + ActiveSearch = oSearch + MarkedColumns.Clear() HideAllTabs() @@ -300,6 +308,8 @@ Public Class frmMonitor GridViewResults.FocusInvalidRow() + Workspace.LoadWorkspace(oSearch.Id.ToString) + Return True Catch ex As Exception FormHelper.ShowErrorMessage(ex, "LoadData") @@ -398,10 +408,17 @@ Public Class frmMonitor Private Sub cmbSearches_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbSearches.SelectedValueChanged Dim oSearch As Search = CType(cmbSearches.SelectedItem, Search) + If ActiveSearch IsNot Nothing Then + Workspace.SaveWorkspace(ActiveSearch.Id.ToString) + End If + ParameterRoot.Clear() AdornerUIManager2.Hide() AdornerUIManager2.Elements.Clear() + TreeListResults.DataSource = Nothing + GridControlResults.DataSource = Nothing + For Each oParam As SearchParameter In oSearch.Parameters Dim oControl As Control @@ -737,7 +754,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" @@ -805,7 +822,7 @@ Public Class frmMonitor End If End Sub - Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadSearches.ItemClick SearchLoader.LoadSearchParameters() LoadSearches() @@ -892,5 +909,20 @@ Public Class frmMonitor SplitContainerSQL.Collapsed = True SplitContainerFileHTML.Collapsed = True End Sub + + Private Sub frmMonitor_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + If ActiveSearch IsNot Nothing Then + Workspace.SaveWorkspace(ActiveSearch.Id.ToString) + End If + End Sub + + 'Private DisallowedComponentNames As New List(Of String) From {"LayoutControlItem", "LayoutControlGroup", "LayoutControl"} + + 'Private Sub WorkspaceManager1_PropertyDeserializing(sender As Object, ea As PropertyCancelEventArgs) Handles WorkspaceManager1.PropertyDeserializing, WorkspaceManager1.PropertySerializing + ' Dim oName = ea.Component?.GetType.Name + ' If DisallowedComponentNames.Contains(oName) Then + ' ea.Cancel = True + ' End If + 'End Sub End Class