Rename Projects, clean up interfaces

App/CONFIG_APP/App.config

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="CONFIG_APP.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="CONFIG_APP.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <connectionStrings>
-        <add name="CONFIG_APP.My.MySettings.MyDatasetConnString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient"/>
-    </connectionStrings>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
-    </startup>
-    <userSettings>
-        <CONFIG_APP.My.MySettings>
-            <setting name="MyConnectionString" serializeAs="String">
-                <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
-            </setting>
-            <setting name="MyServer" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="EmailTest_Receipiant" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="MyTestHTML" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="DEBUG" serializeAs="String">
-                <value>False</value>
-            </setting>
-        </CONFIG_APP.My.MySettings>
-    </userSettings>
-    <applicationSettings>
-        <CONFIG_APP.My.MySettings>
-            <setting name="FB_DATABASE" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="FB_DATASOURCE" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="FB_USER" serializeAs="String">
-                <value>sysdba</value>
-            </setting>
-            <setting name="FB_PW" serializeAs="String">
-                <value>dd</value>
-            </setting>
-            <setting name="USE_WM" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="EML_LIMITATION_SENDER" serializeAs="String">
-                <value>NONE</value>
-            </setting>
-        </CONFIG_APP.My.MySettings>
-    </applicationSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

App/CONFIG_APP/My Project/licenses.licx

@@ -1 +0,0 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

App/DigitalData.EMLProfiler/clsDatabase.vb

@@ -1,135 +0,0 @@
-Imports DigitalData.EMLProfiler.ClassCurrent
-Imports DigitalData.Modules.Logging
-Public Class clsDatabase
-    Public connectionString As String
-    Private Logger As Logger
-    Private MyLogger As LogConfig
-
-    Sub New(LogConf As LogConfig, ConStr As String)
-        Logger = LogConf.GetLogger
-        MyLogger = LogConf
-        Init(ConStr)
-    End Sub
-    Public Function Init(ConString As String) As Boolean
-        Try
-
-            Dim SQLconnect As New SqlClient.SqlConnection
-            SQLconnect.ConnectionString = ConString
-            SQLconnect.Open()
-            SQLconnect.Close()
-            connectionString = ConString
-            DTCONFIG = Return_Datatable("select * from TBEMLP_CONFIG")
-            If Not IsNothing(DTCONFIG) Then
-                If DTCONFIG.Rows.Count = 1 Then
-                    'PATH_EXTRACT_ATTACHMENTS = DTCONFIG.Rows(0).Item("PATH_EMAIL_TEMP")
-                    'PATH_ERROR = DTCONFIG.Rows(0).Item("PATH_EMAIL_ERRORS")
-                    'MAIL_BODY_FONT = DTCONFIG.Rows(0).Item("FONT_BODY")
-                    'WM_CON_STRING = DTCONFIG.Rows(0).Item("WM_CON_STRING")
-                    'TIMER_INTERVALL = DTCONFIG.Rows(0).Item("CHECK_INTERVALL_MINUTES")
-                End If
-            End If
-            DT_ECM_BASE_CONFIG = Return_Datatable("select * from TBDD_BASECONFIG")
-            Try
-                WM_DRIVE = DT_ECM_BASE_CONFIG.Rows(0).Item("WM_DRIVE")
-            Catch ex As Exception
-                Logger.Error("WM_DRIVE not part of DT_ECM_BASE_CONFIG: " & ex.Message)
-                WM_DRIVE = "W"
-            End Try
-            Logger.Debug("Database initialized")
-            Return True
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Warn("Unexpected Error  in DatabaseInit: " & ex.Message)
-            Return False
-        End Try
-    End Function
-
-    Public Function Return_Datatable(Select_anweisung As String)
-        Try
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-            SQLcommand.CommandTimeout = 240
-
-            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-
-            Dim dt As DataTable = New DataTable()
-            Logger.Debug("ReturnDatatable Command: " & Select_anweisung)
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-            Return dt
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Warn("Unexpected Error  in Return_Datatable: " & ex.Message)
-            Logger.Warn("SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-    Public Function Return_DatatableCS(Select_anweisung As String, CS As String)
-        Try
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = CS
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            SQLcommand.CommandText = Select_anweisung
-            SQLcommand.CommandTimeout = 240
-
-            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
-
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            SQLconnect.Close()
-            Return dt
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Warn("Unexpected Error  in Return_DatatableCS: " & ex.Message)
-            Logger.Warn("SQL: " & Select_anweisung)
-            Return Nothing
-        End Try
-    End Function
-    Public Function Execute_non_Query(ExecuteCMD As String, Optional Userinput As Boolean = False)
-        Try
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = ExecuteCMD
-            SQLcommand.ExecuteNonQuery()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return True
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Warn("Unexpected Error  in Execute_non_Query: " & ex.Message)
-            Logger.Warn("SQL: " & ExecuteCMD)
-            Return False
-        End Try
-    End Function
-    Public Function Execute_Scalar(cmdscalar As String)
-        Dim result
-        Try
-            Dim SQLconnect As New SqlClient.SqlConnection
-            Dim SQLcommand As SqlClient.SqlCommand
-            SQLconnect.ConnectionString = connectionString
-            SQLconnect.Open()
-            SQLcommand = SQLconnect.CreateCommand
-            'Update Last Created Record in Foo
-            SQLcommand.CommandText = cmdscalar
-            result = SQLcommand.ExecuteScalar()
-            SQLcommand.Dispose()
-            SQLconnect.Close()
-            Return result
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Warn("Unexpected Error  in Execute_Scalar: " & ex.Message)
-            Logger.Warn("SQL: " & cmdscalar)
-            Return Nothing
-        End Try
-    End Function
-End Class

App/EmailProfiler.Common/ClassCurrent.vb

@@ -61,7 +61,6 @@ Public Class ClassCurrent
     Public Shared Property MessageError As Boolean = False
 
     Public Shared Property TEMP_FILES As List(Of String) = New List(Of String)
-    Public Shared Property TEMP_HTML_RESULTS As List(Of String) = New List(Of String)
 
     Public Shared Property CURRENT_DEBUG_LOCAL_EMAIL As String
 

App/EmailProfiler.Common/ClassDBConfig.vb

@@ -2,7 +2,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
 
-Public Class ClassConfig
+Public Class ClassDBConfig
     Public Class Config
         Public Property PathError As String
         Public Property PathAttachments As String

App/EmailProfiler.Common/EmailProfiler.Common.vbproj

@@ -106,9 +106,8 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassConfig.vb" />
+    <Compile Include="ClassDBConfig.vb" />
     <Compile Include="ClassCurrent.vb" />
-    <Compile Include="clsDatabase.vb" />
     <Compile Include="clsEmail.IMAP.vb" />
     <Compile Include="EmailStrings.vb" />
     <Compile Include="clsEncryption.vb" />

App/EmailProfiler.Common/clsWorkEmail.vb

@@ -35,9 +35,7 @@ Public Class clsWorkEmail
     Private ReadOnly _Logger As Logger
     Private ReadOnly _LogConfig As LogConfig
 
-    'Private ReadOnly _DB_MSSQL As clsDatabase
     Private ReadOnly _DB_MSSQL As MSSQLServer
-    Private ReadOnly _DB_FIREBIRD As Firebird
 
     Private ReadOnly _UseWindream As Boolean
     Private ReadOnly _windream As clsWindream_allgemein
@@ -48,7 +46,7 @@ Public Class clsWorkEmail
 
     Private _worked_email As Boolean = False
 
-    Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, pUseWindream As Boolean, EmailAccountID As Integer, EmlProfPraefix As String)
+    Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pUseWindream As Boolean, EmailAccountID As Integer, EmlProfPraefix As String)
         Try
             _Logger = LogConf.GetLogger
             _LogConfig = LogConf
@@ -56,15 +54,13 @@ Public Class clsWorkEmail
             _DB_MSSQL = New MSSQLServer(LogConf, ConStr)
             _Logger.Debug("clsWorkmail _email initialized")
             _UseWindream = pUseWindream
+
             If pUseWindream Then
                 _windream = New clsWindream_allgemein(LogConf)
                 _windream_index = New clsWindream_Index(LogConf)
                 _windreamConnectionString = WmConStr
             End If
 
-            If FB_DATASOURCE <> String.Empty Then
-                _DB_FIREBIRD = New Firebird(LogConf, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW)
-            End If
             _EmailAccountID = EmailAccountID
             SUBJECT_PRAFIX = EmlProfPraefix
         Catch ex As Exception
@@ -125,13 +121,16 @@ Public Class clsWorkEmail
                 _Logger.Debug("Subject: [{0}]", CURRENT_MAIL_SUBJECT)
             End If
 
-            _Logger.Debug($"Working on email from : {CURRENT_MAIL_FROM}...")
+            _Logger.Info($"Working on email from : {CURRENT_MAIL_FROM}...")
+
             Dim osql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{CURRENT_MAIL_MESSAGE_ID}'"
             Dim oHistoryID = _DB_MSSQL.GetScalarValue(osql)
+
             If oHistoryID > 0 Then
-                _Logger.Debug($"Messsage with subject [{CURRENT_MAIL_SUBJECT}] from [{CURRENT_MAIL_FROM}] has already been worked!")
+                _Logger.Info($"Messsage with subject [{CURRENT_MAIL_SUBJECT}] from [{CURRENT_MAIL_FROM}] has already been worked!")
                 Return True
             End If
+
             Dim oTempMailExists As Boolean = SAVE2TEMP(CurrentMail)
             'Checking wether Mail can be opened
             Dim oTempMailAccessible As Boolean = False
@@ -152,7 +151,7 @@ Public Class clsWorkEmail
                     Else
                         _Logger.Debug("CommonEmail-Process-Sniffer")
                         If COMMON_EMAIL_IN(CurrentMail) = True Then
-                            INSERT_HISTORY_MSSQL()
+                            InsertHistoryEntry()
                             If CURRENT_ATTMT_COUNT = 0 Then
                                 _Logger.Info("### Mail contained no Attachments!! ###")
                                 Dim oBody = EmailStrings.EMAIL_NO_FERDS
@@ -553,7 +552,6 @@ Public Class clsWorkEmail
         End Try
     End Function
     Private Function EXTRACT_BODY()
-        TEMP_HTML_RESULTS.Clear()
         Dim oDTFunctionRegex As DataTable = _DB_MSSQL.GetDatatable("SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))")
 
         Dim oBodyText As String = ""
@@ -654,8 +652,7 @@ Public Class clsWorkEmail
     End Function
     Private Function EXTRACT_ATTACHMENTS(pCurrentMail As MailContainer, pExtractPath As String, pErrorPath As String)
         _Logger.Debug("In EXTRACT_ATTACHMENTS...")
-        'PATH_EXTRACT_ATTACHMENTS = pExtractPath
-        'PATH_ERROR = pErrorPath
+
         _Logger.Debug(String.Format("PATH_TEMP[{0}]", pExtractPath))
         Dim oAttachmentCount As Integer
         oAttachmentCount = 0
@@ -710,8 +707,8 @@ Public Class clsWorkEmail
                                     Dim oFileLenth As Long = oFileInfo.Length
                                     If oFileLenth > 2 Then
                                         _Logger.Info(String.Format("Attachment saved to [{0}]", oAttachmentFilePath))
-                                        INSERT_HISTORY_FB(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName)
-                                        INSERT_HISTORY_ATTMT_MSSQL(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName)
+                                        'INSERT_HISTORY_FB(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName)
+                                        InsertAttachmentHistoryEntry(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName)
                                         oAttachmentCount += 1
                                     Else
                                         _Logger.Warn($"##!! oFileLenth for AttachmentObjects is <2 !!##")
@@ -758,7 +755,7 @@ Public Class clsWorkEmail
         End Try
     End Function
 
-    Private Function INSERT_HISTORY_MSSQL() As Boolean
+    Private Function InsertHistoryEntry() As Boolean
         If MessageError = False Then
             Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_FROM,PROFILE_ID) VALUES " &
               $"('{CurrentMailProcessName}'," &
@@ -776,32 +773,8 @@ Public Class clsWorkEmail
             Return False
         End If
     End Function
-    Private Function INSERT_HISTORY_FB(oGUID As String, ATTMT1 As String) As Boolean
-        If IsNothing(_DB_FIREBIRD) Then
-            _Logger.Info("INSERT_HISTORY_FB: _firebird is nothing ")
-            Return False
-        End If
-        Try
-            If MessageError = False Then
-                Dim ins = $"INSERT INTO TBEDM_EMAIL_PROFILER_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_FROM,EMAIL_SUBJECT,EMAIL_DATETIME,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_ATTMT1) VALUES " &
-                    $"('{CurrentMailProcessName}'," &
-                    $"'{oGUID}'," &
-                    $"'{CURRENT_MAIL_FROM}'," &
-                    $"'{CURRENT_MAIL_SUBJECT}'," &
-                    $"'{CURRENT_MAIL_MESSAGE.Date}'," &
-                    $"'{CURRENT_MAIL_BODY_ALL}'," &
-                    $"'{CURRENT_MAIL_BODY_ANSWER1}'," &
-                    $"'{CURRENT_MAIL_BODY_Substr2}'," &
-                    $"'{ATTMT1}')"
-                Return _DB_FIREBIRD.ExecuteNonQuery(ins)
-            End If
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Return False
-        End Try
-    End Function
 
-    Private Function INSERT_HISTORY_ATTMT_MSSQL(oMSGID As String, ATTMT1 As String)
+    Private Function InsertAttachmentHistoryEntry(pMessageId As String, pFileName As String) As Boolean
         If IsNothing(_DB_MSSQL) Then
             _Logger.Info("INSERT_HISTORY_FB: _DB_MSSQL is nothing ")
             Return False
@@ -809,19 +782,21 @@ Public Class clsWorkEmail
         Try
             If MessageError = False Then
                 Dim ins = $"INSERT INTO TBEMLP_HISTORY_ATTACHMENT (WORK_PROCESS,EMAIL_MSGID,EMAIL_FROM,EMAIL_SUBJECT,EMAIL_DATETIME,EMAIL_BODY,EMAIL_ATTMT) VALUES " &
-          $"('{CurrentMailProcessName}'," &
-          $"'{oMSGID}'," &
-          $"'{CURRENT_MAIL_FROM}'," &
-          $"'{CURRENT_MAIL_SUBJECT}'," &
-          $"'{CURRENT_MAIL_MESSAGE.Date}'," &
-          $"'{CURRENT_MAIL_BODY_ALL}'," &
-          $"'{ATTMT1}')"
+                  $"('{CurrentMailProcessName}'," &
+                  $"'{pMessageId}'," &
+                  $"'{CURRENT_MAIL_FROM}'," &
+                  $"'{CURRENT_MAIL_SUBJECT}'," &
+                  $"'{CURRENT_MAIL_MESSAGE.Date}'," &
+                  $"'{CURRENT_MAIL_BODY_ALL}'," &
+                  $"'{pFileName}')"
                 _DB_MSSQL.ExecuteNonQuery(ins)
             End If
+
+            Return True
         Catch ex As Exception
             _Logger.Error(ex)
+            Return False
         End Try
-
     End Function
 
     Private Function WORK_POLL_STEPS() As Boolean
@@ -884,7 +859,7 @@ Public Class clsWorkEmail
             Return False
         End Try
     End Function
-    Private Function WORK_INDEXING_STEPS()
+    Private Function WORK_INDEXING_STEPS() As Boolean
         Try
 
             For Each row As DataRow In DT_INDEXING_STEPS.Rows
@@ -897,7 +872,7 @@ Public Class clsWorkEmail
             Next
 
 
-
+            Return True
         Catch ex As Exception
             MessageError = True
             _Logger.Error(ex)
@@ -1005,10 +980,10 @@ Public Class clsWorkEmail
     End Function
     Public Function REGEX_CHECK_DOC_ID(SearchString As String)
         Try
-            Dim regex As Regex = New Regex("\[DID#{1}([0-9]+)]{1}")
+            Dim oRegex As New Regex("\[DID#{1}([0-9]+)]{1}")
             _Logger.Debug("REGEX_String before replacing: '" & SearchString & "'")
             ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
-            Dim elements As MatchCollection = regex.Matches(SearchString)
+            Dim elements As MatchCollection = oRegex.Matches(SearchString)
             Dim result = ""
             For Each element As Match In elements
                 result = element.Groups(1).Value
@@ -1019,7 +994,6 @@ Public Class clsWorkEmail
         Catch ex As Exception
             MessageError = True
             _Logger.Error(ex)
-            'clsLogger.AddError("Unexpected error: " & ex.Message, "REGEX_CHECK_DOC_ID")
             Return Nothing
         End Try
     End Function

App/EmailProfiler.Common/clsWorker.vb

@@ -19,7 +19,7 @@ Public Class clsWorker
     Private ReadOnly _wrapper As clsEncryption
     Private ReadOnly _POLL_PROFILEID As Integer = 0
     Private ReadOnly Eml_Limitation_Sender As String = ""
-    Sub New(EML_LIMITATION As String, pLogConfig As LogConfig, ConStr As String, WMConStr As String, POLL_PROFILEID As Integer, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, USE_WM As Boolean, EmailAccountID As Integer, EmlProfPraefix As String, Optional plocaleml As String = "")
+    Sub New(pLogConfig As LogConfig, ConStr As String, WMConStr As String, POLL_PROFILEID As Integer, USE_WM As Boolean, EmailAccountID As Integer, EmlProfPraefix As String, EML_LIMITATION As String, Optional plocaleml As String = "")
         Logger = pLogConfig.GetLogger
         _emailIMAP = New clsEmailIMAP(pLogConfig)
         _Database = New MSSQLServer(pLogConfig, ConStr)
@@ -31,7 +31,7 @@ Public Class clsWorker
             _windream_index = New clsWindream_Index(pLogConfig)
         End If
 
-        _workmail = New clsWorkEmail(pLogConfig, ConStr, WMConStr, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW, USE_WM, EmailAccountID, EmlProfPraefix)
+        _workmail = New clsWorkEmail(pLogConfig, ConStr, WMConStr, USE_WM, EmailAccountID, EmlProfPraefix)
         _wrapper = New clsEncryption("!35452didalog=", pLogConfig)
         _POLL_PROFILEID = POLL_PROFILEID
         CURRENT_DEBUG_LOCAL_EMAIL = plocaleml
@@ -42,9 +42,9 @@ Public Class clsWorker
             For Each _file In TEMP_FILES
                 Logger.Debug("Trying to delete temp file: [{0}]", _file)
 
-                If System.IO.File.Exists(_file) Then
+                If IO.File.Exists(_file) Then
                     Try
-                        System.IO.File.Delete(_file)
+                        IO.File.Delete(_file)
                     Catch ex As Exception
                         Logger.Error(ex)
                         Logger.Warn($"TempFileDelete - Could not delete the tempfile from TEMP_FILES: {ex.Message}")

App/EmailProfiler.Form/App.config

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="EmailProfiler.Form.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="EmailProfiler.Form.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <connectionStrings>
+        <add name="EmailProfiler.Form.My.MySettings.MyDatasetConnString"
+            connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
+            providerName="System.Data.SqlClient" />
+    </connectionStrings>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <userSettings>
+    <EmailProfiler.Form.My.MySettings>
+      <setting name="MyConnectionString" serializeAs="String">
+        <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
+      </setting>
+      <setting name="MyServer" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="EmailTest_Receipiant" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="MyTestHTML" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="DEBUG" serializeAs="String">
+        <value>False</value>
+      </setting>
+    </EmailProfiler.Form.My.MySettings>
+  </userSettings>
+  <applicationSettings>
+    <EmailProfiler.Form.My.MySettings>
+      <setting name="FB_DATABASE" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="FB_DATASOURCE" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="FB_USER" serializeAs="String">
+        <value>sysdba</value>
+      </setting>
+      <setting name="FB_PW" serializeAs="String">
+        <value>dd</value>
+      </setting>
+      <setting name="USE_WM" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="EML_LIMITATION_SENDER" serializeAs="String">
+        <value>NONE</value>
+      </setting>
+    </EmailProfiler.Form.My.MySettings>
+  </applicationSettings>
+</configuration>

App/EmailProfiler.Form/Config.vb

@@ -0,0 +1,11 @@
+Public Class Config
+    Public Property Debug As Boolean = False
+    Public Property EmailAccountId As Integer = 0
+    Public Property EmailTitlePrefix As String = "EmailProfiler"
+    Public Property EmailSenderLimitation As String = ""
+    Public Property ConnectionString As String = ""
+    Public Property UseWindream As Boolean = False
+
+    Public Property EmailTestReceiver As String = ""
+    Public Property EmailTestHTML As String = ""
+End Class

App/EmailProfiler.Form/EmailProfiler.Form.vbproj

@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>CONFIG_APP.My.MyApplication</StartupObject>
-    <RootNamespace>CONFIG_APP</RootNamespace>
-    <AssemblyName>CONFIG_APP</AssemblyName>
+    <StartupObject>EmailProfiler.Form.My.MyApplication</StartupObject>
+    <RootNamespace>EmailProfiler.Form</RootNamespace>
+    <AssemblyName>EmailProfiler.Form</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>CONFIG_APP.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Form.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>CONFIG_APP.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Form.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -55,10 +55,14 @@
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
@@ -103,6 +107,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Config.vb" />
     <Compile Include="frmMain.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -193,9 +198,9 @@
     <None Include="Resources\folder_Closed_16xLG.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj">
+    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
       <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
-      <Name>DigitalData.EMLProfiler</Name>
+      <Name>EmailProfiler.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

App/EmailProfiler.Form/My Project/Application.Designer.vb

@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.CONFIG_APP.frmMain
+            Me.MainForm = Global.EmailProfiler.Form.frmMain
         End Sub
     End Class
 End Namespace

App/EmailProfiler.Form/My Project/Resources.Designer.vb

