diff --git a/App/EmailProfiler.Common/Data/MailContainer.vb b/App/EmailProfiler.Common/Data/MailContainer.vb
index de357ce..eb6f318 100644
--- a/App/EmailProfiler.Common/Data/MailContainer.vb
+++ b/App/EmailProfiler.Common/Data/MailContainer.vb
@@ -24,6 +24,13 @@ Public Class MailContainer
'''
Public ReadOnly Property MessageId As String
+ '''
+ ''' Eine zweite MessageID, in der das Mail-Datum berücksichtigt wird.
+ ''' Wird verwendet wenn MessageId bereits existiert.
+ '''
+ '''
+ Public ReadOnly Property MessageId2 As String
+
'''
''' The subject, truncated to SUBJECT_MAX_LENGTH characters
'''
@@ -41,6 +48,7 @@ Public Class MailContainer
MessageIdOriginal = pMail.MessageID
MessageId = StringEx.GetShortHash(pMail.MessageID)
+ MessageId2 = StringEx.GetShortHash(pMail.MessageID + pMail.Date.ToString())
Subject = ObjectEx.NotNull(pMail.Subject.Truncate(SUBJECT_MAX_LENGTH), String.Empty)
SubjectOriginal = ObjectEx.NotNull(pMail.Subject, String.Empty)
diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
index 5b68a9b..cb0b683 100644
--- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
+++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
@@ -53,22 +53,22 @@
..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll
- ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll
- ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll
- ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
- ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
- ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll
- ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll
..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll
@@ -144,19 +144,23 @@
True
- P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll
+ M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll
False
- P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll
+ M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll
True
- P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll
+ M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll
+ True
+
+
+ M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll
True
- P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll
+ M:\Bibliotheken\3rdParty\Limilabs\Mail.dll
..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb
index 283f909..af21350 100644
--- a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb
+++ b/App/EmailProfiler.Common/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.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index b259f37..99efa67 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -117,45 +117,29 @@ Public Class clsWorkEmail
CURRENT_MAIL_UID = poUID
- ' 05.06.23
- ' The MessageID is now replaced by a SHA256 Hash of the MessageID
- ' The reason is that MessageIDs can be very long,
- ' which results in the final filepath exceeding the Windream/Windows maximum of 255 chars.
- ' 28.07.23
- ' The SHA256 Hash is now truncated to half the size
- ' which should be a good balance between uniqueness and length
- 'CURRENT_MAIL_MESSAGE_ID = StringEx.GetShortHash(pMailMessage.MessageID)
-
- 'If String.IsNullOrEmpty(CURRENT_MAIL_MESSAGE_ID) Then
- ' CURRENT_MAIL_MESSAGE_ID = Guid.NewGuid.ToString()
- '
- 'ElseIf CURRENT_MAIL_MESSAGE_ID.Length > MESSAGE_ID_MAX_LENGTH Then
- '
- ' ' MessageIds longer than 100 chars will be replaced with a guid to avoid errors
- ' ' because of file paths longer than 255 chars.
- ' CURRENT_MAIL_MESSAGE_ID = Hash(CURRENT_MAIL_MESSAGE_ID)
- '
- 'Else
- ' ' Default case, should cover most message ids
- ' CURRENT_MAIL_MESSAGE_ID = CURRENT_MAIL_MESSAGE_ID.Replace(">", "").Replace("<", "")
- ' CURRENT_MAIL_MESSAGE_ID = CURRENT_MAIL_MESSAGE_ID.Replace("'", "")
- '
- 'End If
-
- If IsNothing(_CurrentMail.SubjectOriginal) Then
+ If String.IsNullOrEmpty(_CurrentMail.SubjectOriginal) Then
CURRENT_MAIL_SUBJECT = String.Empty
- _Logger.Warn("Subject was nothing!")
+ _Logger.Warn("Subject was empty or nothing!")
Else
CURRENT_MAIL_SUBJECT = _CurrentMail.SubjectOriginal.ToUpper.EscapeForSQL()
_Logger.Debug("Fixed Subject: [{0}]", CURRENT_MAIL_SUBJECT)
End If
+ ' Checking the messageID - could be a duplicate
+ _Logger.Debug($"messageID: '{_CurrentMail.MessageId}' - messageID2: '{_CurrentMail.MessageId2}'")
+
Dim oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId}'"
Dim oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
If oHistoryID > 0 And IS_LOCAL_TEST = False Then
- _Logger.Info($"Message with subject [{_CurrentMail.SubjectOriginal}] from [{_CurrentMail.SenderAddress}] has already been worked!")
- Return True
+ _Logger.Warn("Found a MessageID already in use! Try MessageID2")
+
+ oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId2}'"
+ oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
+
+ If oHistoryID > 0 And IS_LOCAL_TEST = False Then
+ _Logger.Warn("Found a MessageID2 already in use!")
+ End If
End If
Dim oTempMailExists As Boolean = Save2TempDirectory(_CurrentMail)
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/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 8cbf873..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
@@ -1693,7 +1712,6 @@ Partial Class frmMain
Me.BindingNavigator2.CountItem = Me.ToolStripLabel1
Me.BindingNavigator2.CountItemFormat = "von {0} Prozessen"
Me.BindingNavigator2.DeleteItem = Me.ToolStripButton3
- Me.BindingNavigator2.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton4, Me.ToolStripButton5, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton6, Me.ToolStripButton7, Me.ToolStripSeparator3, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton8, Me.ToolStripButton10})
Me.BindingNavigator2.Location = New System.Drawing.Point(245, 0)
Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton4
@@ -1702,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(974, 31)
+ Me.BindingNavigator2.Size = New System.Drawing.Size(974, 25)
Me.BindingNavigator2.TabIndex = 32
Me.BindingNavigator2.Text = "BindingNavigator2"
'
@@ -1712,13 +1730,13 @@ Partial Class frmMain
Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
Me.ToolStripButton2.Name = "ToolStripButton2"
Me.ToolStripButton2.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton2.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton2.Text = "Neu hinzufügen"
'
'ToolStripLabel1
'
Me.ToolStripLabel1.Name = "ToolStripLabel1"
- Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 28)
+ Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 22)
Me.ToolStripLabel1.Text = "von {0} Prozessen"
Me.ToolStripLabel1.ToolTipText = "Die Gesamtanzahl der Elemente."
'
@@ -1728,7 +1746,7 @@ Partial Class frmMain
Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image)
Me.ToolStripButton3.Name = "ToolStripButton3"
Me.ToolStripButton3.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton3.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton3.Text = "Löschen"
'
'ToolStripButton4
@@ -1737,7 +1755,7 @@ Partial Class frmMain
Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image)
Me.ToolStripButton4.Name = "ToolStripButton4"
Me.ToolStripButton4.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton4.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton4.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton4.Text = "Erste verschieben"
'
'ToolStripButton5
@@ -1746,13 +1764,13 @@ Partial Class frmMain
Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image)
Me.ToolStripButton5.Name = "ToolStripButton5"
Me.ToolStripButton5.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton5.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton5.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton5.Text = "Vorherige verschieben"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
'
'ToolStripTextBox1
'
@@ -1767,7 +1785,7 @@ Partial Class frmMain
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton6
'
@@ -1775,7 +1793,7 @@ Partial Class frmMain
Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image)
Me.ToolStripButton6.Name = "ToolStripButton6"
Me.ToolStripButton6.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton6.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton6.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton6.Text = "Nächste verschieben"
'
'ToolStripButton7
@@ -1784,13 +1802,13 @@ Partial Class frmMain
Me.ToolStripButton7.Image = CType(resources.GetObject("ToolStripButton7.Image"), System.Drawing.Image)
Me.ToolStripButton7.Name = "ToolStripButton7"
Me.ToolStripButton7.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton7.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton7.Text = "Letzte verschieben"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton8
'
@@ -1798,7 +1816,7 @@ Partial Class frmMain
Me.ToolStripButton8.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
Me.ToolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton8.Name = "ToolStripButton8"
- Me.ToolStripButton8.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton8.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton8.Text = "ToolStripButton1"
'
'ToolStripButton10
@@ -1807,7 +1825,7 @@ Partial Class frmMain
Me.ToolStripButton10.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
Me.ToolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton10.Name = "ToolStripButton10"
- Me.ToolStripButton10.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton10.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton10.Text = "Refresh"
'
'GridControl1
@@ -1951,7 +1969,6 @@ Partial Class frmMain
Me.BindingNavigator3.CountItem = Me.ToolStripLabel2
Me.BindingNavigator3.CountItemFormat = "von {0} möglichen Verarbeitungsschritten"
Me.BindingNavigator3.DeleteItem = Me.ToolStripButton12
- Me.BindingNavigator3.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.BindingNavigator3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton13, Me.ToolStripButton14, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton15, Me.ToolStripButton16, Me.ToolStripSeparator6, Me.ToolStripButton11, Me.ToolStripButton12, Me.ToolStripButton17, Me.ToolStripButton18})
Me.BindingNavigator3.Location = New System.Drawing.Point(245, 0)
Me.BindingNavigator3.MoveFirstItem = Me.ToolStripButton13
@@ -1960,7 +1977,7 @@ Partial Class frmMain
Me.BindingNavigator3.MovePreviousItem = Me.ToolStripButton14
Me.BindingNavigator3.Name = "BindingNavigator3"
Me.BindingNavigator3.PositionItem = Me.ToolStripTextBox2
- Me.BindingNavigator3.Size = New System.Drawing.Size(974, 31)
+ Me.BindingNavigator3.Size = New System.Drawing.Size(974, 25)
Me.BindingNavigator3.TabIndex = 33
Me.BindingNavigator3.Text = "BindingNavigator3"
'
@@ -1970,13 +1987,13 @@ Partial Class frmMain
Me.ToolStripButton11.Image = CType(resources.GetObject("ToolStripButton11.Image"), System.Drawing.Image)
Me.ToolStripButton11.Name = "ToolStripButton11"
Me.ToolStripButton11.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton11.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton11.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton11.Text = "Neu hinzufügen"
'
'ToolStripLabel2
'
Me.ToolStripLabel2.Name = "ToolStripLabel2"
- Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 28)
+ Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 22)
Me.ToolStripLabel2.Text = "von {0} möglichen Verarbeitungsschritten"
Me.ToolStripLabel2.ToolTipText = "Die Gesamtanzahl der Elemente."
'
@@ -1986,7 +2003,7 @@ Partial Class frmMain
Me.ToolStripButton12.Image = CType(resources.GetObject("ToolStripButton12.Image"), System.Drawing.Image)
Me.ToolStripButton12.Name = "ToolStripButton12"
Me.ToolStripButton12.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton12.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton12.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton12.Text = "Löschen"
'
'ToolStripButton13
@@ -1995,7 +2012,7 @@ Partial Class frmMain
Me.ToolStripButton13.Image = CType(resources.GetObject("ToolStripButton13.Image"), System.Drawing.Image)
Me.ToolStripButton13.Name = "ToolStripButton13"
Me.ToolStripButton13.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton13.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton13.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton13.Text = "Erste verschieben"
'
'ToolStripButton14
@@ -2004,13 +2021,13 @@ Partial Class frmMain
Me.ToolStripButton14.Image = CType(resources.GetObject("ToolStripButton14.Image"), System.Drawing.Image)
Me.ToolStripButton14.Name = "ToolStripButton14"
Me.ToolStripButton14.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton14.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton14.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton14.Text = "Vorherige verschieben"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
- Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 25)
'
'ToolStripTextBox2
'
@@ -2025,7 +2042,7 @@ Partial Class frmMain
'ToolStripSeparator5
'
Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
- Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton15
'
@@ -2033,7 +2050,7 @@ Partial Class frmMain
Me.ToolStripButton15.Image = CType(resources.GetObject("ToolStripButton15.Image"), System.Drawing.Image)
Me.ToolStripButton15.Name = "ToolStripButton15"
Me.ToolStripButton15.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton15.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton15.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton15.Text = "Nächste verschieben"
'
'ToolStripButton16
@@ -2042,13 +2059,13 @@ Partial Class frmMain
Me.ToolStripButton16.Image = CType(resources.GetObject("ToolStripButton16.Image"), System.Drawing.Image)
Me.ToolStripButton16.Name = "ToolStripButton16"
Me.ToolStripButton16.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton16.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton16.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton16.Text = "Letzte verschieben"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton17
'
@@ -2056,7 +2073,7 @@ Partial Class frmMain
Me.ToolStripButton17.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
Me.ToolStripButton17.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton17.Name = "ToolStripButton17"
- Me.ToolStripButton17.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton17.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton17.Text = "ToolStripButton1"
'
'ToolStripButton18
@@ -2065,7 +2082,7 @@ Partial Class frmMain
Me.ToolStripButton18.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
Me.ToolStripButton18.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton18.Name = "ToolStripButton18"
- Me.ToolStripButton18.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton18.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton18.Text = "Refresh"
'
'GUIDPollStepsTextBox
@@ -2291,7 +2308,6 @@ Partial Class frmMain
Me.BindingNavigator4.CountItem = Me.ToolStripLabel3
Me.BindingNavigator4.CountItemFormat = "von {0} Indexierungsschritten"
Me.BindingNavigator4.DeleteItem = Me.ToolStripButton20
- Me.BindingNavigator4.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.BindingNavigator4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton21, Me.ToolStripButton22, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton23, Me.ToolStripButton24, Me.ToolStripSeparator9, Me.ToolStripButton19, Me.ToolStripButton20, Me.ToolStripButton25, Me.ToolStripButton26})
Me.BindingNavigator4.Location = New System.Drawing.Point(245, 0)
Me.BindingNavigator4.MoveFirstItem = Me.ToolStripButton21
@@ -2300,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(974, 31)
+ Me.BindingNavigator4.Size = New System.Drawing.Size(974, 25)
Me.BindingNavigator4.TabIndex = 35
Me.BindingNavigator4.Text = "BindingNavigator4"
'
@@ -2310,13 +2326,13 @@ Partial Class frmMain
Me.ToolStripButton19.Image = CType(resources.GetObject("ToolStripButton19.Image"), System.Drawing.Image)
Me.ToolStripButton19.Name = "ToolStripButton19"
Me.ToolStripButton19.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton19.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton19.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton19.Text = "Neu hinzufügen"
'
'ToolStripLabel3
'
Me.ToolStripLabel3.Name = "ToolStripLabel3"
- Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 28)
+ Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 22)
Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten"
Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente."
'
@@ -2326,7 +2342,7 @@ Partial Class frmMain
Me.ToolStripButton20.Image = CType(resources.GetObject("ToolStripButton20.Image"), System.Drawing.Image)
Me.ToolStripButton20.Name = "ToolStripButton20"
Me.ToolStripButton20.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton20.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton20.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton20.Text = "Löschen"
'
'ToolStripButton21
@@ -2335,7 +2351,7 @@ Partial Class frmMain
Me.ToolStripButton21.Image = CType(resources.GetObject("ToolStripButton21.Image"), System.Drawing.Image)
Me.ToolStripButton21.Name = "ToolStripButton21"
Me.ToolStripButton21.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton21.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton21.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton21.Text = "Erste verschieben"
'
'ToolStripButton22
@@ -2344,13 +2360,13 @@ Partial Class frmMain
Me.ToolStripButton22.Image = CType(resources.GetObject("ToolStripButton22.Image"), System.Drawing.Image)
Me.ToolStripButton22.Name = "ToolStripButton22"
Me.ToolStripButton22.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton22.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton22.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton22.Text = "Vorherige verschieben"
'
'ToolStripSeparator7
'
Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
- Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 25)
'
'ToolStripTextBox3
'
@@ -2365,7 +2381,7 @@ Partial Class frmMain
'ToolStripSeparator8
'
Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
- Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton23
'
@@ -2373,7 +2389,7 @@ Partial Class frmMain
Me.ToolStripButton23.Image = CType(resources.GetObject("ToolStripButton23.Image"), System.Drawing.Image)
Me.ToolStripButton23.Name = "ToolStripButton23"
Me.ToolStripButton23.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton23.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton23.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton23.Text = "Nächste verschieben"
'
'ToolStripButton24
@@ -2382,13 +2398,13 @@ Partial Class frmMain
Me.ToolStripButton24.Image = CType(resources.GetObject("ToolStripButton24.Image"), System.Drawing.Image)
Me.ToolStripButton24.Name = "ToolStripButton24"
Me.ToolStripButton24.RightToLeftAutoMirrorImage = True
- Me.ToolStripButton24.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton24.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton24.Text = "Letzte verschieben"
'
'ToolStripSeparator9
'
Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
- Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton25
'
@@ -2396,7 +2412,7 @@ Partial Class frmMain
Me.ToolStripButton25.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
Me.ToolStripButton25.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton25.Name = "ToolStripButton25"
- Me.ToolStripButton25.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton25.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton25.Text = "ToolStripButton1"
'
'ToolStripButton26
@@ -2405,7 +2421,7 @@ Partial Class frmMain
Me.ToolStripButton26.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
Me.ToolStripButton26.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton26.Name = "ToolStripButton26"
- Me.ToolStripButton26.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton26.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton26.Text = "Refresh"
'
'GridControl3
@@ -2502,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
@@ -2929,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
@@ -3401,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"
@@ -3462,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)
@@ -3536,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()
@@ -3799,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
diff --git a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
index ea9ca25..131b2b0 100644
--- a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
+++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
@@ -48,21 +48,20 @@
On
-
- False
- ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll
+
+ ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll
False
- ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll
False
- ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
False
- ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
+ ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll
diff --git a/App/wisag_check_Att/Form1.vb b/App/wisag_check_Att/Form1.vb
index 57c8d97..ebe5042 100644
--- a/App/wisag_check_Att/Form1.vb
+++ b/App/wisag_check_Att/Form1.vb
@@ -1,15 +1,15 @@
Imports System.IO
Imports System.Text.RegularExpressions
-Imports DevExpress.Data.Helpers.ExpressiveSortInfo
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging
Imports EmailProfiler.Common
Imports GdPicture14
-Imports Independentsoft.Email.Mime
+Imports Message = Independentsoft.Email.Mime.Message
Imports Attachment = Independentsoft.Email.Mime.Attachment
Imports LicenseManager = GdPicture14.LicenseManager
+
Public Class Form1
Private _logger As Logger
Private Shared _MyLogger As LogConfig
diff --git a/App/wisag_check_Att/wisag_check_Att.vbproj b/App/wisag_check_Att/wisag_check_Att.vbproj
index fa347f3..d0f347c 100644
--- a/App/wisag_check_Att/wisag_check_Att.vbproj
+++ b/App/wisag_check_Att/wisag_check_Att.vbproj
@@ -72,7 +72,7 @@
..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll
- P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll
+ M:\Bibliotheken\3rdParty\Independentsoft.Email.dll
P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll