diff --git a/App/EmailProfiler.Form/App.config b/App/EmailProfiler.Form/App.config index 7ace168..e94e6e8 100644 --- a/App/EmailProfiler.Form/App.config +++ b/App/EmailProfiler.Form/App.config @@ -1,20 +1,18 @@ - -
+ +
- -
+ +
- + - + @@ -27,10 +25,10 @@ - + - + False @@ -43,10 +41,10 @@ Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd - + - + sysdba diff --git a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj index a2221f8..536dc3c 100644 --- a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj +++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj @@ -11,7 +11,7 @@ EmailProfiler.Form 512 WindowsForms - v4.6.2 + v4.8 true diff --git a/App/EmailProfiler.Form/My Project/Application.Designer.vb b/App/EmailProfiler.Form/My Project/Application.Designer.vb index 45a34ef..31d42a7 100644 --- a/App/EmailProfiler.Form/My Project/Application.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 ' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten - ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. - ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im - ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. + 'NOTE: This file is auto-generated; do not modify it directly. To make changes, + ' or if you encounter build errors in this file, go to the Project Designer + ' (go to Project Properties or double-click the My Project node in + ' Solution Explorer), and make changes on the Application tab. ' Partial Friend Class MyApplication @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.EmailProfiler.Form.frmMain End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/App/EmailProfiler.Form/My Project/Application.myapp b/App/EmailProfiler.Form/My Project/Application.myapp index 1243847..0eb0fb2 100644 --- a/App/EmailProfiler.Form/My Project/Application.myapp +++ b/App/EmailProfiler.Form/My Project/Application.myapp @@ -1,11 +1,12 @@  - + true - Form1 + frmMain false 0 true 0 - 0 + 0 true - + 0 + \ No newline at end of file diff --git a/App/EmailProfiler.Form/My Project/AssemblyInfo.vb b/App/EmailProfiler.Form/My Project/AssemblyInfo.vb index cefcfae..54227dd 100644 --- a/App/EmailProfiler.Form/My Project/AssemblyInfo.vb +++ b/App/EmailProfiler.Form/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/App/EmailProfiler.Form/My Project/Resources.Designer.vb b/App/EmailProfiler.Form/My Project/Resources.Designer.vb index 22cdbd8..c63e176 100644 --- a/App/EmailProfiler.Form/My Project/Resources.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Resources.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 ' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. ' '------------------------------------------------------------------------------ @@ -15,12 +15,12 @@ Imports System Namespace My.Resources - 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. ''' - ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' Returns the cached ResourceManager instance used by this class. ''' _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager @@ -47,8 +47,8 @@ Namespace My.Resources End Property ''' - ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. ''' _ Friend Property Culture() As Global.System.Globalization.CultureInfo @@ -61,7 +61,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property arrow_Down_16xMD() As System.Drawing.Bitmap Get @@ -71,7 +71,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property arrow_right() As System.Drawing.Bitmap Get @@ -81,7 +81,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property email_go() As System.Drawing.Bitmap Get @@ -91,7 +91,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property Encrypt() As System.Drawing.Bitmap Get @@ -101,7 +101,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property folder_Closed_16xLG() As System.Drawing.Bitmap Get @@ -111,7 +111,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property handdrawn_arrow_down() As System.Drawing.Bitmap Get @@ -121,7 +121,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property key_16xLG() As System.Drawing.Bitmap Get @@ -131,7 +131,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property refresh_16xLG() As System.Drawing.Bitmap Get @@ -141,7 +141,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Friend ReadOnly Property save_16xMD() As System.Drawing.Bitmap Get diff --git a/App/EmailProfiler.Form/My Project/Settings.Designer.vb b/App/EmailProfiler.Form/My Project/Settings.Designer.vb index 41bbd9a..6d1b86f 100644 --- a/App/EmailProfiler.Form/My Project/Settings.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 ' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. ' '------------------------------------------------------------------------------ @@ -22,7 +22,7 @@ Namespace My Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) -#Region "Automatische My.Settings-Speicherfunktion" +#Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb index 3c6a243..782f968 100644 --- a/App/EmailProfiler.Form/frmMain.Designer.vb +++ b/App/EmailProfiler.Form/frmMain.Designer.vb @@ -324,6 +324,17 @@ Partial Class frmMain Me.txtUser = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.txtPasswort = New System.Windows.Forms.TextBox() + Me.tabMonitoring = New System.Windows.Forms.TabPage() + Me.pnlMonitoringGrid = New DevExpress.XtraEditors.PanelControl() + Me.gridMonitoring = New DevExpress.XtraGrid.GridControl() + Me.GridViewMonitoring = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.pnlMonitoringConfig = New DevExpress.XtraEditors.PanelControl() + Me.btnRestoreDefaultLayout = New System.Windows.Forms.Button() + Me.btnSaveLayout = New System.Windows.Forms.Button() + Me.btnRefresh = New System.Windows.Forms.Button() + Me.btnMonitoringConfig = New System.Windows.Forms.Button() + Me.txtMonitoringConfig = New System.Windows.Forms.TextBox() + Me.lblMonitoringConfig = New System.Windows.Forms.Label() Me.TBEMLP_HISTORYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.TBEMLP_POLL_PROFILESTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_PROFILESTableAdapter() @@ -440,6 +451,13 @@ Partial Class frmMain CType(Me.TBEMLP_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() + Me.tabMonitoring.SuspendLayout() + CType(Me.pnlMonitoringGrid, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlMonitoringGrid.SuspendLayout() + CType(Me.gridMonitoring, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewMonitoring, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.pnlMonitoringConfig, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlMonitoringConfig.SuspendLayout() CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -1004,6 +1022,7 @@ Partial Class frmMain Me.TabControl1.Controls.Add(Me.tabProfile) Me.TabControl1.Controls.Add(Me.tabEmail) Me.TabControl1.Controls.Add(Me.tabConfig) + Me.TabControl1.Controls.Add(Me.tabMonitoring) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" @@ -1679,9 +1698,9 @@ Partial Class frmMain 'ACTIVECheckBox1 ' Me.ACTIVECheckBox1.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox1.Location = New System.Drawing.Point(757, 38) + Me.ACTIVECheckBox1.Location = New System.Drawing.Point(757, 47) Me.ACTIVECheckBox1.Name = "ACTIVECheckBox1" - Me.ACTIVECheckBox1.Size = New System.Drawing.Size(94, 38) + Me.ACTIVECheckBox1.Size = New System.Drawing.Size(61, 22) Me.ACTIVECheckBox1.TabIndex = 3 Me.ACTIVECheckBox1.Text = "Active" Me.ACTIVECheckBox1.UseVisualStyleBackColor = True @@ -1701,7 +1720,7 @@ Partial Class frmMain Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5 Me.BindingNavigator2.Name = "BindingNavigator2" Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1 - Me.BindingNavigator2.Size = New System.Drawing.Size(1065, 25) + Me.BindingNavigator2.Size = New System.Drawing.Size(974, 25) Me.BindingNavigator2.TabIndex = 32 Me.BindingNavigator2.Text = "BindingNavigator2" ' @@ -1816,7 +1835,7 @@ Partial Class frmMain Me.GridControl1.Location = New System.Drawing.Point(0, 0) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(245, 320) + Me.GridControl1.Size = New System.Drawing.Size(245, 337) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -2297,7 +2316,7 @@ Partial Class frmMain Me.BindingNavigator4.MovePreviousItem = Me.ToolStripButton22 Me.BindingNavigator4.Name = "BindingNavigator4" Me.BindingNavigator4.PositionItem = Me.ToolStripTextBox3 - Me.BindingNavigator4.Size = New System.Drawing.Size(1471, 25) + Me.BindingNavigator4.Size = New System.Drawing.Size(974, 25) Me.BindingNavigator4.TabIndex = 35 Me.BindingNavigator4.Text = "BindingNavigator4" ' @@ -2412,7 +2431,7 @@ Partial Class frmMain Me.GridControl3.Location = New System.Drawing.Point(0, 0) Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(245, 320) + Me.GridControl3.Size = New System.Drawing.Size(245, 337) Me.GridControl3.TabIndex = 34 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -2499,9 +2518,9 @@ Partial Class frmMain 'ACTIVECheckBox ' Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROFILESBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(258, 97) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(258, 100) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" - Me.ACTIVECheckBox.Size = New System.Drawing.Size(58, 24) + Me.ACTIVECheckBox.Size = New System.Drawing.Size(58, 21) Me.ACTIVECheckBox.TabIndex = 17 Me.ACTIVECheckBox.Text = "Active" Me.ACTIVECheckBox.UseVisualStyleBackColor = True @@ -2926,8 +2945,8 @@ Partial Class frmMain 'BindingNavigatorCountItem1 ' Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem1" - Me.BindingNavigatorCountItem1.Size = New System.Drawing.Size(44, 22) - Me.BindingNavigatorCountItem1.Text = "von {0}" + Me.BindingNavigatorCountItem1.Size = New System.Drawing.Size(35, 22) + Me.BindingNavigatorCountItem1.Text = "of {0}" Me.BindingNavigatorCountItem1.ToolTipText = "Die Gesamtanzahl der Elemente." ' 'BindingNavigatorDeleteItem1 @@ -3398,6 +3417,113 @@ Partial Class frmMain Me.txtPasswort.TabIndex = 50 Me.txtPasswort.UseSystemPasswordChar = True ' + 'tabMonitoring + ' + Me.tabMonitoring.Controls.Add(Me.pnlMonitoringGrid) + Me.tabMonitoring.Controls.Add(Me.pnlMonitoringConfig) + Me.tabMonitoring.Location = New System.Drawing.Point(4, 22) + Me.tabMonitoring.Name = "tabMonitoring" + Me.tabMonitoring.Padding = New System.Windows.Forms.Padding(3) + Me.tabMonitoring.Size = New System.Drawing.Size(1227, 568) + Me.tabMonitoring.TabIndex = 4 + Me.tabMonitoring.Text = "Monitoring" + Me.tabMonitoring.UseVisualStyleBackColor = True + ' + 'pnlMonitoringGrid + ' + Me.pnlMonitoringGrid.Controls.Add(Me.gridMonitoring) + Me.pnlMonitoringGrid.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnlMonitoringGrid.Location = New System.Drawing.Point(3, 47) + Me.pnlMonitoringGrid.Name = "pnlMonitoringGrid" + Me.pnlMonitoringGrid.Size = New System.Drawing.Size(1221, 518) + Me.pnlMonitoringGrid.TabIndex = 1 + ' + 'gridMonitoring + ' + Me.gridMonitoring.Dock = System.Windows.Forms.DockStyle.Fill + Me.gridMonitoring.Location = New System.Drawing.Point(2, 2) + Me.gridMonitoring.MainView = Me.GridViewMonitoring + Me.gridMonitoring.Name = "gridMonitoring" + Me.gridMonitoring.Size = New System.Drawing.Size(1217, 514) + Me.gridMonitoring.TabIndex = 0 + Me.gridMonitoring.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewMonitoring}) + ' + 'GridViewMonitoring + ' + Me.GridViewMonitoring.GridControl = Me.gridMonitoring + Me.GridViewMonitoring.Name = "GridViewMonitoring" + ' + 'pnlMonitoringConfig + ' + Me.pnlMonitoringConfig.Controls.Add(Me.btnRestoreDefaultLayout) + Me.pnlMonitoringConfig.Controls.Add(Me.btnSaveLayout) + Me.pnlMonitoringConfig.Controls.Add(Me.btnRefresh) + Me.pnlMonitoringConfig.Controls.Add(Me.btnMonitoringConfig) + Me.pnlMonitoringConfig.Controls.Add(Me.txtMonitoringConfig) + Me.pnlMonitoringConfig.Controls.Add(Me.lblMonitoringConfig) + Me.pnlMonitoringConfig.Dock = System.Windows.Forms.DockStyle.Top + Me.pnlMonitoringConfig.Location = New System.Drawing.Point(3, 3) + Me.pnlMonitoringConfig.Name = "pnlMonitoringConfig" + Me.pnlMonitoringConfig.Size = New System.Drawing.Size(1221, 44) + Me.pnlMonitoringConfig.TabIndex = 0 + ' + 'btnRestoreDefaultLayout + ' + Me.btnRestoreDefaultLayout.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnRestoreDefaultLayout.Location = New System.Drawing.Point(1026, 10) + Me.btnRestoreDefaultLayout.Name = "btnRestoreDefaultLayout" + Me.btnRestoreDefaultLayout.Size = New System.Drawing.Size(183, 23) + Me.btnRestoreDefaultLayout.TabIndex = 5 + Me.btnRestoreDefaultLayout.Text = "Standard-Layout wiederherstellen" + Me.btnRestoreDefaultLayout.UseVisualStyleBackColor = True + ' + 'btnSaveLayout + ' + Me.btnSaveLayout.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnSaveLayout.Location = New System.Drawing.Point(910, 10) + Me.btnSaveLayout.Name = "btnSaveLayout" + Me.btnSaveLayout.Size = New System.Drawing.Size(106, 23) + Me.btnSaveLayout.TabIndex = 4 + Me.btnSaveLayout.Text = "Layout speichern" + Me.btnSaveLayout.UseVisualStyleBackColor = True + ' + 'btnRefresh + ' + Me.btnRefresh.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG + Me.btnRefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRefresh.Location = New System.Drawing.Point(311, 10) + Me.btnRefresh.Name = "btnRefresh" + Me.btnRefresh.Size = New System.Drawing.Size(92, 23) + Me.btnRefresh.TabIndex = 3 + Me.btnRefresh.Text = "Aktualisieren" + Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnRefresh.UseVisualStyleBackColor = True + ' + 'btnMonitoringConfig + ' + Me.btnMonitoringConfig.Location = New System.Drawing.Point(220, 10) + Me.btnMonitoringConfig.Name = "btnMonitoringConfig" + Me.btnMonitoringConfig.Size = New System.Drawing.Size(80, 23) + Me.btnMonitoringConfig.TabIndex = 2 + Me.btnMonitoringConfig.Text = "Übernehmen" + Me.btnMonitoringConfig.UseVisualStyleBackColor = True + ' + 'txtMonitoringConfig + ' + Me.txtMonitoringConfig.Location = New System.Drawing.Point(147, 11) + Me.txtMonitoringConfig.Name = "txtMonitoringConfig" + Me.txtMonitoringConfig.Size = New System.Drawing.Size(61, 21) + Me.txtMonitoringConfig.TabIndex = 1 + ' + 'lblMonitoringConfig + ' + Me.lblMonitoringConfig.AutoSize = True + Me.lblMonitoringConfig.Location = New System.Drawing.Point(23, 15) + Me.lblMonitoringConfig.Name = "lblMonitoringConfig" + Me.lblMonitoringConfig.Size = New System.Drawing.Size(117, 13) + Me.lblMonitoringConfig.TabIndex = 0 + Me.lblMonitoringConfig.Text = "Abrufmenge an Emails:" + ' 'TBEMLP_HISTORYBindingSource ' Me.TBEMLP_HISTORYBindingSource.DataMember = "TBEMLP_HISTORY" @@ -3459,12 +3585,14 @@ Partial Class frmMain Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScroll = True Me.ClientSize = New System.Drawing.Size(1235, 616) Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.StatusStrip1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.IconOptions.Icon = CType(resources.GetObject("frmMain.IconOptions.Icon"), System.Drawing.Icon) Me.IconOptions.SvgImage = CType(resources.GetObject("frmMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.MinimumSize = New System.Drawing.Size(800, 400) Me.Name = "frmMain" Me.Text = "Konfiguration Email-Profiler" Me.StatusStrip1.ResumeLayout(False) @@ -3533,6 +3661,14 @@ Partial Class frmMain CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() + Me.tabMonitoring.ResumeLayout(False) + CType(Me.pnlMonitoringGrid, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlMonitoringGrid.ResumeLayout(False) + CType(Me.gridMonitoring, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewMonitoring, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.pnlMonitoringConfig, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlMonitoringConfig.ResumeLayout(False) + Me.pnlMonitoringConfig.PerformLayout() CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3796,4 +3932,15 @@ Partial Class frmMain Friend WithEvents CheckBoxEnableTls1_2 As CheckBox Friend WithEvents CheckBoxEnableTls1_1 As CheckBox Friend WithEvents Label15 As Label + Friend WithEvents tabMonitoring As TabPage + Friend WithEvents pnlMonitoringGrid As DevExpress.XtraEditors.PanelControl + Friend WithEvents pnlMonitoringConfig As DevExpress.XtraEditors.PanelControl + Friend WithEvents lblMonitoringConfig As Label + Friend WithEvents btnMonitoringConfig As Button + Friend WithEvents txtMonitoringConfig As TextBox + Friend WithEvents gridMonitoring As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewMonitoring As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents btnRefresh As Button + Friend WithEvents btnRestoreDefaultLayout As Button + Friend WithEvents btnSaveLayout As Button End Class diff --git a/App/EmailProfiler.Form/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb index 1439221..3ce6790 100644 --- a/App/EmailProfiler.Form/frmMain.vb +++ b/App/EmailProfiler.Form/frmMain.vb @@ -93,6 +93,11 @@ Public Class frmMain _Encryption = New clsEncryption("!35452didalog=", LogConfig) + + If String.IsNullOrWhiteSpace(txtMonitoringConfig.Text) OrElse Not IsNumeric(txtMonitoringConfig.Text) OrElse CInt(txtMonitoringConfig.Text) <= 0 Then + txtMonitoringConfig.Text = "500" + End If + LoadMonitoringIntoGrid() End Sub Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown @@ -1044,4 +1049,70 @@ Public Class frmMain Private Sub COMMENT_PROFILESTextBox_TextChanged(sender As Object, e As EventArgs) Handles COMMENT_PROFILESTextBox.TextChanged End Sub + + Private Sub LoadMonitoringIntoGrid() + Try + + Dim emailAmount As Integer + If txtMonitoringConfig.Text = Nothing OrElse Not IsNumeric(txtMonitoringConfig.Text) Then + emailAmount = 500 + Else + emailAmount = Convert.ToInt32(txtMonitoringConfig.Text) + End If + + Dim oSQL = $"SELECT TOP ({emailAmount}) GUID, PROFILE_ID, EMAIL_MSGID, EMAIL_FROM, EMAIL_SUBJECT, EMAIL_DATE, ADDED_WHEN, STATUS FROM [dbo].[TBEMLP_HISTORY] (nolock) order by GUID DESC" + Dim oDT As DataTable = _database.GetDatatable(oSQL) + + Me.gridMonitoring.DataSource = oDT + + Dim gridView = TryCast(Me.GridViewMonitoring, DevExpress.XtraGrid.Views.Grid.GridView) + If gridView IsNot Nothing Then + + gridView.OptionsView.ColumnAutoWidth = True + gridView.BestFitColumns() + gridView.OptionsBehavior.Editable = False + + LoadLayoutMonitoring() + End If + + Catch ex As Exception + If Logger IsNot Nothing Then Logger.Error(ex) Else Debug.WriteLine(ex.ToString()) + End Try + End Sub + + Private Sub txtMonitoringConfig_LostFocus(sender As Object, e As EventArgs) Handles txtMonitoringConfig.LostFocus + If Not IsNumeric(txtMonitoringConfig.Text) OrElse CInt(txtMonitoringConfig.Text) <= 0 Then + txtMonitoringConfig.Text = "500" + End If + LoadMonitoringIntoGrid() + End Sub + + Private Sub btnRefresh_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click + LoadMonitoringIntoGrid() + End Sub + + Private Sub btnSaveLayout_Click(sender As Object, e As EventArgs) Handles btnSaveLayout.Click + Dim layoutPath As String = System.IO.Path.Combine(Application.UserAppDataPath, "gridMonitoringLayout.xml") + GridViewMonitoring.SaveLayoutToXml(layoutPath) + MessageBox.Show("Layout gespeichert!") + End Sub + + Private Sub btnRestoreDefaultLayout_Click(sender As Object, e As EventArgs) Handles btnRestoreDefaultLayout.Click + Dim layoutPath As String = System.IO.Path.Combine(Application.UserAppDataPath, "gridMonitoringLayout.xml") + If System.IO.File.Exists(layoutPath) Then + System.IO.File.Delete(layoutPath) + End If + GridViewMonitoring.Columns.Clear() + gridMonitoring.DataSource = Nothing + LoadMonitoringIntoGrid() + MessageBox.Show("Standardlayout wurde wiederhergestellt!") + End Sub + + Private Sub LoadLayoutMonitoring() + Dim layoutPath As String = System.IO.Path.Combine(Application.UserAppDataPath, "gridMonitoringLayout.xml") + If System.IO.File.Exists(layoutPath) Then + GridViewMonitoring.RestoreLayoutFromXml(layoutPath) + End If + End Sub + End Class diff --git a/App/EmailProfiler.Form/packages.config b/App/EmailProfiler.Form/packages.config index 4a4c91e..9b58b3d 100644 --- a/App/EmailProfiler.Form/packages.config +++ b/App/EmailProfiler.Form/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file