@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("CONFIG_APP.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Form.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

App/EmailProfiler.Form/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -190,9 +190,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.CONFIG_APP.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EmailProfiler.Form.My.MySettings
             Get
-                Return Global.CONFIG_APP.My.MySettings.Default
+                Return Global.EmailProfiler.Form.My.MySettings.Default
             End Get
         End Property
     End Module

App/EmailProfiler.Form/My Project/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

App/EmailProfiler.Form/MyDataset.Designer.vb

@@ -6105,7 +6105,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -6598,7 +6598,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -7110,7 +7110,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -7478,7 +7478,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -7864,7 +7864,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -8326,7 +8326,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -8674,7 +8674,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString
+            Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

App/EmailProfiler.Form/MyDataset.xsc

@@ -9,11 +9,9 @@
     <TableUISetting Name="TBDD_EMAIL_ACCOUNT">
       <ColumnUISettings>
         <ColumnUISetting Name="AUTH_TYPE">
-          <ControlSettings>
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
               <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
-          </ControlSettings>
+            </ControlSetting></ControlSettings>
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>

App/EmailProfiler.Form/MyDataset.xsd

@@ -4,7 +4,7 @@
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
       <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
-          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="MyDatasetConnString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MyDatasetConnString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.CONFIG_APP.My.MySettings.GlobalReference.Default.MyDatasetConnString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="MyDatasetConnString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MyDatasetConnString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.EmailProfiler.Form.My.MySettings.GlobalReference.Default.MyDatasetConnString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEMLP_POLL_PROFILESTableAdapter" GeneratorDataComponentClassName="TBEMLP_POLL_PROFILESTableAdapter" Name="TBEMLP_POLL_PROFILES" UserDataComponentName="TBEMLP_POLL_PROFILESTableAdapter">
@@ -602,162 +602,162 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="MyDataset" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="MyDataset" msprop:Generator_UserDSName="MyDataset">
+  <xs:element name="MyDataset" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="MyDataset" msprop:Generator_DataSetName="MyDataset">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBEMLP_POLL_PROFILES" msprop:Generator_TableClassName="TBEMLP_POLL_PROFILESDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROFILES" msprop:Generator_RowChangedName="TBEMLP_POLL_PROFILESRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_PROFILES" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROFILESRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_PROFILESRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROFILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROFILESRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_PROFILESRow" msprop:Generator_UserTableName="TBEMLP_POLL_PROFILES" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROFILESRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_PROFILES" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROFILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROFILESRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROFILESRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROFILESRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_PROFILES" msprop:Generator_RowChangedName="TBEMLP_POLL_PROFILESRowChanged" msprop:Generator_RowChangingName="TBEMLP_POLL_PROFILESRowChanging" msprop:Generator_TableClassName="TBEMLP_POLL_PROFILESDataTable" msprop:Generator_RowClassName="TBEMLP_POLL_PROFILESRow" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROFILES" msprop:Generator_UserTableName="TBEMLP_POLL_PROFILES">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_UserColumnName="PROFILE_NAME">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_UserColumnName="PROFILE_NAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="POLL_TYPE" msprop:Generator_ColumnVarNameInTable="columnPOLL_TYPE" msprop:Generator_ColumnPropNameInRow="POLL_TYPE" msprop:Generator_ColumnPropNameInTable="POLL_TYPEColumn" msprop:Generator_UserColumnName="POLL_TYPE">
+              <xs:element name="POLL_TYPE" msprop:Generator_ColumnPropNameInRow="POLL_TYPE" msprop:Generator_ColumnPropNameInTable="POLL_TYPEColumn" msprop:Generator_ColumnVarNameInTable="columnPOLL_TYPE" msprop:Generator_UserColumnName="POLL_TYPE">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_CONF_ID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_CONF_ID" msprop:Generator_ColumnPropNameInRow="EMAIL_CONF_ID" msprop:Generator_ColumnPropNameInTable="EMAIL_CONF_IDColumn" msprop:Generator_UserColumnName="EMAIL_CONF_ID" type="xs:int" />
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="EMAIL_CONF_ID" msprop:Generator_ColumnPropNameInRow="EMAIL_CONF_ID" msprop:Generator_ColumnPropNameInTable="EMAIL_CONF_IDColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_CONF_ID" msprop:Generator_UserColumnName="EMAIL_CONF_ID" type="xs:int" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="LAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEMLP_POLL_PROCESS" msprop:Generator_TableClassName="TBEMLP_POLL_PROCESSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROCESS" msprop:Generator_RowChangedName="TBEMLP_POLL_PROCESSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_PROCESS" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROCESSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_PROCESSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROCESSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROCESSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_PROCESSRow" msprop:Generator_UserTableName="TBEMLP_POLL_PROCESS" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROCESSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_PROCESS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROCESSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROCESSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROCESSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROCESSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_PROCESS" msprop:Generator_RowChangedName="TBEMLP_POLL_PROCESSRowChanged" msprop:Generator_RowChangingName="TBEMLP_POLL_PROCESSRowChanging" msprop:Generator_TableClassName="TBEMLP_POLL_PROCESSDataTable" msprop:Generator_RowClassName="TBEMLP_POLL_PROCESSRow" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROCESS" msprop:Generator_UserTableName="TBEMLP_POLL_PROCESS">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="PROCESS_NAME" msprop:Generator_ColumnVarNameInTable="columnPROCESS_NAME" msprop:Generator_ColumnPropNameInRow="PROCESS_NAME" msprop:Generator_ColumnPropNameInTable="PROCESS_NAMEColumn" msprop:Generator_UserColumnName="PROCESS_NAME">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="PROCESS_NAME" msprop:Generator_ColumnPropNameInRow="PROCESS_NAME" msprop:Generator_ColumnPropNameInTable="PROCESS_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnPROCESS_NAME" msprop:Generator_UserColumnName="PROCESS_NAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_UserColumnName="STEP_NAME">
+              <xs:element name="STEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_UserColumnName="STEP_NAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PROFILE_ID" msprop:Generator_ColumnVarNameInTable="columnPROFILE_ID" msprop:Generator_ColumnPropNameInRow="PROFILE_ID" msprop:Generator_ColumnPropNameInTable="PROFILE_IDColumn" msprop:Generator_UserColumnName="PROFILE_ID" type="xs:int" />
-              <xs:element name="COPY_2_HDD" msprop:Generator_ColumnVarNameInTable="columnCOPY_2_HDD" msprop:Generator_ColumnPropNameInRow="COPY_2_HDD" msprop:Generator_ColumnPropNameInTable="COPY_2_HDDColumn" msprop:Generator_UserColumnName="COPY_2_HDD" type="xs:boolean" default="false" />
-              <xs:element name="WM_IMPORT" msprop:Generator_ColumnVarNameInTable="columnWM_IMPORT" msprop:Generator_ColumnPropNameInRow="WM_IMPORT" msprop:Generator_ColumnPropNameInTable="WM_IMPORTColumn" msprop:Generator_UserColumnName="WM_IMPORT" type="xs:boolean" default="false" />
-              <xs:element name="WM_OBJEKTTYPE" msprop:Generator_ColumnVarNameInTable="columnWM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInRow="WM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInTable="WM_OBJEKTTYPEColumn" msprop:Generator_UserColumnName="WM_OBJEKTTYPE" minOccurs="0">
+              <xs:element name="PROFILE_ID" msprop:Generator_ColumnPropNameInRow="PROFILE_ID" msprop:Generator_ColumnPropNameInTable="PROFILE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnPROFILE_ID" msprop:Generator_UserColumnName="PROFILE_ID" type="xs:int" />
+              <xs:element name="COPY_2_HDD" msprop:Generator_ColumnPropNameInRow="COPY_2_HDD" msprop:Generator_ColumnPropNameInTable="COPY_2_HDDColumn" msprop:Generator_ColumnVarNameInTable="columnCOPY_2_HDD" msprop:Generator_UserColumnName="COPY_2_HDD" type="xs:boolean" default="false" />
+              <xs:element name="WM_IMPORT" msprop:Generator_ColumnPropNameInRow="WM_IMPORT" msprop:Generator_ColumnPropNameInTable="WM_IMPORTColumn" msprop:Generator_ColumnVarNameInTable="columnWM_IMPORT" msprop:Generator_UserColumnName="WM_IMPORT" type="xs:boolean" default="false" />
+              <xs:element name="WM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInRow="WM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInTable="WM_OBJEKTTYPEColumn" msprop:Generator_ColumnVarNameInTable="columnWM_OBJEKTTYPE" msprop:Generator_UserColumnName="WM_OBJEKTTYPE" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_VECTOR_LOG" msprop:Generator_ColumnVarNameInTable="columnWM_VECTOR_LOG" msprop:Generator_ColumnPropNameInRow="WM_VECTOR_LOG" msprop:Generator_ColumnPropNameInTable="WM_VECTOR_LOGColumn" msprop:Generator_UserColumnName="WM_VECTOR_LOG" minOccurs="0">
+              <xs:element name="WM_VECTOR_LOG" msprop:Generator_ColumnPropNameInRow="WM_VECTOR_LOG" msprop:Generator_ColumnPropNameInTable="WM_VECTOR_LOGColumn" msprop:Generator_ColumnVarNameInTable="columnWM_VECTOR_LOG" msprop:Generator_UserColumnName="WM_VECTOR_LOG" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_PATH" msprop:Generator_ColumnVarNameInTable="columnWM_PATH" msprop:Generator_ColumnPropNameInRow="WM_PATH" msprop:Generator_ColumnPropNameInTable="WM_PATHColumn" msprop:Generator_UserColumnName="WM_PATH" minOccurs="0">
+              <xs:element name="WM_PATH" msprop:Generator_ColumnPropNameInRow="WM_PATH" msprop:Generator_ColumnPropNameInTable="WM_PATHColumn" msprop:Generator_ColumnVarNameInTable="columnWM_PATH" msprop:Generator_UserColumnName="WM_PATH" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_FILE_NAME" msprop:Generator_ColumnVarNameInTable="columnWM_FILE_NAME" msprop:Generator_ColumnPropNameInRow="WM_FILE_NAME" msprop:Generator_ColumnPropNameInTable="WM_FILE_NAMEColumn" msprop:Generator_UserColumnName="WM_FILE_NAME" minOccurs="0">
+              <xs:element name="WM_FILE_NAME" msprop:Generator_ColumnPropNameInRow="WM_FILE_NAME" msprop:Generator_ColumnPropNameInTable="WM_FILE_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnWM_FILE_NAME" msprop:Generator_UserColumnName="WM_FILE_NAME" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_REFERENCE_INDEX" msprop:Generator_ColumnVarNameInTable="columnWM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInRow="WM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInTable="WM_REFERENCE_INDEXColumn" msprop:Generator_UserColumnName="WM_REFERENCE_INDEX" minOccurs="0">
+              <xs:element name="WM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInRow="WM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInTable="WM_REFERENCE_INDEXColumn" msprop:Generator_ColumnVarNameInTable="columnWM_REFERENCE_INDEX" msprop:Generator_UserColumnName="WM_REFERENCE_INDEX" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
+              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
+              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DELETE_MAIL" msprop:Generator_ColumnVarNameInTable="columnDELETE_MAIL" msprop:Generator_ColumnPropNameInRow="DELETE_MAIL" msprop:Generator_ColumnPropNameInTable="DELETE_MAILColumn" msprop:Generator_UserColumnName="DELETE_MAIL" type="xs:boolean" default="false" />
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="DELETE_MAIL" msprop:Generator_ColumnPropNameInRow="DELETE_MAIL" msprop:Generator_ColumnPropNameInTable="DELETE_MAILColumn" msprop:Generator_ColumnVarNameInTable="columnDELETE_MAIL" msprop:Generator_UserColumnName="DELETE_MAIL" type="xs:boolean" default="false" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="WM_IDX_BODY_TEXT" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_TEXTColumn" msprop:Generator_UserColumnName="WM_IDX_BODY_TEXT" default="">
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="WM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_TEXTColumn" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_TEXT" msprop:Generator_UserColumnName="WM_IDX_BODY_TEXT" default="">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_SUBSTR_LENGTHColumn" msprop:Generator_UserColumnName="WM_IDX_BODY_SUBSTR_LENGTH" type="xs:int" default="0" />
-              <xs:element name="PATH_ORIGINAL" msprop:Generator_ColumnVarNameInTable="columnPATH_ORIGINAL" msprop:Generator_ColumnPropNameInRow="PATH_ORIGINAL" msprop:Generator_ColumnPropNameInTable="PATH_ORIGINALColumn" msprop:Generator_UserColumnName="PATH_ORIGINAL" minOccurs="0">
+              <xs:element name="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_SUBSTR_LENGTHColumn" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_UserColumnName="WM_IDX_BODY_SUBSTR_LENGTH" type="xs:int" default="0" />
+              <xs:element name="PATH_ORIGINAL" msprop:Generator_ColumnPropNameInRow="PATH_ORIGINAL" msprop:Generator_ColumnPropNameInTable="PATH_ORIGINALColumn" msprop:Generator_ColumnVarNameInTable="columnPATH_ORIGINAL" msprop:Generator_UserColumnName="PATH_ORIGINAL" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
@@ -767,266 +767,266 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEMLP_POLL_STEPS" msprop:Generator_TableClassName="TBEMLP_POLL_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_STEPSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_STEPS" msprop:Generator_RowDeletingName="TBEMLP_POLL_STEPSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_STEPSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_STEPSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_STEPSRow" msprop:Generator_UserTableName="TBEMLP_POLL_STEPS" msprop:Generator_RowEvArgName="TBEMLP_POLL_STEPSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_STEPS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_STEPSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_STEPSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_STEPSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_STEPSRowChanged" msprop:Generator_RowChangingName="TBEMLP_POLL_STEPSRowChanging" msprop:Generator_TableClassName="TBEMLP_POLL_STEPSDataTable" msprop:Generator_RowClassName="TBEMLP_POLL_STEPSRow" msprop:Generator_TableVarName="tableTBEMLP_POLL_STEPS" msprop:Generator_UserTableName="TBEMLP_POLL_STEPS">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="PROCESS_ID" msprop:Generator_ColumnVarNameInTable="columnPROCESS_ID" msprop:Generator_ColumnPropNameInRow="PROCESS_ID" msprop:Generator_ColumnPropNameInTable="PROCESS_IDColumn" msprop:Generator_UserColumnName="PROCESS_ID" type="xs:int" />
-              <xs:element name="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_UserColumnName="STEP_NAME">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="PROCESS_ID" msprop:Generator_ColumnPropNameInRow="PROCESS_ID" msprop:Generator_ColumnPropNameInTable="PROCESS_IDColumn" msprop:Generator_ColumnVarNameInTable="columnPROCESS_ID" msprop:Generator_UserColumnName="PROCESS_ID" type="xs:int" />
+              <xs:element name="STEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_UserColumnName="STEP_NAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="KEYWORDS_BODY" msprop:Generator_ColumnVarNameInTable="columnKEYWORDS_BODY" msprop:Generator_ColumnPropNameInRow="KEYWORDS_BODY" msprop:Generator_ColumnPropNameInTable="KEYWORDS_BODYColumn" msprop:Generator_UserColumnName="KEYWORDS_BODY" minOccurs="0">
+              <xs:element name="KEYWORDS_BODY" msprop:Generator_ColumnPropNameInRow="KEYWORDS_BODY" msprop:Generator_ColumnPropNameInTable="KEYWORDS_BODYColumn" msprop:Generator_ColumnVarNameInTable="columnKEYWORDS_BODY" msprop:Generator_UserColumnName="KEYWORDS_BODY" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_TableClassName="TBEMLP_POLL_INDEXING_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_INDEXING_STEPSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowDeletingName="TBEMLP_POLL_INDEXING_STEPSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_INDEXING_STEPSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_INDEXING_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_INDEXING_STEPSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_INDEXING_STEPSRow" msprop:Generator_UserTableName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowEvArgName="TBEMLP_POLL_INDEXING_STEPSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_INDEXING_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_INDEXING_STEPSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_INDEXING_STEPSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_INDEXING_STEPSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_INDEXING_STEPSRowChanged" msprop:Generator_RowChangingName="TBEMLP_POLL_INDEXING_STEPSRowChanging" msprop:Generator_TableClassName="TBEMLP_POLL_INDEXING_STEPSDataTable" msprop:Generator_RowClassName="TBEMLP_POLL_INDEXING_STEPSRow" msprop:Generator_TableVarName="tableTBEMLP_POLL_INDEXING_STEPS" msprop:Generator_UserTableName="TBEMLP_POLL_INDEXING_STEPS">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
-              <xs:element name="STEP_ID" msprop:Generator_ColumnVarNameInTable="columnSTEP_ID" msprop:Generator_ColumnPropNameInRow="STEP_ID" msprop:Generator_ColumnPropNameInTable="STEP_IDColumn" msprop:Generator_UserColumnName="STEP_ID" type="xs:int" />
-              <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:short" />
+              <xs:element name="STEP_ID" msprop:Generator_ColumnPropNameInRow="STEP_ID" msprop:Generator_ColumnPropNameInTable="STEP_IDColumn" msprop:Generator_ColumnVarNameInTable="columnSTEP_ID" msprop:Generator_UserColumnName="STEP_ID" type="xs:int" />
+              <xs:element name="INDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_UserColumnName="INDEXNAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="INDEXVALUE" msprop:Generator_ColumnVarNameInTable="columnINDEXVALUE" msprop:Generator_ColumnPropNameInRow="INDEXVALUE" msprop:Generator_ColumnPropNameInTable="INDEXVALUEColumn" msprop:Generator_UserColumnName="INDEXVALUE">
+              <xs:element name="INDEXVALUE" msprop:Generator_ColumnPropNameInRow="INDEXVALUE" msprop:Generator_ColumnPropNameInTable="INDEXVALUEColumn" msprop:Generator_ColumnVarNameInTable="columnINDEXVALUE" msprop:Generator_UserColumnName="INDEXVALUE">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnVarNameInTable="columnUSE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInRow="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInTable="USE_FOR_DIRECT_ANSWERColumn" msprop:Generator_UserColumnName="USE_FOR_DIRECT_ANSWER" type="xs:boolean" default="false" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" default="0" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInRow="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInTable="USE_FOR_DIRECT_ANSWERColumn" msprop:Generator_ColumnVarNameInTable="columnUSE_FOR_DIRECT_ANSWER" msprop:Generator_UserColumnName="USE_FOR_DIRECT_ANSWER" type="xs:boolean" default="false" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" default="0" minOccurs="0" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEMLP_HISTORY" msprop:Generator_TableClassName="TBEMLP_HISTORYDataTable" msprop:Generator_TableVarName="tableTBEMLP_HISTORY" msprop:Generator_TablePropName="TBEMLP_HISTORY" msprop:Generator_RowDeletingName="TBEMLP_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBEMLP_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_HISTORYRowDeleted" msprop:Generator_UserTableName="TBEMLP_HISTORY" msprop:Generator_RowChangedName="TBEMLP_HISTORYRowChanged" msprop:Generator_RowEvArgName="TBEMLP_HISTORYRowChangeEvent" msprop:Generator_RowClassName="TBEMLP_HISTORYRow">
+        <xs:element name="TBEMLP_HISTORY" msprop:Generator_RowClassName="TBEMLP_HISTORYRow" msprop:Generator_RowEvHandlerName="TBEMLP_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_HISTORYRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_HISTORYRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_HISTORYRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_HISTORY" msprop:Generator_RowChangedName="TBEMLP_HISTORYRowChanged" msprop:Generator_RowChangingName="TBEMLP_HISTORYRowChanging" msprop:Generator_TableClassName="TBEMLP_HISTORYDataTable" msprop:Generator_UserTableName="TBEMLP_HISTORY" msprop:Generator_TableVarName="tableTBEMLP_HISTORY">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="WORK_PROCESS" msprop:Generator_ColumnVarNameInTable="columnWORK_PROCESS" msprop:Generator_ColumnPropNameInRow="WORK_PROCESS" msprop:Generator_ColumnPropNameInTable="WORK_PROCESSColumn" msprop:Generator_UserColumnName="WORK_PROCESS" minOccurs="0">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="WORK_PROCESS" msprop:Generator_ColumnPropNameInRow="WORK_PROCESS" msprop:Generator_ColumnPropNameInTable="WORK_PROCESSColumn" msprop:Generator_ColumnVarNameInTable="columnWORK_PROCESS" msprop:Generator_UserColumnName="WORK_PROCESS" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_MSGID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_MSGID" msprop:Generator_ColumnPropNameInRow="EMAIL_MSGID" msprop:Generator_ColumnPropNameInTable="EMAIL_MSGIDColumn" msprop:Generator_UserColumnName="EMAIL_MSGID">
+              <xs:element name="EMAIL_MSGID" msprop:Generator_ColumnPropNameInRow="EMAIL_MSGID" msprop:Generator_ColumnPropNameInTable="EMAIL_MSGIDColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_MSGID" msprop:Generator_UserColumnName="EMAIL_MSGID">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_SUBJECT" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBJECT" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBJECT" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBJECTColumn" msprop:Generator_UserColumnName="EMAIL_SUBJECT" minOccurs="0">
+              <xs:element name="EMAIL_SUBJECT" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBJECT" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBJECTColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBJECT" msprop:Generator_UserColumnName="EMAIL_SUBJECT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_DATE" msprop:Generator_ColumnVarNameInTable="columnEMAIL_DATE" msprop:Generator_ColumnPropNameInRow="EMAIL_DATE" msprop:Generator_ColumnPropNameInTable="EMAIL_DATEColumn" msprop:Generator_UserColumnName="EMAIL_DATE" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="EMAIL_BODY" msprop:Generator_ColumnVarNameInTable="columnEMAIL_BODY" msprop:Generator_ColumnPropNameInRow="EMAIL_BODY" msprop:Generator_ColumnPropNameInTable="EMAIL_BODYColumn" msprop:Generator_UserColumnName="EMAIL_BODY" minOccurs="0">
+              <xs:element name="EMAIL_DATE" msprop:Generator_ColumnPropNameInRow="EMAIL_DATE" msprop:Generator_ColumnPropNameInTable="EMAIL_DATEColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_DATE" msprop:Generator_UserColumnName="EMAIL_DATE" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="EMAIL_BODY" msprop:Generator_ColumnPropNameInRow="EMAIL_BODY" msprop:Generator_ColumnPropNameInTable="EMAIL_BODYColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_BODY" msprop:Generator_UserColumnName="EMAIL_BODY" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_SUBSTRING1" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING1Column" msprop:Generator_UserColumnName="EMAIL_SUBSTRING1" minOccurs="0">
+              <xs:element name="EMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING1Column" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING1" msprop:Generator_UserColumnName="EMAIL_SUBSTRING1" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_SUBSTRING2" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING2Column" msprop:Generator_UserColumnName="EMAIL_SUBSTRING2" minOccurs="0">
+              <xs:element name="EMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING2Column" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING2" msprop:Generator_UserColumnName="EMAIL_SUBSTRING2" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEMLP_CONFIG" msprop:Generator_TableClassName="TBEMLP_CONFIGDataTable" msprop:Generator_TableVarName="tableTBEMLP_CONFIG" msprop:Generator_TablePropName="TBEMLP_CONFIG" msprop:Generator_RowDeletingName="TBEMLP_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBEMLP_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_CONFIGRowDeleted" msprop:Generator_UserTableName="TBEMLP_CONFIG" msprop:Generator_RowChangedName="TBEMLP_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBEMLP_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBEMLP_CONFIGRow">
+        <xs:element name="TBEMLP_CONFIG" msprop:Generator_RowClassName="TBEMLP_CONFIGRow" msprop:Generator_RowEvHandlerName="TBEMLP_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_CONFIGRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_CONFIGRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_CONFIGRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_CONFIG" msprop:Generator_RowChangedName="TBEMLP_CONFIGRowChanged" msprop:Generator_RowChangingName="TBEMLP_CONFIGRowChanging" msprop:Generator_TableClassName="TBEMLP_CONFIGDataTable" msprop:Generator_UserTableName="TBEMLP_CONFIG" msprop:Generator_TableVarName="tableTBEMLP_CONFIG">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
-              <xs:element name="FONT_BODY" msprop:Generator_ColumnVarNameInTable="columnFONT_BODY" msprop:Generator_ColumnPropNameInRow="FONT_BODY" msprop:Generator_ColumnPropNameInTable="FONT_BODYColumn" msprop:Generator_UserColumnName="FONT_BODY">
+              <xs:element name="GUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
+              <xs:element name="FONT_BODY" msprop:Generator_ColumnPropNameInRow="FONT_BODY" msprop:Generator_ColumnPropNameInTable="FONT_BODYColumn" msprop:Generator_ColumnVarNameInTable="columnFONT_BODY" msprop:Generator_UserColumnName="FONT_BODY">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="LOG_ERRORS_ONLY" msprop:Generator_ColumnVarNameInTable="columnLOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInRow="LOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInTable="LOG_ERRORS_ONLYColumn" msprop:Generator_UserColumnName="LOG_ERRORS_ONLY" type="xs:boolean" />
-              <xs:element name="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnVarNameInTable="columnCHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInRow="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInTable="CHECK_INTERVALL_MINUTESColumn" msprop:Generator_UserColumnName="CHECK_INTERVALL_MINUTES" type="xs:int" />
-              <xs:element name="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
+              <xs:element name="LOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInRow="LOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInTable="LOG_ERRORS_ONLYColumn" msprop:Generator_ColumnVarNameInTable="columnLOG_ERRORS_ONLY" msprop:Generator_UserColumnName="LOG_ERRORS_ONLY" type="xs:boolean" />
+              <xs:element name="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInRow="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInTable="CHECK_INTERVALL_MINUTESColumn" msprop:Generator_ColumnVarNameInTable="columnCHECK_INTERVALL_MINUTES" msprop:Generator_UserColumnName="CHECK_INTERVALL_MINUTES" type="xs:int" />
+              <xs:element name="LAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
+              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WM_CON_STRING" msprop:Generator_ColumnVarNameInTable="columnWM_CON_STRING" msprop:Generator_ColumnPropNameInRow="WM_CON_STRING" msprop:Generator_ColumnPropNameInTable="WM_CON_STRINGColumn" msprop:Generator_UserColumnName="WM_CON_STRING">
+              <xs:element name="WM_CON_STRING" msprop:Generator_ColumnPropNameInRow="WM_CON_STRING" msprop:Generator_ColumnPropNameInTable="WM_CON_STRINGColumn" msprop:Generator_ColumnVarNameInTable="columnWM_CON_STRING" msprop:Generator_UserColumnName="WM_CON_STRING">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow">
+        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME" minOccurs="0">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_FROM" msprop:Generator_ColumnVarNameInTable="columnEMAIL_FROM" msprop:Generator_ColumnPropNameInRow="EMAIL_FROM" msprop:Generator_ColumnPropNameInTable="EMAIL_FROMColumn" msprop:Generator_UserColumnName="EMAIL_FROM">
+              <xs:element name="EMAIL_FROM" msprop:Generator_ColumnPropNameInRow="EMAIL_FROM" msprop:Generator_ColumnPropNameInTable="EMAIL_FROMColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_FROM" msprop:Generator_UserColumnName="EMAIL_FROM">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_SMTP" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SMTP" msprop:Generator_ColumnPropNameInRow="EMAIL_SMTP" msprop:Generator_ColumnPropNameInTable="EMAIL_SMTPColumn" msprop:Generator_UserColumnName="EMAIL_SMTP">
+              <xs:element name="EMAIL_SMTP" msprop:Generator_ColumnPropNameInRow="EMAIL_SMTP" msprop:Generator_ColumnPropNameInTable="EMAIL_SMTPColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SMTP" msprop:Generator_UserColumnName="EMAIL_SMTP">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_USER" msprop:Generator_ColumnVarNameInTable="columnEMAIL_USER" msprop:Generator_ColumnPropNameInRow="EMAIL_USER" msprop:Generator_ColumnPropNameInTable="EMAIL_USERColumn" msprop:Generator_UserColumnName="EMAIL_USER">
+              <xs:element name="EMAIL_USER" msprop:Generator_ColumnPropNameInRow="EMAIL_USER" msprop:Generator_ColumnPropNameInTable="EMAIL_USERColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_USER" msprop:Generator_UserColumnName="EMAIL_USER">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EMAIL_PW" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_UserColumnName="EMAIL_PW" default="">
+              <xs:element name="EMAIL_PW" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" msprop:Generator_UserColumnName="EMAIL_PW" default="">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PORT" msprop:Generator_ColumnVarNameInTable="columnPORT" msprop:Generator_ColumnPropNameInRow="PORT" msprop:Generator_ColumnPropNameInTable="PORTColumn" msprop:Generator_UserColumnName="PORT" type="xs:int" default="25" />
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="PORT" msprop:Generator_ColumnPropNameInRow="PORT" msprop:Generator_ColumnPropNameInTable="PORTColumn" msprop:Generator_ColumnVarNameInTable="columnPORT" msprop:Generator_UserColumnName="PORT" type="xs:int" default="25" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" default="1900-01-01T00:00:00+01:00" minOccurs="0" />
-              <xs:element name="SSL_AUTH" msprop:Generator_ColumnVarNameInTable="columnSSL_AUTH" msprop:Generator_ColumnPropNameInRow="SSL_AUTH" msprop:Generator_ColumnPropNameInTable="SSL_AUTHColumn" msprop:Generator_UserColumnName="SSL_AUTH" type="xs:boolean" default="true" />
-              <xs:element name="AUTH_TYPE" msprop:Generator_ColumnVarNameInTable="columnAUTH_TYPE" msprop:Generator_ColumnPropNameInRow="AUTH_TYPE" msprop:Generator_ColumnPropNameInTable="AUTH_TYPEColumn" msprop:Generator_UserColumnName="AUTH_TYPE" default="SSL" minOccurs="0">
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" default="1900-01-01T00:00:00+01:00" minOccurs="0" />
+              <xs:element name="SSL_AUTH" msprop:Generator_ColumnPropNameInRow="SSL_AUTH" msprop:Generator_ColumnPropNameInTable="SSL_AUTHColumn" msprop:Generator_ColumnVarNameInTable="columnSSL_AUTH" msprop:Generator_UserColumnName="SSL_AUTH" type="xs:boolean" default="true" />
+              <xs:element name="AUTH_TYPE" msprop:Generator_ColumnPropNameInRow="AUTH_TYPE" msprop:Generator_ColumnPropNameInTable="AUTH_TYPEColumn" msprop:Generator_ColumnVarNameInTable="columnAUTH_TYPE" msprop:Generator_UserColumnName="AUTH_TYPE" default="SSL" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PORT_IN" msprop:Generator_ColumnVarNameInTable="columnPORT_IN" msprop:Generator_ColumnPropNameInRow="PORT_IN" msprop:Generator_ColumnPropNameInTable="PORT_INColumn" msprop:Generator_UserColumnName="PORT_IN" type="xs:int" default="25" />
-              <xs:element name="ARCHIVE_FOLDER" msprop:Generator_ColumnVarNameInTable="columnARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInRow="ARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInTable="ARCHIVE_FOLDERColumn" msprop:Generator_UserColumnName="ARCHIVE_FOLDER" default="">
+              <xs:element name="PORT_IN" msprop:Generator_ColumnPropNameInRow="PORT_IN" msprop:Generator_ColumnPropNameInTable="PORT_INColumn" msprop:Generator_ColumnVarNameInTable="columnPORT_IN" msprop:Generator_UserColumnName="PORT_IN" type="xs:int" default="25" />
+              <xs:element name="ARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInRow="ARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInTable="ARCHIVE_FOLDERColumn" msprop:Generator_ColumnVarNameInTable="columnARCHIVE_FOLDER" msprop:Generator_UserColumnName="ARCHIVE_FOLDER" default="">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -1069,9 +1069,9 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msdata:parent="TBEMLP_POLL_PROFILES" msdata:child="TBEMLP_POLL_PROCESS" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_PROCESS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_PROCESSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROFILES" msprop:Generator_ParentPropName="TBEMLP_POLL_PROFILESRow" />
-      <msdata:Relationship name="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msdata:parent="TBEMLP_POLL_PROCESS" msdata:child="TBEMLP_POLL_STEPS" msdata:parentkey="GUID" msdata:childkey="PROCESS_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_STEPS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_STEPSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROCESS" msprop:Generator_ParentPropName="TBEMLP_POLL_PROCESSRow" />
-      <msdata:Relationship name="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msdata:parent="TBEMLP_POLL_STEPS" msdata:child="TBEMLP_POLL_INDEXING_STEPS" msdata:parentkey="GUID" msdata:childkey="STEP_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_INDEXING_STEPSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_STEPS" msprop:Generator_ParentPropName="TBEMLP_POLL_STEPSRow" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msdata:parent="TBEMLP_POLL_PROFILES" msdata:child="TBEMLP_POLL_PROCESS" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROFILES" msprop:Generator_UserChildTable="TBEMLP_POLL_PROCESS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_PROCESSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_PROFILESRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msdata:parent="TBEMLP_POLL_PROCESS" msdata:child="TBEMLP_POLL_STEPS" msdata:parentkey="GUID" msdata:childkey="PROCESS_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROCESS" msprop:Generator_UserChildTable="TBEMLP_POLL_STEPS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_STEPSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_PROCESSRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_STEPS_PROCESS_ID" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msdata:parent="TBEMLP_POLL_STEPS" msdata:child="TBEMLP_POLL_INDEXING_STEPS" msdata:parentkey="GUID" msdata:childkey="STEP_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_STEPS" msprop:Generator_UserChildTable="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_INDEXING_STEPSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_STEPSRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

App/EmailProfiler.Form/frmMain.resx

@@ -294,21 +294,6 @@
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1271, 17</value>
   </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1388, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tsbtnRunProfiles.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEISURBVDhPzVKxDoIwEOWjHBwNcZSEkcHBT3FicDFu6qCf
-        wMCfEBY1cXCTBUWB8ey7cI2tJTp6yUt5d/deS3te0zSkULZtO/Ks6GoMF+cAme4iKsqClMlMcgLf9/W3
-        i3PzcDFgk/P1THVdz12NfVwbAOPViLJL5mzs44YBEK4nXJCTCD6EEiD2CZR4j0tVtUQElkGiLx0JiHEH
-        nRg7L/M8pziOWYAVBu8cdfSxgesVgiCgzWZLz8fTMABHHnX0cbOCMQfIRVFEt/LOgChNU14lJ7/UScxA
-        AQ3Y6Xg4saCqHryCI/+TwTf8uQFu2SUS6FdwhSroObCNwI056As1UKFq0JNooZtEz3sBIUpmhmW9bzQA
-        AAAASUVORK5CYII=
-</value>
-  </data>
   <metadata name="TBEMLP_POLL_PROFILESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>290, 56</value>
   </metadata>
@@ -321,10 +306,11 @@
   <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>985, 56</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -336,7 +322,7 @@
   <data name="BindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -348,7 +334,7 @@
   <data name="BindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -359,7 +345,7 @@
   <data name="BindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -368,7 +354,7 @@
   <data name="BindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -377,7 +363,7 @@
   <data name="BindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -394,7 +380,7 @@
   <data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -406,7 +392,7 @@
   <data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -418,7 +404,7 @@
   <data name="ToolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -429,7 +415,7 @@
   <data name="ToolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -438,7 +424,7 @@
   <data name="ToolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -447,7 +433,7 @@
   <data name="ToolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -464,7 +450,7 @@
   <data name="ToolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -476,7 +462,7 @@
   <data name="ToolStripButton12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -488,7 +474,7 @@
   <data name="ToolStripButton13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -499,7 +485,7 @@
   <data name="ToolStripButton14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -508,7 +494,7 @@
   <data name="ToolStripButton15.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -517,7 +503,7 @@
   <data name="ToolStripButton16.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -534,7 +520,7 @@
   <data name="ToolStripButton19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -546,7 +532,7 @@
   <data name="ToolStripButton20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -558,7 +544,7 @@
   <data name="ToolStripButton21.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -569,7 +555,7 @@
   <data name="ToolStripButton22.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -578,7 +564,7 @@
   <data name="ToolStripButton23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -587,56 +573,7 @@
   <data name="ToolStripButton24.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
-        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
-        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
-        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
-        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
-        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>239, 173</value>
-  </metadata>
-  <metadata name="TBEMLP_HISTORYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1297, 134</value>
-  </metadata>
-  <metadata name="BindingNavigator5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1143, 134</value>
-  </metadata>
-  <data name="ToolStripButton29.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
-        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
-        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
-        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
-        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
-        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ToolStripButton30.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
-        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
-        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
-        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="ToolStripButton31.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
-        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
-        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
-        oAc0QjgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ToolStripButton32.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -653,7 +590,7 @@
   <data name="BindingNavigatorAddNewItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -665,7 +602,7 @@
   <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -677,7 +614,7 @@
   <data name="BindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -688,7 +625,7 @@
   <data name="BindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -697,7 +634,7 @@
   <data name="BindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -706,7 +643,7 @@
   <data name="BindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -714,6 +651,27 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="ToolStripButton28.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>239, 173</value>
+  </metadata>
+  <metadata name="TBEMLP_HISTORYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1297, 134</value>
+  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
@@ -750,7 +708,7 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>235</value>
   </metadata>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmMain.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAIAgIAAAAEAIAAoCAEAJgAAACAgAAABACAAqBAAAE4IAQAoAAAAgAAAAAABAAABACAAAAAAAAAA
         AQASCwAAEgsAAAAAAAAAAAAA////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
@@ -1951,6 +1909,26 @@
         gsFsbGyeQ0NDfhoaGloHBwc5ISEhIAAAAAkAAAAA////AP///wD//////8AD///AA////D////gf///w
         D///4Af//8AD//+AAP//8A//+HAAAAAAAAAAAAABwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
         AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD4AAABw==
+</value>
+  </data>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="frmMain.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKUCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkVudmVsb3BlQ2xvc2UiPg0KICAgIDxwYXRoIGQ9Ik0x
+        NiwxNmwxMi02LjlWOWMwLTAuNS0wLjUtMS0xLTFINUM0LjUsOCw0LDguNSw0LDl2MC4xTDE2LDE2eiIg
+        Y2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMTguM0w0LDExLjRWMjNjMCwwLjUsMC41
+        LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVYxMS40TDE2LDE4LjN6IiBjbGFzcz0iWWVsbG93IiAvPg0K
+        ICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
 </root>

App/EmailProfiler.Form/frmMain.vb

@@ -1,52 +1,44 @@
 Imports System.ComponentModel
-Imports System.Configuration
 Imports System.IO
 Imports System.Text.RegularExpressions
 Imports DigitalData.EMLProfiler
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
-Imports NLog.Config
+Imports DigitalData.Modules.Config
 
 Public Class frmMain
-    Private Logger As DigitalData.Modules.Logging.Logger
-    Private Shared LogConfig As LogConfig
-    'Private _database As clsDatabase
+    Private Logger As Logger
+    Private LogConfig As LogConfig
+    Private ConfigManager As Configmanager(Of Config)
     Private _database As MSSQLServer
     Private _Encryption As clsEncryption
     Private _windream As clsWindream_allgemein
-    ' Private _email As clsEmail
     Private _emailIMAP As clsEmailIMAP
     Private _LoadInProgress As Boolean = True
     Private _RunwithLocalemail As Boolean = False
     Private _SQLServerConString As String
     Private _Worklist As List(Of String)
-    Private _limilab As DigitalData.Modules.Messaging.Limilab
-    Private _ConfigManager As ClassConfig
-    Private _Config As ClassConfig.Config
-
-    Public Sub New()
-
-        ' Dieser Aufruf ist für den Designer erforderlich.
-        InitializeComponent()
-
-        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-
-    End Sub
+    Private _limilab As Limilab
+    Private _ConfigManager As ClassDBConfig
+    Private _DBConfig As ClassDBConfig.Config
 
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
             _limilab = New Limilab(LogConfig)
+            ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.StartupPath)
+
             Logger = LogConfig.GetLogger()
