diff --git a/GUIs.Monitor/ApplicationEvents.vb b/GUIs.Monitor/ApplicationEvents.vb new file mode 100644 index 0000000..d70cc1c --- /dev/null +++ b/GUIs.Monitor/ApplicationEvents.vb @@ -0,0 +1,17 @@ +Imports Microsoft.VisualBasic.ApplicationServices + +Namespace My + ' Für MyApplication sind folgende Ereignisse verfügbar: + ' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst. + ' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst. Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird. + ' UnhandledException: Wird bei einem Ausnahmefehler ausgelöst. + ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. + ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst. + Partial Friend Class MyApplication + Protected Overrides Function OnUnhandledException(e As UnhandledExceptionEventArgs) As Boolean + Dim oMessage = e.Exception?.Message + MsgBox($"Ein unerwarteter Fehler ist aufgetreten. Das Programm wird beendet. {oMessage}", MsgBoxStyle.Critical, "Monitor") + Return True + End Function + End Class +End Namespace diff --git a/GUIs.Monitor/MailLicense.xml b/GUIs.Monitor/MailLicense.xml new file mode 100644 index 0000000..0510526 --- /dev/null +++ b/GUIs.Monitor/MailLicense.xml @@ -0,0 +1,23 @@ + + + 4dc5ef40-f1a9-468b-994c-b7ed600ad878 + Mail.dll + 2022-07-29 + Digital Data GmbH + single developer + Digital Data GmbH + + + + + + + + + + 75MRtl4ipYelIZYlpT8O7QDX9Zc= + + + Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo= + + \ No newline at end of file diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index 66e4d51..7f75c14 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -136,6 +136,7 @@ + frmMonitor.vb @@ -203,6 +204,10 @@ + + PreserveNewest + + diff --git a/GUIs.Monitor/My Project/Resources.Designer.vb b/GUIs.Monitor/My Project/Resources.Designer.vb index 061d81f..1f82dec 100644 --- a/GUIs.Monitor/My Project/Resources.Designer.vb +++ b/GUIs.Monitor/My Project/Resources.Designer.vb @@ -90,6 +90,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property deletetable() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("deletetable", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.Monitor/My Project/Resources.resx b/GUIs.Monitor/My Project/Resources.resx index f9f7c5d..84bfd8a 100644 --- a/GUIs.Monitor/My Project/Resources.resx +++ b/GUIs.Monitor/My Project/Resources.resx @@ -118,25 +118,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.Monitor/Resources/deletetable.svg b/GUIs.Monitor/Resources/deletetable.svg new file mode 100644 index 0000000..4ec3769 --- /dev/null +++ b/GUIs.Monitor/Resources/deletetable.svg @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb index dafedb1..c3e4034 100644 --- a/GUIs.Monitor/frmMonitor.Designer.vb +++ b/GUIs.Monitor/frmMonitor.Designer.vb @@ -33,16 +33,13 @@ Partial Class frmMonitor Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.lbResultCount = New DevExpress.XtraBars.BarStaticItem() Me.btnReloadSearches = New DevExpress.XtraBars.BarButtonItem() + Me.btnResetLayout = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.cmbSearches = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ParameterRoot = New DevExpress.XtraLayout.LayoutControlGroup() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageFile1 = New DevExpress.XtraTab.XtraTabPage() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() @@ -54,26 +51,16 @@ Partial Class frmMonitor Me.RichEditControl2 = New DevExpress.XtraRichEdit.RichEditControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.TreeListResults = New DevExpress.XtraTreeList.TreeList() - Me.colState = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.colICON = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.colCOLUMN1 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.colCOLUMN2 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.colCOLUMN3 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.colADDED_WHEN = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn1 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn2 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn3 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn4 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn5 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn6 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn7 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.TreeListColumn8 = New DevExpress.XtraTreeList.Columns.TreeListColumn() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.cmbSearches = New DevExpress.XtraEditors.ComboBoxEdit() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.lbParams = New DevExpress.XtraLayout.SimpleLabelItem() Me.SplitContainerSQL = New DevExpress.XtraEditors.SplitContainerControl() - Me.GridControlResults = New DevExpress.XtraGrid.GridControl() - Me.GridViewResults = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageSQL1 = New DevExpress.XtraTab.XtraTabPage() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() @@ -94,12 +81,6 @@ Partial Class frmMonitor 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() - Me.LayoutControl1.SuspendLayout() - CType(Me.cmbSearches.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ParameterRoot, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPageFile1.SuspendLayout() @@ -108,7 +89,6 @@ Partial Class frmMonitor Me.XtraTabPageHtml2.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -116,14 +96,19 @@ Partial Class frmMonitor CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel2.SuspendLayout() Me.SplitContainerControl1.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl2.SuspendLayout() + CType(Me.cmbSearches.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbParams, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerSQL.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerSQL.Panel1.SuspendLayout() CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerSQL.Panel2.SuspendLayout() Me.SplitContainerSQL.SuspendLayout() - CType(Me.GridControlResults, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridViewResults, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl3.SuspendLayout() Me.XtraTabPageSQL1.SuspendLayout() @@ -152,9 +137,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.btnExportGrid, Me.BarButtonItem3, Me.lbResultCount, Me.btnReloadSearches}) + 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.btnResetLayout}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 8 + Me.RibbonControl1.MaxItemId = 9 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowToolbarCustomizeItem = False @@ -216,9 +201,16 @@ Partial Class frmMonitor Me.btnReloadSearches.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.actions_reload Me.btnReloadSearches.Name = "btnReloadSearches" ' + 'btnResetLayout + ' + Me.btnResetLayout.Caption = "Layout zurücksetzen" + Me.btnResetLayout.Id = 8 + Me.btnResetLayout.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.deletetable + Me.btnResetLayout.Name = "btnResetLayout" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -229,6 +221,13 @@ Partial Class frmMonitor Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnResetLayout) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Layout" + ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far @@ -236,6 +235,7 @@ Partial Class frmMonitor Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportGrid) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Export" + Me.RibbonPageGroup2.Visible = False ' 'RibbonStatusBar1 ' @@ -250,64 +250,13 @@ Partial Class frmMonitor Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'LayoutControl1 - ' - Me.LayoutControl1.Controls.Add(Me.cmbSearches) - Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(235, 563) - Me.LayoutControl1.TabIndex = 0 - Me.LayoutControl1.Text = "LayoutControl1" - ' - 'cmbSearches - ' - Me.cmbSearches.Location = New System.Drawing.Point(10, 26) - Me.cmbSearches.MenuManager = Me.RibbonControl1 - Me.cmbSearches.Name = "cmbSearches" - Me.cmbSearches.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbSearches.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor - Me.cmbSearches.Size = New System.Drawing.Size(215, 20) - Me.cmbSearches.StyleController = Me.LayoutControl1 - Me.cmbSearches.TabIndex = 5 - ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.ParameterRoot}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(235, 563) - Me.Root.TextVisible = False - ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.cmbSearches - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 36) - Me.LayoutControlItem2.Text = "Suchen nach:" - Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(69, 13) - ' - 'ParameterRoot - ' - Me.ParameterRoot.GroupBordersVisible = False - Me.ParameterRoot.Location = New System.Drawing.Point(0, 36) - Me.ParameterRoot.Name = "ParameterRoot" - Me.ParameterRoot.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.ParameterRoot.Size = New System.Drawing.Size(215, 507) - Me.ParameterRoot.Text = "Suchvariablen" - ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill 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(390, 563) + Me.XtraTabControl1.Size = New System.Drawing.Size(390, 587) Me.XtraTabControl1.TabIndex = 1 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageFile1, Me.XtraTabPageFile2, Me.XtraTabPageHtml1, Me.XtraTabPageHtml2}) ' @@ -315,7 +264,7 @@ Partial Class frmMonitor ' Me.XtraTabPageFile1.Controls.Add(Me.DocumentViewer1) Me.XtraTabPageFile1.Name = "XtraTabPageFile1" - Me.XtraTabPageFile1.Size = New System.Drawing.Size(388, 540) + Me.XtraTabPageFile1.Size = New System.Drawing.Size(388, 564) Me.XtraTabPageFile1.Text = "File 1" ' 'DocumentViewer1 @@ -324,7 +273,7 @@ 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(388, 540) + Me.DocumentViewer1.Size = New System.Drawing.Size(388, 564) Me.DocumentViewer1.TabIndex = 0 ' 'XtraTabPageFile2 @@ -397,126 +346,6 @@ Partial Class frmMonitor Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" ' - 'TreeListResults - ' - Me.TreeListResults.Columns.AddRange(New DevExpress.XtraTreeList.Columns.TreeListColumn() {Me.colState, Me.colICON, Me.colCOLUMN1, Me.colCOLUMN2, Me.colCOLUMN3, Me.colADDED_WHEN, Me.TreeListColumn1, Me.TreeListColumn2, Me.TreeListColumn3, Me.TreeListColumn4, Me.TreeListColumn5, Me.TreeListColumn6, Me.TreeListColumn7, Me.TreeListColumn8}) - Me.TreeListResults.Location = New System.Drawing.Point(23, 13) - Me.TreeListResults.MenuManager = Me.RibbonControl1 - Me.TreeListResults.Name = "TreeListResults" - Me.TreeListResults.Size = New System.Drawing.Size(313, 158) - Me.TreeListResults.TabIndex = 4 - Me.TreeListResults.Visible = False - ' - 'colState - ' - Me.colState.Caption = "Status" - Me.colState.FieldName = "STATE" - Me.colState.MinWidth = 150 - Me.colState.Name = "colState" - Me.colState.OptionsColumn.AllowSize = False - Me.colState.OptionsColumn.AllowSort = False - Me.colState.Visible = True - Me.colState.VisibleIndex = 0 - Me.colState.Width = 150 - ' - 'colICON - ' - Me.colICON.Caption = "Icon" - Me.colICON.FieldName = "ICON" - Me.colICON.Name = "colICON" - Me.colICON.OptionsColumn.AllowSort = False - Me.colICON.Visible = True - Me.colICON.VisibleIndex = 1 - Me.colICON.Width = 108 - ' - 'colCOLUMN1 - ' - Me.colCOLUMN1.Caption = "Vorgang" - Me.colCOLUMN1.FieldName = "COLUMN1" - Me.colCOLUMN1.Name = "colCOLUMN1" - Me.colCOLUMN1.OptionsColumn.AllowSort = False - Me.colCOLUMN1.Visible = True - Me.colCOLUMN1.VisibleIndex = 2 - Me.colCOLUMN1.Width = 108 - ' - 'colCOLUMN2 - ' - Me.colCOLUMN2.Caption = "Beschreibung" - Me.colCOLUMN2.FieldName = "COLUMN2" - Me.colCOLUMN2.Name = "colCOLUMN2" - Me.colCOLUMN2.OptionsColumn.AllowSort = False - Me.colCOLUMN2.Visible = True - Me.colCOLUMN2.VisibleIndex = 3 - Me.colCOLUMN2.Width = 108 - ' - 'colCOLUMN3 - ' - Me.colCOLUMN3.Caption = "Beschreibung 2" - Me.colCOLUMN3.FieldName = "COLUMN3" - Me.colCOLUMN3.Name = "colCOLUMN3" - Me.colCOLUMN3.OptionsColumn.AllowSort = False - Me.colCOLUMN3.Visible = True - Me.colCOLUMN3.VisibleIndex = 4 - Me.colCOLUMN3.Width = 107 - ' - 'colADDED_WHEN - ' - Me.colADDED_WHEN.Caption = "Datum" - Me.colADDED_WHEN.FieldName = "ADDED_WHEN" - Me.colADDED_WHEN.Name = "colADDED_WHEN" - Me.colADDED_WHEN.OptionsColumn.AllowSort = False - Me.colADDED_WHEN.Visible = True - Me.colADDED_WHEN.VisibleIndex = 5 - Me.colADDED_WHEN.Width = 107 - ' - 'TreeListColumn1 - ' - Me.TreeListColumn1.Caption = "TreeListColumn1" - Me.TreeListColumn1.FieldName = "SELECT1" - Me.TreeListColumn1.Name = "TreeListColumn1" - ' - 'TreeListColumn2 - ' - Me.TreeListColumn2.Caption = "TreeListColumn2" - Me.TreeListColumn2.FieldName = "SELECT2" - Me.TreeListColumn2.Name = "TreeListColumn2" - ' - 'TreeListColumn3 - ' - Me.TreeListColumn3.Caption = "TreeListColumn3" - Me.TreeListColumn3.FieldName = "SELECT3" - Me.TreeListColumn3.Name = "TreeListColumn3" - ' - 'TreeListColumn4 - ' - Me.TreeListColumn4.Caption = "TreeListColumn4" - Me.TreeListColumn4.FieldName = "SELECT4" - Me.TreeListColumn4.Name = "TreeListColumn4" - ' - 'TreeListColumn5 - ' - Me.TreeListColumn5.Caption = "TreeListColumn5" - Me.TreeListColumn5.FieldName = "DOCVIEW1" - Me.TreeListColumn5.Name = "TreeListColumn5" - ' - 'TreeListColumn6 - ' - Me.TreeListColumn6.Caption = "TreeListColumn6" - Me.TreeListColumn6.FieldName = "DOCVIEW2" - Me.TreeListColumn6.Name = "TreeListColumn6" - ' - 'TreeListColumn7 - ' - Me.TreeListColumn7.Caption = "TreeListColumn7" - Me.TreeListColumn7.FieldName = "HTML1" - Me.TreeListColumn7.Name = "TreeListColumn7" - ' - 'TreeListColumn8 - ' - Me.TreeListColumn8.Caption = "TreeListColumn8" - Me.TreeListColumn8.FieldName = "HTML2" - Me.TreeListColumn8.Name = "TreeListColumn8" - ' 'SvgImageCollection1 ' Me.SvgImageCollection1.Add("default", "image://svgimages/outlook inspired/about.svg") @@ -540,16 +369,93 @@ Partial Class frmMonitor 'SplitContainerControl1.Panel1 ' Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl1) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl2) Me.SplitContainerControl1.Panel1.Text = "Panel1" ' 'SplitContainerControl1.Panel2 ' + Me.SplitContainerControl1.Panel2.Appearance.BackColor = System.Drawing.SystemColors.ControlDark + Me.SplitContainerControl1.Panel2.Appearance.Options.UseBackColor = True Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerSQL) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(977, 563) + Me.SplitContainerControl1.Size = New System.Drawing.Size(977, 587) Me.SplitContainerControl1.SplitterPosition = 235 Me.SplitContainerControl1.TabIndex = 9 ' + 'LayoutControl1 + ' + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 83) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(235, 504) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Name = "Root" + Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 0, 10) + Me.Root.Size = New System.Drawing.Size(235, 504) + Me.Root.TextVisible = False + ' + 'LayoutControl2 + ' + Me.LayoutControl2.Controls.Add(Me.cmbSearches) + Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Top + Me.LayoutControl2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.Root = Me.LayoutControlGroup1 + Me.LayoutControl2.Size = New System.Drawing.Size(235, 83) + Me.LayoutControl2.TabIndex = 1 + Me.LayoutControl2.Text = "LayoutControl2" + ' + 'cmbSearches + ' + Me.cmbSearches.Location = New System.Drawing.Point(10, 26) + Me.cmbSearches.MenuManager = Me.RibbonControl1 + Me.cmbSearches.Name = "cmbSearches" + Me.cmbSearches.Properties.AutoComplete = False + Me.cmbSearches.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbSearches.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor + Me.cmbSearches.Size = New System.Drawing.Size(215, 20) + Me.cmbSearches.StyleController = Me.LayoutControl2 + Me.cmbSearches.TabIndex = 4 + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.lbParams}) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 0) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(235, 83) + Me.LayoutControlGroup1.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.cmbSearches + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) + Me.LayoutControlItem1.Size = New System.Drawing.Size(215, 36) + Me.LayoutControlItem1.Text = "Suchen nach:" + Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(69, 13) + ' + 'lbParams + ' + Me.lbParams.AllowHotTrack = False + Me.lbParams.Location = New System.Drawing.Point(0, 36) + Me.lbParams.Name = "lbParams" + Me.lbParams.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) + Me.lbParams.Size = New System.Drawing.Size(215, 37) + Me.lbParams.Text = "Parameter:" + Me.lbParams.TextSize = New System.Drawing.Size(69, 13) + Me.lbParams.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never + ' 'SplitContainerSQL ' Me.SplitContainerSQL.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 @@ -560,41 +466,25 @@ Partial Class frmMonitor ' 'SplitContainerSQL.Panel1 ' - Me.SplitContainerSQL.Panel1.Controls.Add(Me.GridControlResults) - Me.SplitContainerSQL.Panel1.Controls.Add(Me.TreeListResults) Me.SplitContainerSQL.Panel1.Text = "Panel1" ' 'SplitContainerSQL.Panel2 ' Me.SplitContainerSQL.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerSQL.Panel2.Text = "Panel2" - Me.SplitContainerSQL.Size = New System.Drawing.Size(732, 563) + Me.SplitContainerSQL.Size = New System.Drawing.Size(732, 587) Me.SplitContainerSQL.SplitterPosition = 181 Me.SplitContainerSQL.TabIndex = 5 ' - 'GridControlResults - ' - Me.GridControlResults.Location = New System.Drawing.Point(342, 13) - Me.GridControlResults.MainView = Me.GridViewResults - Me.GridControlResults.MenuManager = Me.RibbonControl1 - Me.GridControlResults.Name = "GridControlResults" - Me.GridControlResults.Size = New System.Drawing.Size(351, 158) - Me.GridControlResults.TabIndex = 5 - Me.GridControlResults.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResults}) - Me.GridControlResults.Visible = False - ' - 'GridViewResults - ' - Me.GridViewResults.GridControl = Me.GridControlResults - Me.GridViewResults.Name = "GridViewResults" - ' 'XtraTabControl3 ' + Me.XtraTabControl3.Appearance.BackColor = System.Drawing.SystemColors.Control + Me.XtraTabControl3.Appearance.Options.UseBackColor = True Me.XtraTabControl3.Dock = System.Windows.Forms.DockStyle.Fill 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(732, 372) + Me.XtraTabControl3.Size = New System.Drawing.Size(732, 396) Me.XtraTabControl3.TabIndex = 0 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageSQL1, Me.XtraTabPageSQL2, Me.XtraTabPageSQL3, Me.XtraTabPageSQL4}) ' @@ -602,7 +492,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL1.Controls.Add(Me.GridControl2) Me.XtraTabPageSQL1.Name = "XtraTabPageSQL1" - Me.XtraTabPageSQL1.Size = New System.Drawing.Size(730, 349) + Me.XtraTabPageSQL1.Size = New System.Drawing.Size(730, 373) Me.XtraTabPageSQL1.Text = "SQL 1" ' 'GridControl2 @@ -612,7 +502,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(730, 349) + Me.GridControl2.Size = New System.Drawing.Size(730, 373) Me.GridControl2.TabIndex = 1 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -690,7 +580,7 @@ Partial Class frmMonitor ' Me.SplitContainerFileHTML.Panel2.Controls.Add(Me.XtraTabControl1) Me.SplitContainerFileHTML.Panel2.Text = "Panel2" - Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 563) + Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 587) Me.SplitContainerFileHTML.SplitterPosition = 977 Me.SplitContainerFileHTML.TabIndex = 10 ' @@ -700,6 +590,7 @@ Partial Class frmMonitor Me.XtraTabControl2.Location = New System.Drawing.Point(0, 160) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 + Me.XtraTabControl2.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[False] Me.XtraTabControl2.Size = New System.Drawing.Size(1379, 589) Me.XtraTabControl2.TabIndex = 11 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4}) @@ -710,7 +601,7 @@ Partial Class frmMonitor Me.XtraTabPage3.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 563) + Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 587) Me.XtraTabPage3.Text = "Auswahl Sicht" ' 'XtraTabPage4 @@ -750,12 +641,6 @@ Partial Class frmMonitor Me.Text = "Monitor" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) - CType(Me.cmbSearches.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ParameterRoot, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPageFile1.ResumeLayout(False) @@ -764,7 +649,6 @@ Partial Class frmMonitor Me.XtraTabPageHtml2.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.Panel1.ResumeLayout(False) @@ -772,14 +656,19 @@ Partial Class frmMonitor Me.SplitContainerControl1.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl2.ResumeLayout(False) + CType(Me.cmbSearches.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbParams, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerSQL.Panel1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerSQL.Panel1.ResumeLayout(False) CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerSQL.Panel2.ResumeLayout(False) CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerSQL.ResumeLayout(False) - CType(Me.GridControlResults, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewResults, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl3.ResumeLayout(False) Me.XtraTabPageSQL1.ResumeLayout(False) @@ -812,12 +701,7 @@ Partial Class frmMonitor Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents cmbSearches As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents buttonSearch As DevExpress.XtraBars.BarButtonItem - Friend WithEvents TreeListResults As DevExpress.XtraTreeList.TreeList Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl @@ -854,24 +738,17 @@ Partial Class frmMonitor Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem 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 - Friend WithEvents colCOLUMN3 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents colADDED_WHEN As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents colState As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents colICON As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn1 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn2 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn3 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn4 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn5 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn6 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn7 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents TreeListColumn8 As DevExpress.XtraTreeList.Columns.TreeListColumn 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 btnReloadSearches As DevExpress.XtraBars.BarButtonItem Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager + Friend WithEvents btnResetLayout As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents SearchRoot As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents cmbSearches As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents lbParams As DevExpress.XtraLayout.SimpleLabelItem End Class diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index 257663f..be71baf 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -50,16 +50,20 @@ Public Class frmMonitor Private HtmlResultViewers As List(Of RichEditControl) Private HtmlResultTabs As List(Of XtraTabPage) - + Private TreeListResults As TreeList + Private GridControlResults As GridControl + Private GridViewResults As GridView Private Const STATE_SUCCESS As String = "SUCCESS" Private Const STATE_FAILURE As String = "FAILURE" Private Const STATE_WARNING As String = "WARNING" Private Const STATE_WAITING As String = "WAITING" Private Const STATE_HIGHLIGHT As String = "HIGHLIGHT" - + Private Const LIST_CONTROL_NULL_TEXT As String = "Kein Wert ausgewählt" Private MarkedColumns As New List(Of GridColumn) Private ActiveSearch As Search = Nothing + Private LastSearch As Search = Nothing + Private LastLoadedSearch As Search = Nothing Private Enum NodeImage [Default] = 0 @@ -127,14 +131,16 @@ Public Class frmMonitor SearchLoader = New SearchLoader(LogConfig, ConfigManager.Config, Database) GridBuilder = New GridBuilder() - Dim oGrids As GridView() = New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4, GridViewResults}.ToArray + InitGrid() + InitTreeList() + + Dim oGrids As GridView() = New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4}.ToArray GridBuilder.SetDefaults(oGrids) GridBuilder.SetClipboardHandler(oGrids) GridBuilder.SetReadOnlyOptions(oGrids) - GridBuilder.SetDefaults(TreeListResults) - GridBuilder.SetClipboardHandler(TreeListResults) - GridBuilder.SetReadOnlyOptions(TreeListResults) + + SQLResultGrids = New List(Of GridControl) From {GridControl1, GridControl2, GridControl3, GridControl4} @@ -171,6 +177,7 @@ Public Class frmMonitor SplitContainerSQL.Collapsed = True SplitContainerFileHTML.Collapsed = True + lbResultCount.Caption = String.Format(lbResultCount.Tag, 0) Catch ex As Exception FormHelper.ShowErrorMessage(ex, "frmStart_Load") @@ -198,7 +205,9 @@ Public Class frmMonitor Dim oSearch As Search = cmbSearches.EditValue Dim oMissingParams = False - ActiveSearch = oSearch + If LastLoadedSearch IsNot Nothing AndAlso oSearch.Id = LastLoadedSearch.Id Then + Workspace.SaveWorkspace(oSearch.Id.ToString) + End If MarkedColumns.Clear() HideAllTabs() @@ -215,16 +224,22 @@ Public Class frmMonitor 'Dim oSQL As String = $"EXEC [{ConfigManager.Config.DBPrefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{cmbSearches.EditValue}','irgendwas','irgendwas','irgendwas',1" Dim oSQL As String = oSearch.SQLCommand Dim oControls As New List(Of Control) - For Each oItem As LayoutControlItem In ParameterRoot.Items - oControls.Add(oItem.Control) + For Each oItem As Control In LayoutControl1.Controls + Dim oParam = oSearch.Parameters. - Where(Function(param) param.PatternTitle = oItem.Control.Name). + Where(Function(param) param.PatternTitle = oItem.Name). FirstOrDefault() - If oParam.Required And Not ControlHelper.HasValue(oItem.Control) Then + If oParam Is Nothing Then + Continue For + End If + + oControls.Add(oItem) + + If oParam.Required And Not ControlHelper.HasValue(oItem) Then AdornerUIManager2.Elements.Add(New VisualEffects.ValidationHint With { - .TargetElement = oItem.Control, + .TargetElement = oItem, .Visible = True }) oMissingParams = True @@ -261,8 +276,7 @@ Public Class frmMonitor End If Next - - InitTreeList(oMaxLength) + InitTreeListColumns(oMaxLength) ' Show all columns in DisplayColumns List For Each oColumn In TreeListResults.Columns @@ -309,6 +323,7 @@ Public Class frmMonitor GridViewResults.FocusInvalidRow() Workspace.LoadWorkspace(oSearch.Id.ToString) + LastLoadedSearch = oSearch Return True Catch ex As Exception @@ -337,40 +352,16 @@ Public Class frmMonitor End Try End Sub - Private Sub InitTreeList(pMaxLength As Integer) - TreeListResults.KeyFieldName = "GUID" - TreeListResults.ParentFieldName = "PARENT_ID" - Dim oStateEdit As New RepositoryItemImageComboBox With { - .SmallImages = SvgImageCollection1, - .GlyphAlignment = HorzAlignment.Near - } - oStateEdit.Buttons.Clear() - oStateEdit.Items.AddRange(New List(Of ImageComboBoxItem) From { - New ImageComboBoxItem("Success", "SUCCESS", NodeImage.Success), - New ImageComboBoxItem("Failure", "FAILURE", NodeImage.Failure), - New ImageComboBoxItem("Warning", "WARNING", NodeImage.Warning), - New ImageComboBoxItem("Waiting", "WAITING", NodeImage.Waiting), - New ImageComboBoxItem("Default", "DEFAULT", NodeImage.Default), - New ImageComboBoxItem("User", "USER", NodeImage.User), - New ImageComboBoxItem("Highlight", "HIGHLIGHT", NodeImage.Highlight) - }) - - Dim oIconEdit As New RepositoryItemImageComboBox With { - .SmallImages = SvgImageCollection1, - .GlyphAlignment = HorzAlignment.Near - } - oStateEdit.Buttons.Clear() - oStateEdit.Items.AddRange(New List(Of ImageComboBoxItem) From { - New ImageComboBoxItem("Email", "MAIL", NodeImage.Mail), - New ImageComboBoxItem("SQL", "SQL", NodeImage.SQL), - New ImageComboBoxItem("File", "FILE", NodeImage.File) - }) + Private Sub InitTreeListColumns(pMaxLength As Integer) Dim oColumn1 = TreeListResults.Columns.Item("COLUMN1") Dim oStateColumn = TreeListResults.Columns.Item("STATE") Dim oIconColumn = TreeListResults.Columns.Item("ICON") + Dim oStateEdit As RepositoryItemImageComboBox = GetStateEdit() + Dim oIconEdit As RepositoryItemImageComboBox = GetIconEdit() + oColumn1.VisibleIndex = 0 oStateColumn.VisibleIndex = 1 oIconColumn.VisibleIndex = 2 @@ -394,7 +385,7 @@ Public Class frmMonitor End With With oIconColumn - .ColumnEdit = oStateEdit + .ColumnEdit = oIconEdit .MaxWidth = 25 .MinWidth = 25 .Width = 25 @@ -402,75 +393,162 @@ Public Class frmMonitor .OptionsColumn.AllowSize = False .ImageOptions.Image = SvgImageCollection1.GetImage(NodeImage.SQL) End With - End Sub + Private Function GetIconEdit() As RepositoryItemImageComboBox + Dim oIconEdit As New RepositoryItemImageComboBox With { + .SmallImages = SvgImageCollection1, + .GlyphAlignment = HorzAlignment.Near + } + oIconEdit.Buttons.Clear() + oIconEdit.Items.AddRange(New List(Of ImageComboBoxItem) From { + New ImageComboBoxItem("Email", "MAIL", NodeImage.Mail), + New ImageComboBoxItem("SQL", "SQL", NodeImage.SQL), + New ImageComboBoxItem("File", "FILE", NodeImage.File) + }) + Return oIconEdit + End Function + Private Sub cmbSearches_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbSearches.SelectedValueChanged - Dim oSearch As Search = CType(cmbSearches.SelectedItem, Search) + DisposeTreeList() + InitTreeList() - If ActiveSearch IsNot Nothing Then - Workspace.SaveWorkspace(ActiveSearch.Id.ToString) - End If + DisposeGrid() + InitGrid() - ParameterRoot.Clear() - AdornerUIManager2.Hide() - AdornerUIManager2.Elements.Clear() + lbResultCount.Caption = String.Format(lbResultCount.Tag, 0) - TreeListResults.DataSource = Nothing - GridControlResults.DataSource = Nothing + LoadSearch() + End Sub - For Each oParam As SearchParameter In oSearch.Parameters - Dim oControl As Control + Private Sub LoadSearch() + Try + If TypeOf cmbSearches.SelectedItem IsNot Search Then + Exit Sub + End If - Select Case oParam.DataType - Case DataTypeEnum.Boolean - Dim oCheckbox = New CheckEdit With { + Dim oSearch As Search = CType(cmbSearches.SelectedItem, Search) + + If ActiveSearch IsNot Nothing Then + Workspace.SaveWorkspace(ActiveSearch.Id.ToString) + End If + + LastSearch = ActiveSearch + ActiveSearch = oSearch + + AdornerUIManager2.Hide() + AdornerUIManager2.Elements.Clear() + + Root.Clear(disposeItemAndControls:=True) + LayoutControl1.Clear(True, True) + + 'LayoutControl1.Items.Clear() + ' LayoutControl1.Controls.Clear() + + TreeListResults.DataSource = Nothing + GridControlResults.DataSource = Nothing + + If oSearch.Parameters.Count = 0 Then + lbParams.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never + + Else + lbParams.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always + + End If + + For Each oParam As SearchParameter In oSearch.Parameters + Dim oControl As Control + + Select Case oParam.DataType + Case DataTypeEnum.Boolean + Dim oCheckbox = New CheckEdit With { .Text = oParam.Title } - oControl = oCheckbox + oControl = oCheckbox - Case DataTypeEnum.Date - oControl = New DateEdit() + Case DataTypeEnum.Date + oControl = New DateEdit() - Case DataTypeEnum.String - Select Case oParam.ItemType - Case ItemTypeEnum.List - Dim oCombobox = New ComboBoxEdit() - Dim oItems = oParam.ItemString.Split(";"c).ToList() - oCombobox.Properties.Items.AddRange(oItems) - oControl = oCombobox + Case DataTypeEnum.String + Select Case oParam.ItemType + Case ItemTypeEnum.List + Dim oCombobox = New ComboBoxEdit() With { + .Name = oParam.PatternTitle, + .Tag = oParam.PatternTitle + } + Dim oClearButton = GetClearButtonForControl(oCombobox) + Dim oItems = oParam.ItemString.Split(";"c).ToList() + oCombobox.Properties.Items.AddRange(oItems) + oCombobox.Properties.NullText = LIST_CONTROL_NULL_TEXT + oCombobox.Properties.Buttons.Add(oClearButton) + oControl = oCombobox - Case ItemTypeEnum.SQL - Dim oGridCombobox = New LookUpEdit() - Dim oSQL = oParam.ItemString - Dim oTable = Database.GetDatatable(oSQL) - oGridCombobox.Properties.DataSource = oTable - oGridCombobox.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName - oGridCombobox.Properties.ValueMember = oTable.Columns.Item(0).ColumnName - oControl = oGridCombobox + Case ItemTypeEnum.SQL + Dim oGridCombobox = New LookUpEdit() With { + .Name = oParam.PatternTitle, + .Tag = oParam.PatternTitle + } + Dim oClearButton = GetClearButtonForControl(oGridCombobox) + Dim oSQL = oParam.ItemString + Dim oTable = Database.GetDatatable(oSQL) + oGridCombobox.Properties.DataSource = oTable + oGridCombobox.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName + oGridCombobox.Properties.ValueMember = oTable.Columns.Item(0).ColumnName + oGridCombobox.Properties.NullText = LIST_CONTROL_NULL_TEXT + oGridCombobox.Properties.Buttons.Add(oClearButton) + oControl = oGridCombobox - Case Else - oControl = New TextEdit() - End Select + Case Else + oControl = New TextEdit() + End Select - Case Else - oControl = New TextEdit() + Case Else + oControl = New TextEdit() - End Select + End Select - oControl.Name = oParam.PatternTitle + oControl.Name = oParam.PatternTitle + oControl.Tag = oParam.PatternTitle - Dim oItem As LayoutControlItem = ParameterRoot.AddItem() - oItem.Text = oParam.Title - oItem.Control = oControl - oItem.TextLocation = Locations.Top - oItem.TextToControlDistance = 3 - oItem.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 10, 0) + Dim oItem As LayoutControlItem = LayoutControl1.AddItem() + oItem.Text = oParam.Title + oItem.Control = oControl + oItem.TextLocation = Locations.Top + oItem.TextToControlDistance = 3 + oItem.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 10, 0) - Next + Next + Catch ex As Exception + + End Try + End Sub + + Private Function GetClearButtonForControl(pControl As Control) As EditorButton + Dim oClearButton As New EditorButton() With { + .Kind = ButtonPredefines.Clear, + .Tag = pControl.Name + } + AddHandler oClearButton.Click, AddressOf ClearButton_Click + Return oClearButton + End Function + + Private Sub ClearButton_Click(sender As Object, e As EventArgs) + Dim oButton As EditorButton = sender + Dim oControlName As String = oButton.Tag.ToString + + Dim oControl = LayoutControl1.Controls.Find(oControlName, True).SingleOrDefault() + + Select Case oControl.GetType + Case GetType(LookUpEdit) + DirectCast(oControl, LookUpEdit).EditValue = Nothing + + Case GetType(ComboBoxEdit) + DirectCast(oControl, ComboBoxEdit).EditValue = Nothing + End Select + End Sub Private Function GetParameterItems(pParam As SearchParameter) As Object @@ -485,7 +563,7 @@ Public Class frmMonitor End Select End Function - Private Sub TreeListResults_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListResults.FocusedNodeChanged + Private Sub TreeListResults_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) If e.Node Is Nothing Then Exit Sub End If @@ -675,7 +753,7 @@ Public Class frmMonitor End If End Function - Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Handles TreeListResults.CustomDrawNodeCell + Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Dim oColumn = TreeListResults.Columns.Item("STATE") Dim oState = NotNull(e.Node.GetValue(oColumn), Nothing) @@ -701,7 +779,7 @@ Public Class frmMonitor e.Handled = False End Sub - Private Sub TreeListResults_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs) Handles TreeListResults.GetStateImage + Private Sub TreeListResults_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs) 'Dim oValues As Dictionary(Of String, String) = GetValuesFromNode(e.Node, DataColumns) 'Dim oSQLCommands = oValues. ' Where(Function(v) v.Key.StartsWith("SELECT")). @@ -782,7 +860,7 @@ Public Class frmMonitor End Sub - Private Sub TreeListResults_MouseClick(sender As Object, e As MouseEventArgs) Handles TreeListResults.MouseClick + Private Sub TreeListResults_MouseClick(sender As Object, e As MouseEventArgs) Dim oInfo As TreeListHitInfo = TreeListResults.CalcHitInfo(New Point(e.X, e.Y)) If oInfo.InRowCell Then @@ -830,7 +908,7 @@ Public Class frmMonitor GridControlResults.DataSource = Nothing End Sub - Private Sub GridViewResults_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewResults.FocusedRowChanged + Private Sub GridViewResults_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) If GridViewResults.FocusedRowHandle < 0 Then Exit Sub End If @@ -916,6 +994,66 @@ Public Class frmMonitor End If End Sub + Private Sub btnResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnResetLayout.ItemClick + If ActiveSearch IsNot Nothing Then + Workspace.ResetWorkspace(ActiveSearch.Id.ToString) + LastLoadedSearch = Nothing + ActiveSearch = Nothing + + DisposeTreeList() + InitTreeList() + + DisposeGrid() + InitGrid() + + LoadSearch() + + lbResultCount.Caption = String.Format(lbResultCount.Tag, 0) + End If + End Sub + + Private Sub DisposeGrid() + GridViewResults.Dispose() + GridViewResults = Nothing + GridControlResults.Dispose() + GridControlResults = Nothing + End Sub + + Private Sub InitGrid() + GridControlResults = New GridControl() With { + .Name = "GridViewResults", + .Visible = False + } + SplitContainerSQL.Panel1.Controls.Add(GridControlResults) + GridControlResults.ForceInitialize() + GridViewResults = DirectCast(GridControlResults.DefaultView, GridView) + + GridBuilder.SetDefaults(GridViewResults) + GridBuilder.SetClipboardHandler(GridViewResults) + GridBuilder.SetReadOnlyOptions(GridViewResults) + End Sub + + Private Sub DisposeTreeList() + TreeListResults.Dispose() + TreeListResults = Nothing + End Sub + + Private Sub InitTreeList() + TreeListResults = New TreeList() With { + .Name = "TreeListResults", + .Visible = False + } + SplitContainerSQL.Panel1.Controls.Add(TreeListResults) + TreeListResults.ForceInitialize() + + TreeListResults.KeyFieldName = "GUID" + TreeListResults.ParentFieldName = "PARENT_ID" + + GridBuilder.SetDefaults(TreeListResults) + GridBuilder.SetClipboardHandler(TreeListResults) + GridBuilder.SetReadOnlyOptions(TreeListResults) + 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 @@ -924,5 +1062,24 @@ Public Class frmMonitor ' ea.Cancel = True ' End If 'End Sub + + Private Function GetStateEdit() As RepositoryItemImageComboBox + Dim oStateEdit As New RepositoryItemImageComboBox With { + .SmallImages = SvgImageCollection1, + .GlyphAlignment = HorzAlignment.Near + } + oStateEdit.Buttons.Clear() + oStateEdit.Items.AddRange(New List(Of ImageComboBoxItem) From { + New ImageComboBoxItem("Success", "SUCCESS", NodeImage.Success), + New ImageComboBoxItem("Failure", "FAILURE", NodeImage.Failure), + New ImageComboBoxItem("Warning", "WARNING", NodeImage.Warning), + New ImageComboBoxItem("Waiting", "WAITING", NodeImage.Waiting), + New ImageComboBoxItem("Default", "DEFAULT", NodeImage.Default), + New ImageComboBoxItem("User", "USER", NodeImage.User), + New ImageComboBoxItem("Highlight", "HIGHLIGHT", NodeImage.Highlight) + }) + + Return oStateEdit + End Function End Class