-            If My.Settings.DEBUG = True Then
+            If ConfigManager.Config.Debug = True Then
                 Logger.Info("!! DEBUG is ACTIVE !!")
             End If
-            LogConfig.Debug = My.Settings.DEBUG
+            LogConfig.Debug = ConfigManager.Config.Debug
             InitDatabase()
-            ToolStripProgressBar1.Visible = False
+            ToolStripProgressBar2.Visible = False
             Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
-            If My.Settings.USE_WM Then
+
+            If ConfigManager.Config.UseWindream Then
                 _windream = New clsWindream_allgemein(LogConfig)
             End If
 
@@ -63,7 +55,7 @@ Public Class frmMain
             Check_Steps()
             Active_Color()
         End If
-        If My.Settings.USE_WM Then
+        If ConfigManager.Config.UseWindream Then
             ObjektTypenEintragen()
         End If
 
@@ -120,14 +112,14 @@ Public Class frmMain
     End Sub
     Sub Load_History()
         Try
-            Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY)
+            TBEMLP_HISTORYTableAdapter.Fill(MyDataset.TBEMLP_HISTORY)
         Catch ex As Exception
             MsgBox("Error in Load History: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
     Sub Load_indexingSteps()
         Try
-            Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(Me.MyDataset.TBEMLP_POLL_INDEXING_STEPS)
+            TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(MyDataset.TBEMLP_POLL_INDEXING_STEPS)
         Catch ex As Exception
             MsgBox("Unexpected Error in Load_indexingSteps: " & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -135,10 +127,26 @@ Public Class frmMain
     Sub Load_Config()
         Try
             _LoadInProgress = True
-            Me.TBEMLP_CONFIGTableAdapter.Fill(Me.MyDataset.TBEMLP_CONFIG)
+            TBEMLP_CONFIGTableAdapter.Fill(MyDataset.TBEMLP_CONFIG)
+
+            txtConnectionString.Text = _database.MaskedConnectionString
         Catch ex As Exception
             MsgBox("Unexpected Error in Load_Config: " & ex.Message, MsgBoxStyle.Critical)
         End Try
+
+        Try
+            Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))"
+            Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql)
+
+            If oDTFunctionRegex?.Rows.Count > 0 Then
+                txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX")
+                txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX")
+                txthtmlEmail.BackColor = Color.Wheat
+            End If
+        Catch ex As Exception
+            MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+
         _LoadInProgress = False
     End Sub
     Private Sub ObjektTypenEintragen()
@@ -162,10 +170,9 @@ Public Class frmMain
 
     Public Function InitDatabase()
         Try
-            Dim dbResult As Boolean
             tslblstatus.BackColor = Color.Transparent
-            If My.Settings.MyConnectionString <> String.Empty Then
-                _SQLServerConString = My.Settings.MyConnectionString
+            If ConfigManager.Config.ConnectionString <> String.Empty Then
+                _SQLServerConString = ConfigManager.Config.ConnectionString
                 If _SQLServerConString.Contains("LOGIT_DMS") Then
                     _SQLServerConString.Replace("LOGIT_DMS", "DD_ECM")
                     Logger.Debug($"Replaced wrong Database in ConString ... ")
@@ -175,15 +182,13 @@ Public Class frmMain
                 _database = New MSSQLServer(LogConfig, _SQLServerConString)
 
                 Logger.Debug("Inititalizing Configuration")
-                _ConfigManager = New ClassConfig(LogConfig, _database)
-                _Config = _ConfigManager.GetConfig()
+                _ConfigManager = New ClassDBConfig(LogConfig, _database)
+                _DBConfig = _ConfigManager.GetConfig()
 
-                If _Config Is Nothing Then
+                If _DBConfig Is Nothing Then
                     MsgBox("Configuration could not be loaded. Please check the Logfile.", MsgBoxStyle.Critical, Text)
                 End If
 
-                '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
-                'dbResult = _database.Init(My.Settings.MyConnectionString)
             Else
                 MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
 
@@ -191,7 +196,7 @@ Public Class frmMain
                 tslblstatus.Text = "Please add a connection!"
                 tslblstatus.BackColor = Color.Red
             End If
-            If _database.DBInitialized = False Then
+            If _database?.DBInitialized = False Then
                 MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical, Text)
                 Return False
             Else
@@ -224,7 +229,7 @@ Public Class frmMain
             Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString)
             connection.Open()
             MyConnectionString = con
-            My.Settings.Save()
+            ConfigManager.Save()
             Dim cmd As New SqlClient.SqlCommand("sp_databases", connection)
             cmd.CommandType = CommandType.StoredProcedure
             ' Ausführen und Ergebnis in einer ListBox anzeigen
@@ -273,15 +278,15 @@ Public Class frmMain
             If result = MsgBoxResult.Yes Then
                 'Set the construction string
                 MyConnectionString = con
-                My.Settings.MyConnectionString = MyConnectionString
+                ConfigManager.Config.ConnectionString = MyConnectionString
 
                 _database = New MSSQLServer(LogConfig, MyConnectionString)
-                _ConfigManager = New ClassConfig(LogConfig, _database)
+                _ConfigManager = New ClassDBConfig(LogConfig, _database)
 
                 'csb.ConnectionString
                 '_database.Init(MyConnectionString)
 
-                My.Settings.Save()
+                ConfigManager.Save()
 
                 If chkbxUserAut.Checked = False Then
                     Dim cipherText As String = _Encryption.EncryptData(Me.txtPasswort.Text)
@@ -302,18 +307,17 @@ Public Class frmMain
         End Try
     End Sub
 
-    Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
+    Private Sub BackgroundWorker1_DoWork(sender As Object, e As DoWorkEventArgs) Handles BackgroundWorker1.DoWork
         If _RunwithLocalemail = False Then
 
             LogConfig.Debug = True
-            Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW,
-                                       My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient")
+            Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config.UseWindream, ToolStripEmailAccountID2.Text, "EmailProfilerTestClient", ConfigManager.Config.EmailSenderLimitation)
             _work.Start_WorkingProfiles()
 
         Else
             For Each ofile As String In _Worklist
                 Logger.Info($"## Manual working on file {ofile} ... ")
-                Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient", ofile)
+                Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config.UseWindream, ToolStripEmailAccountID2.Text, "EmailProfilerTestClient", ConfigManager.Config.EmailSenderLimitation, ofile)
                 _work.Start_WorkingProfiles(True)
             Next
 
@@ -321,11 +325,11 @@ Public Class frmMain
         Try
             'Delete all Tempfiles
             For Each _file In ClassCurrent.TEMP_FILES
-                System.IO.File.Delete(_file)
+                File.Delete(_file)
             Next
             Try
-                Dim oDiTempPath As New IO.DirectoryInfo(System.IO.Path.GetTempPath)
-                Dim oaryFi As IO.FileInfo() = oDiTempPath.GetFiles()
+                Dim oDiTempPath As New DirectoryInfo(Path.GetTempPath)
+                Dim oaryFi As FileInfo() = oDiTempPath.GetFiles()
 
                 For Each fi In oaryFi
                     fi.Delete()
@@ -342,72 +346,60 @@ Public Class frmMain
 
     Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
         If e.Error IsNot Nothing Then
-            '' if BackgroundWorker terminated due to error
-            MessageBox.Show(e.Error.Message)
-            'Label1.Text = "Error occurred!"
-
+            MessageBox.Show(e.Error.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
         ElseIf e.Cancelled Then
-            '' otherwise if it was cancelled
-            MessageBox.Show("Task cancelled!")
-            '  Label1.Text = "Task Cancelled!"
-
+            MessageBox.Show("Task cancelled!", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
         Else
-            '' otherwise it completed normally
-            MessageBox.Show("Manual Run completed!")
-            'Label1.Text = "Error completed!"
+            MessageBox.Show("Manual Run completed!", Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
         End If
-        tsbtnRunProfiles.Enabled = True
-        tsbtnRunLocalMail.Enabled = True
-        ToolStripProgressBar1.Visible = False
+
+        tsbtnRunProfiles2.Enabled = True
+        tsbtnRunLocalMail2.Enabled = True
+        ToolStripProgressBar2.Visible = False
     End Sub
 
-    Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles.Click
-        If IsNumeric(ToolStripEmailAccountID.Text) = False Then
-            MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation)
+    Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles2.Click
+        If IsNumeric(ToolStripEmailAccountID2.Text) = False Then
+            MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation, Text)
             Exit Sub
         End If
         _RunwithLocalemail = False
         If Not BackgroundWorker1.IsBusy Then
-            tsbtnRunProfiles.Enabled = False
-            tsbtnRunLocalMail.Enabled = False
-            ToolStripProgressBar1.Visible = True
+            tsbtnRunProfiles2.Enabled = False
+            tsbtnRunLocalMail2.Enabled = False
+            ToolStripProgressBar2.Visible = True
             BackgroundWorker1.RunWorkerAsync()
         End If
     End Sub
-    Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail.Click
-        If IsNumeric(ToolStripEmailAccountID.Text) = False Then
+    Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail2.Click
+        If IsNumeric(ToolStripEmailAccountID2.Text) = False Then
             MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        If Not BackgroundWorker1.IsBusy Then
-            Dim openFileDialog1 As New OpenFileDialog()
 
-            ' openFileDialog1.InitialDirectory = "c:\"
-            openFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*"
-            openFileDialog1.FilterIndex = 2
-            openFileDialog1.RestoreDirectory = True
-            openFileDialog1.Multiselect = True
+        If Not BackgroundWorker1.IsBusy Then
+            Dim openFileDialog1 As New OpenFileDialog With {
+                .Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*",
+                .FilterIndex = 2,
+                .RestoreDirectory = True,
+                .Multiselect = True
+            }
 
             If openFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
                 For Each oFile As String In openFileDialog1.FileNames
-                    Dim oList As New List(Of String)
-                    oList.Add(oFile)
+                    Dim oList As New List(Of String) From {oFile}
                     _Worklist = oList
                 Next
                 _RunwithLocalemail = True
-                tsbtnRunLocalMail.Enabled = False
-                tsbtnRunProfiles.Enabled = False
-                ToolStripProgressBar1.Visible = True
+                tsbtnRunLocalMail2.Enabled = False
+                tsbtnRunProfiles2.Enabled = False
+                ToolStripProgressBar2.Visible = True
                 BackgroundWorker1.RunWorkerAsync()
             End If
-
-
-
         End If
-
     End Sub
-    Private Sub mWorker_ProgressChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
-        Me.ToolStripProgressBar1.Value = e.ProgressPercentage
+    Private Sub mWorker_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
+        ToolStripProgressBar2.Value = e.ProgressPercentage
     End Sub
 
     Private Sub btnShowLogpath_Click(sender As Object, e As EventArgs) Handles btnShowLogpath.Click
@@ -415,9 +407,9 @@ Public Class frmMain
     End Sub
 
     Private Sub TBEMLP_POLL_PROFILESBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs)
-        Me.Validate()
-        Me.TBEMLP_POLL_PROFILESBindingSource.EndEdit()
-        Me.TableAdapterManager.UpdateAll(Me.MyDataset)
+        Validate()
+        TBEMLP_POLL_PROFILESBindingSource.EndEdit()
+        TableAdapterManager.UpdateAll(MyDataset)
 
     End Sub
 
@@ -444,7 +436,7 @@ Public Class frmMain
     End Sub
 
     Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged
-        If My.Settings.USE_WM Then
+        If ConfigManager.Config.UseWindream Then
             Load_Indexdata()
         End If
 
@@ -455,22 +447,20 @@ Public Class frmMain
                 If WM_OBJEKTTYPEComboBox.Text = String.Empty Then
                     Exit Sub
                 End If
-                Me.WM_VECTOR_LOGComboBox.Items.Clear()
-                Me.WM_IDX_BODY_TEXTComboBox.Items.Clear()
+                WM_VECTOR_LOGComboBox.Items.Clear()
+                WM_IDX_BODY_TEXTComboBox.Items.Clear()
                 INDEXNAMEIndexStepsComboBox.Items.Clear()
 
-                Me.WM_VECTOR_LOGComboBox.Items.Add("")
-                Me.WM_IDX_BODY_TEXTComboBox.Items.Add("")
+                WM_VECTOR_LOGComboBox.Items.Add("")
+                WM_IDX_BODY_TEXTComboBox.Items.Add("")
                 INDEXNAMEIndexStepsComboBox.Items.Add("")
-                'Me.WM_REFERENCE_INDEXComboBox.Items.Clear()
-                'Me.WM_REFERENCE_INDEXComboBox.Items.Add("")
+
                 Dim indexe = _windream.GetIndicesByObjecttype(WM_OBJEKTTYPEComboBox.Text)
                 If indexe IsNot Nothing Then
                     For Each index As String In indexe
                         Me.WM_VECTOR_LOGComboBox.Items.Add(index)
                         WM_IDX_BODY_TEXTComboBox.Items.Add(index)
                         INDEXNAMEIndexStepsComboBox.Items.Add(index)
-                        ' WM_REFERENCE_INDEXComboBox.Items.Add(index)
                     Next
                 End If
             End If
@@ -569,15 +559,11 @@ Public Class frmMain
         Load_indexingSteps()
     End Sub
 
-    Private Sub XtraTabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles XtraTabControl1.TabIndexChanged
-
-    End Sub
-
     Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
         Select Case XtraTabControl1.SelectedTabPageIndex
             Case 0
                 Check_Steps()
-                If My.Settings.USE_WM Then
+                If ConfigManager.Config.UseWindream Then
                     Load_Indexdata()
                 End If
 
@@ -589,36 +575,17 @@ Public Class frmMain
     End Sub
 
     Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        If My.Settings.USE_WM Then
+        If ConfigManager.Config.UseWindream Then
             Load_Indexdata()
         End If
-
     End Sub
 
     Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
-        tsbtnRunProfiles.Visible = False
         tslblRefresh.BackColor = Color.Transparent
         tslblRefresh.Text = ""
-        Select Case TabControl1.SelectedIndex
-            Case 0
-                tsbtnRunProfiles.Visible = True
-            Case 1
-
-                Load_Config()
-            Case 2
-               ' Load_History()
-            Case 4
-                Try
-                    Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))"
-                    Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql)
-                    txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX")
-                    txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX")
-                    txthtmlEmail.BackColor = Color.Wheat
-                Catch ex As Exception
-                    MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                End Try
-        End Select
-
+        If TabControl1.SelectedIndex = 2 Then
+            Load_Config()
+        End If
     End Sub
 
     Private Sub ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged
@@ -649,19 +616,20 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs) Handles ToolStripButton34.Click
+    Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs)
         Load_History()
     End Sub
 
     Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
         If _LoadInProgress = True Then Exit Sub
         LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked
-        My.Settings.Save()
+        ConfigManager.Save()
         Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
         _database.ExecuteNonQuery(upd)
         Load_Config()
 
     End Sub
+
     Sub Save_Config()
         Try
             TBEMLP_CONFIGBindingSource.EndEdit()
@@ -675,6 +643,7 @@ Public Class frmMain
             MsgBox("Error in Save_Config: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
+
     Sub Save_email_Profile()
         Try
             TBDD_EMAIL_ACCOUNTBindingSource.EndEdit()
@@ -695,18 +664,6 @@ Public Class frmMain
         _database.ExecuteNonQuery(upd)
         Load_Config()
     End Sub
-    'Private Function GetChildren(ByVal bodyParts As BodyPartCollection) As BodyPartCollection
-
-    '    Dim children As New BodyPartCollection()
-
-    '    For i As Integer = 0 To bodyParts.Count - 1
-    '        children.Add(GetChildren(bodyParts(i).BodyParts))
-    '        children.Add(bodyParts(i))
-    '    Next
-
-    '    Return children
-    'End Function
-
     Private Sub STEP_NAMEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles STEP_NAMEComboBox.SelectedIndexChanged
         Label9.Visible = False
         txtSubjectExample.Visible = False
@@ -742,7 +699,7 @@ Public Class frmMain
 
     Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click
         If txtTestmail.Text <> String.Empty Then
-            My.Settings.Save()
+            ConfigManager.Save()
             Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text)
 
             If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text,
@@ -757,7 +714,7 @@ Public Class frmMain
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btntestImap.Click
-        My.Settings.Save()
+        ConfigManager.Save()
         Dim oSQL = $"SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE GUID = {EMAILIDTextBox.Text}"
         Dim oDT As DataTable = _database.GetDatatable(oSQL)
         If Not IsNothing(oDT) Then
@@ -778,22 +735,22 @@ Public Class frmMain
             End If
         End If
     End Sub
+
     Private Sub btnCheckIMAPObjects_Click(sender As Object, e As EventArgs) Handles btnCheckIMAPObjects.Click
 
-        Dim oListuids As New List(Of Long)
-        oListuids = _limilab.IMAPGetUnseenMessageIDs()
+        Dim oListuids As List(Of Long) = _limilab.IMAPGetUnseenMessageIDs()
         If IsNothing(oListuids) Then
             MsgBox("Something went wrong! - Check Your log.", MsgBoxStyle.Critical)
         Else
             _limilab.CloseImap()
             MsgBox($"IMAP-Folder contained [{oListuids.Count}] unseen Objects!", MsgBoxStyle.Information)
         End If
-
     End Sub
-    Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs) Handles btnTestRegEx.Click
+
+    Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs)
         txtResultRegEx.Text = ""
         Try
-            My.Settings.Save()
+            ConfigManager.Save()
             txtResultRegEx.BackColor = Color.WhiteSmoke
             ' Instantiate the regular expression object.
             Dim oReg As Regex = New Regex(txtRegex1.Text, RegexOptions.IgnoreCase)
@@ -830,7 +787,7 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs) Handles btnsaveRegex.Click
+    Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs)
         tslblRefresh.BackColor = Color.Transparent
         Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex1.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText')"
         If _database.ExecuteNonQuery(upd) = True Then
@@ -842,61 +799,7 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
-        'Try
-        '    txthtmlEmail.Text = ""
-        '    txthtmlEmail.BackColor = Color.Wheat
-        '    Dim oOpenFileDialog1 As New OpenFileDialog()
-
-        '    ' openFileDialog1.InitialDirectory = "c:\"
-        '    oOpenFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*"
-        '    oOpenFileDialog1.FilterIndex = 2
-        '    oOpenFileDialog1.RestoreDirectory = True
-
-        '    If oOpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
-        '        Dim oMsg_email As New Independentsoft.Email.Mime.Message(oOpenFileDialog1.FileName)
-        '        Dim oBodyText As String = ""
-        '        If IsNothing(oMsg_email.Body) Then
-        '            Dim oAllBodyParts As New BodyPartCollection()
-        '            oAllBodyParts.Add(oMsg_email.BodyParts)
-        '            oAllBodyParts.Add(GetChildren(oMsg_email.BodyParts))
-        '            For Each bodyPart As BodyPart In oAllBodyParts
-        '                If bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "plain" Then
-        '                    If oBodyText = String.Empty Then
-        '                        Logger.Debug(String.Format("BODY1-Text is....#{0}", bodyPart.Body))
-        '                        oBodyText = bodyPart.Body
-        '                    Else
-        '                        Continue For
-        '                    End If
-        '                ElseIf bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "html" Then
-        '                    If oBodyText = String.Empty Then
-        '                        oBodyText = bodyPart.Body
-        '                        Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body))
-        '                    Else
-        '                        Continue For
-        '                    End If
-        '                    Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body))
-        '                End If
-        '            Next
-        '            If oBodyText = "" Then
-        '                MsgBox("No html-body extractable?!")
-        '            Else
-        '                txthtmlEmail.Text = oBodyText
-        '                txthtmlEmail.BackColor = Color.Yellow
-        '            End If
-        '        Else
-        '            txthtmlEmail.Text = oMsg_email.Body
-        '            txthtmlEmail.BackColor = Color.Yellow
-        '        End If
-
-        '    End If
-        'Catch ex As Exception
-        '    MsgBox(ex.Message, MsgBoxStyle.Critical)
-        'End Try
-
-    End Sub
-
-    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+    Private Sub Button5_Click(sender As Object, e As EventArgs)
         tslblRefresh.BackColor = Color.Transparent
         Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex2.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText1')"
         If _database.ExecuteNonQuery(upd) = True Then
@@ -916,27 +819,11 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub frmMain_ImeModeChanged(sender As Object, e As EventArgs) Handles Me.ImeModeChanged
-
-    End Sub
-
-
-
-    Private Sub COMMENTTextBox_Leave(sender As Object, e As EventArgs) Handles COMMENTTextBox.Leave
-        Try
-            Dim separatorIndex = COMMENTTextBox.Text.IndexOf(".")
-            TextBox1.Text = COMMENTTextBox.Text.Substring(separatorIndex, COMMENTTextBox.Text.Length - 1)
-        Catch ex As Exception
-
-        End Try
-
-    End Sub
-
     Private Sub EMAILIDTextBox_TextChanged(sender As Object, e As EventArgs) Handles EMAILIDTextBox.TextChanged
-        If IsNumeric(EMAILIDTextBox) Then
-            ToolStripEmailAccountID.Text = EMAILIDTextBox.Text
+        If IsNumeric(EMAILIDTextBox.Text) Then
+            ToolStripEmailAccountID2.Text = EMAILIDTextBox.Text
         Else
-            ToolStripEmailAccountID.Text = "Choose Email-Config"
+            ToolStripEmailAccountID2.Text = "Choose Email-Config"
         End If
         btnCheckIMAPObjects.Visible = False
     End Sub
@@ -955,12 +842,11 @@ Public Class frmMain
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
         Try
             If ComboBox1.SelectedIndex <> -1 Then
-                ToolStripEmailAccountID.Text = ComboBox1.SelectedValue
+                ToolStripEmailAccountID2.Text = ComboBox1.SelectedValue
             End If
         Catch ex As Exception
-
+            Logger.Error(ex)
         End Try
-
     End Sub
 
     Private Sub PasswortAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortAnzeigenToolStripMenuItem.Click
@@ -972,4 +858,8 @@ Public Class frmMain
             MsgBox(ex.Message, MsgBoxStyle.Critical, "")
         End Try
     End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs)
+
+    End Sub
 End Class

App/EmailProfiler.Service/App.config

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="EmailProfiler.Service.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <connectionStrings />
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <applicationSettings>
+    <EmailProfiler.Service.My.MySettings>
+      <setting name="FB_DATASOURCE" serializeAs="String">
+        <value>172.24.12.41</value>
+      </setting>
+      <setting name="FB_DATABASE" serializeAs="String">
+        <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
+      </setting>
+      <setting name="FB_USER" serializeAs="String">
+        <value>sysdba</value>
+      </setting>
+      <setting name="FB_PW" serializeAs="String">
+        <value>dd</value>
+      </setting>
+      <setting name="DEBUG" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="USE_WM" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="EmailAccountID" serializeAs="String">
+        <value>2</value>
+      </setting>
+      <setting name="EmailProfilerPraefix" serializeAs="String">
+        <value>EmailProfiler</value>
+      </setting>
+      <setting name="EML_LIMITATION_SENDER" serializeAs="String">
+        <value>NONE</value>
+      </setting>
+      <setting name="MyConnectionString" serializeAs="String">
+        <value>Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=;</value>
+      </setting>
+    </EmailProfiler.Service.My.MySettings>
+  </applicationSettings>
+</configuration>

App/EmailProfiler.Service/Config.vb

@@ -0,0 +1,8 @@
+Public Class Config
+    Public Property Debug As Boolean = False
+    Public Property EmailAccountId As Integer = 0
+    Public Property EmailTitlePrefix As String = "EmailProfiler"
+    Public Property EmailSenderLimitation As String = ""
+    Public Property ConnectionString As String = ""
+    Public Property UseWindream As Boolean = False
+End Class

App/EmailProfiler.Service/EmailProfiler.Service.vbproj

@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1F3C569B-91DA-427F-8D81-BBCC556B11A4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>SERV_EMAIL.MyService</StartupObject>
-    <RootNamespace>SERV_EMAIL</RootNamespace>
-    <AssemblyName>SERV_EMAIL</AssemblyName>
+    <StartupObject>EmailProfiler.Service.MyService</StartupObject>
+    <RootNamespace>EmailProfiler.Service</RootNamespace>
+    <AssemblyName>EmailProfiler.Service</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Console</MyType>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>SERV_EMAIL.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Service.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>SERV_EMAIL.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Service.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -51,6 +51,9 @@
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
@@ -93,6 +96,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Config.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
@@ -150,9 +154,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj">
+    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
       <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
-      <Name>DigitalData.EMLProfiler</Name>
+      <Name>EmailProfiler.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

App/EmailProfiler.Service/My Project/Resources.Designer.vb

@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SERV_EMAIL.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Service.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

App/EmailProfiler.Service/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -156,9 +156,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.SERV_EMAIL.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EmailProfiler.Service.My.MySettings
             Get
-                Return Global.SERV_EMAIL.My.MySettings.Default
+                Return Global.EmailProfiler.Service.My.MySettings.Default
             End Get
         End Property
     End Module

App/EmailProfiler.Service/MyService.vb

@@ -0,0 +1,130 @@
+Imports System.ComponentModel
+Imports System.IO
+Imports DigitalData.EMLProfiler
+Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Public Class MyService
+#Region "+++++ variables +++++"
+    Private Worker As BackgroundWorker
+    Private WithEvents Timer As New Timers.Timer
+
+    Private LogConfig As LogConfig
+    Private Logger As Logger
+    'Private _database As clsDatabase
+    Private EmailWorker As clsWorkEmail
+
+    Private DBConfigManager As ClassDBConfig
+    Private DBConfig As ClassDBConfig.Config
+
+    Private ConfigManager As ConfigManager(Of Config)
+    Private Config As Config
+
+    Private Database As MSSQLServer
+#End Region
+    Protected Overrides Sub OnStart(args() As String)
+        Try
+            Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
+            LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30)
+            Logger = LogConfig.GetLogger
+
+            Logger.Info("Service started.")
+
+            ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
+            Config = ConfigManager.Config
+
+            If Config.ConnectionString = String.Empty Then
+                Logger.Warn("No ConnectionString configured. Exiting.")
+            Else
+                If Config.Debug = True Then
+                    LogConfig.Debug = True
+                Else
+                    LogConfig.Debug = False
+                End If
+
+                Database = New MSSQLServer(LogConfig, Config.ConnectionString)
+                Logger.Debug("Database initialized!")
+
+                DBConfigManager = New ClassDBConfig(LogConfig, Database)
+                DBConfig = DBConfigManager.GetConfig()
+
+                If DBConfig IsNot Nothing Then
+                    Logger.Debug("DBConfig initialized!")
+                Else
+                    Logger.Warn("Error while initializing DBConfig")
+                End If
+
+                EmailWorker = New clsWorkEmail(LogConfig, Config.ConnectionString, DBConfig.WindreamConnectionString,
+                                             Config.UseWindream, Config.EmailAccountId, Config.EmailTitlePrefix)
+                Logger.Debug("Module Workmail initialized")
+
+                If Database.DBInitialized = False Then
+                    Logger.Warn("No Connection was established! Exiting.")
+                Else
+                    '### Thread für das nachträgliche Setzen von Rechten generieren
+                    Logger.Debug("Setting up Background Worker")
+                    Worker = New BackgroundWorker With {
+                        .WorkerReportsProgress = True,
+                        .WorkerSupportsCancellation = True
+                    }
+                    AddHandler Worker.DoWork, AddressOf DoWork
+                    AddHandler Worker.RunWorkerCompleted, AddressOf Worker_Completed
+
+                    ' Set the Interval
+                    Timer.Interval = DBConfig.TimerInterval * 60000
+                    Timer.Enabled = True
+                    Logger.Debug("Timer started.")
+
+                    ' Und den Durchlauf das erste Mal starten
+                    Worker.RunWorkerAsync()
+                End If
+            End If
+        Catch ex As Exception
+            Logger.Warn("Unexpected error while starting.")
+            Logger.Error(ex)
+        End Try
+    End Sub
+    Public Sub Thread_Run() Handles Timer.Elapsed
+        Logger.Debug("Starting Worker..")
+        If Not Worker.IsBusy Then
+            Logger.Debug("Running Worker..")
+            Worker.RunWorkerAsync()
+        End If
+    End Sub
+    Public Sub DoWork(sender As Object, e As DoWorkEventArgs)
+        Try
+            Dim oProfileIdForPolling = 0
+
+            Dim oWorker As New clsWorker(LogConfig,
+                                         Config.ConnectionString,
+                                         DBConfig.WindreamConnectionString,
+                                         oProfileIdForPolling,
+                                         Config.UseWindream,
+                                         Config.EmailAccountId,
+                                         Config.EmailSenderLimitation,
+                                         Config.EmailTitlePrefix)
+            oWorker.Start_WorkingProfiles()
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try
+    End Sub
+    Protected Overrides Sub OnStop()
+        ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen.
+        Logger.Info("## Service was stopped manually. ##")
+    End Sub
+    Private Sub Worker_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted
+        'This event fires when the DoWork event completes
+        Try
+            Dim result As String = ""
+            If e.Cancelled Then
+                EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error)
+                Logger.Warn("## The thread was cancelled.")
+            ElseIf e.Error IsNot Nothing Then
+                EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error)
+                Logger.Warn("Unexpected error in thread: " & e.Error.Message)
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try
+    End Sub
+End Class

App/EmailProfiler.Service/ProjectInstaller.Designer.vb

@@ -19,7 +19,7 @@
     'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich.
     'Das Bearbeiten ist mit dem Komponenten-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.ServiceProcessInstaller1 = New System.ServiceProcess.ServiceProcessInstaller()
         Me.ServiceInstaller1 = New System.ServiceProcess.ServiceInstaller()
@@ -33,6 +33,7 @@
         'ServiceInstaller1
         '
         Me.ServiceInstaller1.Description = "Checks and works emails from configured profiles"
+        Me.ServiceInstaller1.DisplayName = "Digital Data Email Profiler"
         Me.ServiceInstaller1.ServiceName = "DD EmailProfiler"
         Me.ServiceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic
         '

App/EmailProfiler.Service/ProjectInstaller.resx

@@ -121,7 +121,7 @@
     <value>17, 56</value>
   </metadata>
   <metadata name="ServiceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>197, 17</value>
+    <value>211, 52</value>
   </metadata>
   <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>

App/EmailProfiler.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33516.290
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SERV_EMAIL", "SERV_EMAIL\SERV_EMAIL.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Service", "EmailProfiler.Service\EmailProfiler.Service.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CONFIG_APP", "CONFIG_APP\CONFIG_APP.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Form", "EmailProfiler.Form\EmailProfiler.Form.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DigitalData.EMLProfiler", "DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Common", "EmailProfiler.Common\EmailProfiler.Common.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "wisag_check_Att", "wisag_check_Att\wisag_check_Att.vbproj", "{CD67B0B9-A7DE-447D-9982-E7AC43481DDC}"
 EndProject

App/SERV_EMAIL/App.config

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="SERV_EMAIL.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <connectionStrings />
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
-    </startup>
-    <applicationSettings>
-        <SERV_EMAIL.My.MySettings>
-            <setting name="FB_DATASOURCE" serializeAs="String">
-                <value>172.24.12.41</value>
-            </setting>
-            <setting name="FB_DATABASE" serializeAs="String">
-                <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
-            </setting>
-            <setting name="FB_USER" serializeAs="String">
-                <value>sysdba</value>
-            </setting>
-            <setting name="FB_PW" serializeAs="String">
-                <value>dd</value>
-            </setting>
-            <setting name="DEBUG" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="USE_WM" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="EmailAccountID" serializeAs="String">
-                <value>2</value>
-            </setting>
-            <setting name="EmailProfilerPraefix" serializeAs="String">
-                <value>EmailProfiler</value>
-            </setting>
-            <setting name="EML_LIMITATION_SENDER" serializeAs="String">
-                <value>NONE</value>
-            </setting>
-            <setting name="MyConnectionString" serializeAs="String">
-                <value>Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=;</value>
-            </setting>
-        </SERV_EMAIL.My.MySettings>
-    </applicationSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

App/SERV_EMAIL/MyService.vb

@@ -1,112 +0,0 @@
-Imports System.ComponentModel
-Imports System.IO
-Imports DigitalData.EMLProfiler
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Public Class MyService
-#Region "+++++ variables +++++"
-    Private _threadRunner As BackgroundWorker
-    Private LogConfig As LogConfig
-    Private Logger As Logger
-    'Private _database As clsDatabase
-    Private _workmail As clsWorkEmail
-
-    Private _ConfigManager As ClassConfig
-    Private _Config As ClassConfig.Config
-
-    Private Database As MSSQLServer
-#End Region
-    Public Sub New()
-        MyBase.New()
-        InitializeComponent()
-    End Sub
-    Protected Overrides Sub OnStart(ByVal args() As String)
-        ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge
-        ' ausführen, damit der Dienst gestartet werden kann.
-        Try
-            Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
-            LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30)
-            Logger = LogConfig.GetLogger
-
-            Logger.Info("## Service started  ## ")
-
-            If My.Settings.MyConnectionString = String.Empty Then
-                Logger.Warn("NO CONNECTIONSTRING CONFIGURED.")
-            Else
-                If My.Settings.DEBUG = True Then
-                    Logger.Info("DEBUG ACTIVATED")
-                    LogConfig.Debug = True
-                Else
-                    LogConfig.Debug = False
-                End If
-
-                Database = New MSSQLServer(LogConfig, My.Settings.MyConnectionString)
-                _ConfigManager = New ClassConfig(LogConfig, Database)
-                _Config = _ConfigManager.GetConfig()
-
-                '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
-                Logger.Debug("_database and _email initialized")
-                _workmail = New clsWorkEmail(LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW,
-                                             My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix)
-                Logger.Debug("_workmail initialized")
-
-                If Database.DBInitialized = False Then
-                    Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!")
-                Else
-                    '### Thread für das nachträgliche Setzen von Rechten generieren
-                    _threadRunner = New BackgroundWorker With {
-                        .WorkerReportsProgress = True,
-                        .WorkerSupportsCancellation = True
-                    }
-                    AddHandler _threadRunner.DoWork, AddressOf RUN_THREAD
-                    AddHandler _threadRunner.RunWorkerCompleted, AddressOf Thread1_Completed
-                    '### Den Timer generieren
-                    Dim Timer_Durchlauf As New System.Timers.Timer()
-                    'Das Event hinterlegen welches bei "Tick" ausgelöst wird
-                    AddHandler Timer_Durchlauf.Elapsed, AddressOf Thread_Run
-                    ' Set the Interval
-                    Timer_Durchlauf.Interval = (_Config.TimerInterval * 60000)
-                    Timer_Durchlauf.Enabled = True
-                    Logger.Debug("...Timer started.")
-                    ' Und den Durchlauf das erste Mal starten
-                    _threadRunner.RunWorkerAsync()
-                End If
-            End If
-        Catch ex As Exception
-            Logger.Error(ex)
-        End Try
-    End Sub
-    Public Sub Thread_Run()
-        If Not _threadRunner.IsBusy Then
-            _threadRunner.RunWorkerAsync()
-        End If
-    End Sub
-    Public Sub RUN_THREAD(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
-        Try
-            Dim notcompleted As Boolean = False
-            Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, 0, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix)
-            _work.Start_WorkingProfiles()
-        Catch ex As Exception
-            Logger.Error(ex)
-        End Try
-    End Sub
-    Protected Overrides Sub OnStop()
-        ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen.
-        Logger.Info("## Service was stopped manually. ##")
-    End Sub
-    Private Sub Thread1_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted
-        'This event fires when the DoWork event completes
-        Try
-            Dim result As String = ""
-            If e.Cancelled Then
-                EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error)
-                Logger.Warn("## The thread was cancelled.")
-            ElseIf e.Error IsNot Nothing Then
-                EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error)
-                Logger.Warn("Unexpected error in thread: " & e.Error.Message)
-            End If
-        Catch ex As Exception
-            Logger.Error(ex)
-        End Try
-    End Sub
-End Class