DynamicFolder mittels AI optimiert

Replaced all license management classes (ClassLicense, ClassLicenses, ClassLicenseManager) with a new ClassPasswordCrypto for password encryption/decryption using Rijndael (AES). Updated all usages to call EncodePassword/DecodePassword instead of license key methods. Removed obsolete license-related code and files from the project. Incremented assembly version to 2.10.4.0. Cleaned up imports and updated the project file to reflect these changes. No license logic remains; only password crypto is handled.

.gitignore

@@ -158,3 +158,10 @@ $RECYCLE.BIN/
 /ToolCollection/.vs/ToolCollection/v16/Server/sqlite3
 /.vs/ToolCollection/v16/Server/sqlite3
 /ToolCollection/.vs/ToolCollection/v15/Server/sqlite3
+/.vs/ToolCollection/FileContentIndex/719c2c5a-903b-46fb-98ca-0e3edcec50ec.vsidx
+/.vs/ToolCollection/FileContentIndex
+/ToolCollection/.vs/ToolCollection.vbproj.dtbcache.json
+/NIService/.vs/NIService.csproj.dtbcache.json
+/.vs/ToolCollection/v17/DocumentLayout.json
+/.vs/ToolCollection/v17/DocumentLayout.backup.json
+/.vs

.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": null
-}

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\ToolCollection.sln",
-  "PreviewInSolutionExplorer": false
-}

ToolCollection.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36203.30 d17.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ToolCollection", "ToolCollection\ToolCollection.vbproj", "{AC6B3398-DE0E-4580-9422-6E4D97FA4494}"
 EndProject
@@ -20,6 +20,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AC6B3398-DE0E-4580-9422-6E4D97FA4494}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{AC6B3398-DE0E-4580-9422-6E4D97FA4494}.Debug|Any CPU.Build.0 = Debug|x86
 		{AC6B3398-DE0E-4580-9422-6E4D97FA4494}.Debug|x64.ActiveCfg = Debug|x64
 		{AC6B3398-DE0E-4580-9422-6E4D97FA4494}.Debug|x64.Build.0 = Debug|x64
 		{AC6B3398-DE0E-4580-9422-6E4D97FA4494}.Debug|x86.ActiveCfg = Debug|x86

ToolCollection/.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": null
-}

ToolCollection/.vs/VSWorkspaceState.json

@@ -1,6 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "PreviewInSolutionExplorer": false
-}

ToolCollection/ClassActiveDirectory.vb

@@ -1,7 +1,7 @@
 Imports System.DirectoryServices
 Imports DigitalData.Modules.Logging
 Public Class ClassActiveDirectory
-    Public Shared licenseManager As ClassLicenseManager = Nothing
+    Public Shared passwordCrypto As ClassPasswordCrypto = Nothing
     Public Shared ErgebnisAD As String()
     Private Shared _Logger As DigitalData.Modules.Logging.Logger
     Public Shared Function Test_Connect(SEARCH_Filter As String, Property2Load As String, Domain As String, User As String, PW As String)
@@ -95,8 +95,8 @@ Public Class ClassActiveDirectory
             End If
 
 
-            licenseManager = New ClassLicenseManager("#DigitalData9731258!#")
-            Dim PWDecode As String = licenseManager.DecodeLicenseKey(PW)
+            passwordCrypto = New ClassPasswordCrypto("#DigitalData9731258!#")
+            Dim PWDecode As String = passwordCrypto.DecodePassword(PW)
             Dim objDirectoryEntry As DirectoryEntry = New DirectoryEntry(Domain)
             If PW <> String.Empty And User <> String.Empty Then
                 objDirectoryEntry.Username = User

ToolCollection/ClassDI.vb

@@ -7,16 +7,12 @@ Public Class ClassDI
     ' ++++++++++++++++++++++++++++++++++++++++++++++ Methoden ++++++++++++++++++++++++++++++++++++++++++++++
 
     Sub New(LogConfig As LogConfig)
-
-
         Try
 
             ' 3a. Windream instanziieren
             Me._windream = New ClassWindream_allgemein(LogConfig)
-
             ' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
             Me._windream.Init()
-
         Catch ex As Exception
             MsgBox("Unbekannter Fehler im Konstuktor des Moduls 'XYZ'." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unbekannter Fehler")
         End Try

ToolCollection/ClassDIProfile.vb

@@ -85,6 +85,10 @@ Public Class ClassDIProfile
     ' gibt ein einzelnes Profil-Objekt zurück
     Public Shared Function getProfilByName(ByVal profilname As String) As ClassDIProfil
 
+        If _profiles Is Nothing Then
+            Return Nothing
+        End If
+
         ' alle Profile durchlaufen
         For Each profil As ClassDIProfil In _profiles
 

ToolCollection/ClassLicense.vb

@@ -1,104 +0,0 @@
-Public Class ClassLicense
-
-    Private _modulename As String
-    Private _expires As Date
-    Private _Typ As String
-    Private _anzProf As String
-
-
-    ' ++++++++++++++++++++++++++++++++++++++++++++++ Methoden ++++++++++++++++++++++++++++++++++++++++++++++
-
-    ''' <summary>
-    ''' Konstruktor der Lizenz
-    ''' </summary>
-    ''' <param name="modulename">Name des Moduls</param>
-    ''' <param name="expires">Gültigkeitsdatum der Lizenz</param>
-    ''' <remarks></remarks>
-    Sub New(ByVal modulename As String, ByVal expires As Date, ByVal _type As String, ByVal _anzprofile As String)
-        Me._modulename = modulename
-        Me._expires = expires
-        Me._Typ = _type
-        Me._anzProf = _anzprofile
-    End Sub
-
-
-    ' ++++++++++++++++++++++++++++++++++++++++++++++ Properties ++++++++++++++++++++++++++++++++++++++++++++++
-
-    ''' <summary>
-    ''' Liefert oder setzt den Namen des Moduls für diese Lizenz
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Modulename() As String
-        Get
-            Return Me._modulename
-        End Get
-        Set(ByVal value As String)
-            Me._modulename = value
-        End Set
-    End Property
-
-
-    ''' <summary>
-    ''' Liefert oder setzt das Gültigkeitsdatum der Lizenz für das Modul
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Expires() As Date
-        Get
-            Return Me._expires
-        End Get
-        Set(ByVal value As Date)
-            Me._expires = value
-        End Set
-    End Property
-
-
-    ''' <summary>
-    ''' Liefert ob die Lizenz schon abgelaufen ist
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public ReadOnly Property IsExpired()
-        Get
-            If Date.Today > Me._expires Then
-                Return True
-            Else
-                Return False
-            End If
-        End Get
-    End Property
-
-    ''' <summary>
-    ''' Liefert den Typend er Lizenz
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Type() As String
-        Get
-            Return Me._Typ
-        End Get
-        Set(ByVal value As String)
-            Me._Typ = value
-        End Set
-    End Property
-    ''' <summary>
-    ''' Liefert die Anzahl der Profile
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Anz_Profile() As String
-        Get
-            Return Me._anzProf
-        End Get
-        Set(ByVal value As String)
-            Me._anzProf = value
-        End Set
-    End Property
-
-End Class

ToolCollection/ClassLicenses.vb

@@ -1,149 +0,0 @@
-Public Class ClassLicenses
-
-    Private _licenses() As ClassLicense
-    Private _machine As String
-    Private _company As String
-    Private _WDLizenz As String
-
-    ' ++++++++++++++++++++++++++++++++++++++++++++++ Methoden ++++++++++++++++++++++++++++++++++++++++++++++
-
-    ''' <summary>
-    ''' Konstruktor für die Lizenzen-Sammlung
-    ''' </summary>
-    ''' <param name="licenseStringArray">In Array übertragene Lizenzinformationen</param>
-    ''' <remarks></remarks>
-    Sub New(ByVal licenseStringArray(,) As String)
-        Try
-            If licenseStringArray IsNot Nothing Then
-                Dim license1() As String = licenseStringArray(0, 1).Split("#")
-
-                If license1.Length > 1 Then
-                    Me._machine = license1(1)
-                Else
-                    Me._machine = "all"
-                End If
-                Me._company = license1(0) 'licenseStringArray(0, 1)
-                frmStart._company = Me._company
-
-                Dim i As Integer
-                For i = 1 To licenseStringArray.GetLength(0) - 2   ' minus 2, weil GetLength nicht null-basiert ist und das erste Element Firma ist
-                    Dim _date As Date
-                    Dim anzprof As String = licenseStringArray(i, 3)
-                    If anzprof.ToLower = "unlimited" Then
-                        anzprof = 99
-                    End If
-                    Try
-                        _date = CDate(licenseStringArray(i, 1))
-                    Catch ex As Exception
-
-                        If licenseStringArray(i, 1).ToString.EndsWith("2099") Then
-                            _date = "2099-12-31"
-                        Else
-                            MsgBox(ex.Message & vbNewLine & Environment.OSVersion.ToString, MsgBoxStyle.Critical)
-                        End If
-
-                    End Try
-
-                    Me.Add(licenseStringArray(i, 0), _date, licenseStringArray(i, 2), anzprof)
-                Next
-            End If
-        Catch ex As Exception
-            MsgBox("Fehler bei Auslesen der Licenses: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-      
-    End Sub
-
-
-    ''' <summary>
-    ''' Fügt der Lizenz-Sammlung eine Lizenz hinzu
-    ''' </summary>
-    ''' <param name="modulename">Name des Moduls, für das eine Lizenz angelegt werden soll</param>
-    ''' <param name="expires">Datum der Gültigkeit der Lizenz</param>
-    ''' <remarks></remarks>
-    Public Sub Add(ByVal modulename As String, ByVal expires As Date, ByVal type As String, ByVal anzprof As String)
-
-        If Me._licenses IsNot Nothing Then
-            ReDim Preserve Me._licenses(Me._licenses.Length)
-        Else
-            ReDim Preserve Me._licenses(0)
-        End If
-
-        Me._licenses(Me._licenses.Length - 1) = New ClassLicense(modulename, expires, type, anzprof)
-    End Sub
-
-
-    ''' <summary>
-    ''' Liefert eine Lizenz an Hand des Modulnamens
-    ''' </summary>
-    ''' <param name="modulename">Name des zu suchenden Moduls</param>
-    ''' <returns>liefert ein Lizenzobjekt</returns>
-    ''' <remarks></remarks>
-    Public Function GetLicense(ByVal modulename As String) As ClassLicense
-        If Me._licenses IsNot Nothing Then
-            For Each license As ClassLicense In Me._licenses
-                If license.Modulename = modulename Then
-                    Return license
-                End If
-            Next
-        End If
-
-        Return Nothing
-    End Function
-
-
-
-
-    ' ++++++++++++++++++++++++++++++++++++++++++++++ Properties ++++++++++++++++++++++++++++++++++++++++++++++
-
-
-    ''' <summary>
-    ''' liefert eine Sammlung von Lizenzobjekten 
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public ReadOnly Property Licenses() As ClassLicense()
-        Get
-            Return Me._licenses
-        End Get
-    End Property
-
-
-    ''' <summary>
-    ''' liefert eine Lizenz an Hand des Modulnamens
-    ''' </summary>
-    ''' <param name="modulename">Name des zu suchenden Moduls</param>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public ReadOnly Property License(ByVal modulename As String) As ClassLicense
-        Get
-            Return Me.GetLicense(modulename)
-        End Get
-    End Property
-
-
-    ''' <summary>
-    ''' Liefert oder setzt den Firmennamen des Lizenzeigentümers
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Company() As String
-        Get
-            Return Me._company
-        End Get
-        Set(ByVal value As String)
-            Me._company = value
-        End Set
-    End Property
-    Public Property machine() As String
-        Get
-            Return Me._machine
-        End Get
-        Set(ByVal value As String)
-            Me._machine = value
-        End Set
-    End Property
-
-End Class

ToolCollection/ClassMO_RE.vb

@@ -29,156 +29,6 @@ Public Class ClassMO_REOld
             Return False
         End Try
     End Function
-    'Public Shared Function RUN_MO_RE(ByVal dokument As WMObject, ByVal vDatei As String, ByVal _MRDOKART As Object, ByVal _MRKUNDE As Object) As String
-    '    Try
-    '        Dim DT As New DataTable
-    '        Dim _MRDeskrIndex
-    '        Dim _path, _praefix, _kunde, _ziel As String
-
-
-    '        _Logger.Debug(">> Ausgelesener Kundenidentifikator: " & _MRKUNDE)
-    '        _Logger.Debug(">> Ausgelesene Dokumentart: " & _MRDOKART)
-    '        Dim oSelect As String
-    '        If _MRKUNDE Is Nothing Or _MRKUNDE = "" Then
-    '            'Auslesen der MORE-Konfiguration für Kunde und Standard
-    '            oSelect = "SELECT * FROM VWMO_RE_DOKUMENTARTZUORDNUNG WHERE (DOKUMENTART = '" & _MRDOKART.ToString & "') AND (UPPER(KUNDEN_NAME) = 'STANDARD')"
-    '            DT = Return_Datatable(oSelect)
-    '            _Logger.Debug(oSelect)
-    '        Else
-    '            If _MRKUNDE = "Standard-VZ" Then _MRKUNDE = "Standard"
-    '            oSelect = "SELECT * FROM VWMO_RE_DOKUMENTARTZUORDNUNG WHERE (DOKUMENTART = '" & _MRDOKART.ToString & "') AND (UPPER(KUNDEN_NAME) = UPPER('" & _MRKUNDE.ToString & "'))"
-    '            'Auslesen der MORE-Konfiguration für Kunde und Dokart
-    '            DT = Return_Datatable(oSelect)
-    '            _Logger.Debug("Select2: " & oSelect)
-    '        End If
-    '        If DT.Rows.Count = 0 Then
-    '            _Logger.Debug("Für Kunden keine Daten - also Standard lesen")
-    '            oSelect = "SELECT * FROM VWMO_RE_DOKUMENTARTZUORDNUNG WHERE (DOKUMENTART = '" & _MRDOKART.ToString & "') AND (UPPER(KUNDEN_NAME) = 'STANDARD')"
-    '            'Für diesen Kunden wurde keine Konfiguration gefunden also den Standard laden
-    '            DT = Return_Datatable(oSelect)
-    '            _Logger.Debug("Select3: " & oSelect)
-    '        End If
-
-    '        If DT.Rows.Count = 1 Then
-    '            'Es liegt sowohl Kunde als auch Dokumentart vor
-    '            Try
-    '                _Logger.Debug("Versuch für den Index " & DT.Rows(0).Item("INDEXNAME").ToString & " den Indexwert auszulesen")
-    '                Dim sw As New ClassStopwatch($"GetVariableValue _MRDeskrIndex({DT.Rows(0).Item("INDEXNAME").ToString})")
-    '                _MRDeskrIndex = dokument.GetVariableValue(DT.Rows(0).Item("INDEXNAME").ToString)
-    '                Dim msg = sw.Done
-    '                If msg <> String.Empty Then _Logger.Info(msg)
-    '            Catch ex As Exception
-    '                _Logger.Warn("Achtung: ein eindeutiger/deskriptiver Indexwert existiert noch nicht! Dokument kann nicht verschoben und umbenannt werden!")
-    '                Return False
-    '            End Try
-    '            _Logger.Debug("Ausgelesener Deskriptiver Index: " & _MRDeskrIndex)
-
-    '            'Datei-Paramter auslesen
-    '            Dim extension As String = Path.GetExtension(vDatei)
-    '            Dim myFolderPath As String
-    '            myFolderPath = Path.GetDirectoryName(vDatei)
-
-    '            Dim _WDLaufwerk, _newfilename As String
-    '            _WDLaufwerk = My.Settings.MRWD_Laufwerk
-    '            _path = DT.Rows(0).Item("DOKUMENTARTORDNER")
-
-    '            '####### _path anpassen evtl Unterordner
-    '            'Unterordner Index 1
-    '            Dim _UOindex As String = DT.Rows(0).Item("UO_IDX1")
-    '            Dim _UOindex_Value As String = ""
-    '            If _UOindex <> "" Then
-    '                Dim sw As New ClassStopwatch($"GetVariableValue _UOindex({_UOindex})")
-    '                _UOindex_Value = dokument.GetVariableValue(_UOindex)
-    '                Dim msg = sw.Done
-    '                If msg <> String.Empty Then _Logger.Info(msg)
-    '                If Not _UOindex_Value Is Nothing Then
-    '                    _path &= "\" & _UOindex_Value
-    '                    If _path.Contains(" 00:00:00") Then _path = _path.Replace(" 00:00:00", "")
-    '                    _Logger.Debug("Unterordner 1 soll erzeugt werden - Path '" & _path & "'")
-    '                End If
-    '            End If
-    '            'Unterordner Index 2
-    '            _UOindex = DT.Rows(0).Item("UO_IDX2")
-    '            If _UOindex <> "" Then
-    '                Dim sw As New ClassStopwatch($"GetVariableValue _UOindex({_UOindex})")
-    '                _UOindex_Value = dokument.GetVariableValue(_UOindex)
-    '                Dim msg = sw.Done
-    '                If msg <> String.Empty Then _Logger.Info(msg)
-    '                If Not _UOindex_Value Is Nothing Then
-    '                    _path &= "\" & _UOindex_Value
-    '                    If _path.Contains(" 00:00:00") Then _path = _path.Replace(" 00:00:00", "")
-    '                    _Logger.Debug("Unterordner 2 soll erzeugt werden - Path '" & _path & "'")
-    '                End If
-    '            End If
-
-    '            _UOindex = DT.Rows(0).Item("UO_IDX3")
-    '            If _UOindex <> "" Then
-    '                Dim sw As New ClassStopwatch($"GetVariableValue _UOindex({_UOindex})")
-    '                _UOindex_Value = dokument.GetVariableValue(_UOindex)
-    '                Dim msg = sw.Done
-    '                If msg <> String.Empty Then _Logger.Info(msg)
-    '                If Not _UOindex_Value Is Nothing Then
-    '                    _path &= "\" & _UOindex_Value
-    '                    If _path.Contains(" 00:00:00") Then _path = _path.Replace(" 00:00:00", "")
-    '                    _Logger.Debug("Unterordner 3 soll erzeugt werden - Path '" & _path & "'")
-    '                End If
-    '            End If
-
-    '            '#####
-
-    '            _kunde = DT.Rows(0).Item("KUNDEN_NAME")
-    '            _praefix = DT.Rows(0).Item("PRAEFIX")
-    '            'Dem Neuen Dateinamen schon mal das Präfix mitgeben
-    '            _newfilename = _praefix
-    '            _newfilename = _newfilename & _MRDeskrIndex & extension
-
-    '            _Logger.Debug("Ausgelesener Pfad: " & _path)
-    '            _Logger.Debug("Neuer Dateiname: " & _newfilename)
-
-    '            '### VERSIONIERUNG ###
-    '            Dim version As Integer = 2
-    '            Dim Stammname As String = _newfilename.Substring(0, _newfilename.LastIndexOf("."))
-    '            Dim neuername As String = _newfilename.Substring(0, _newfilename.LastIndexOf("."))
-    '            'Überprüfen ob File existiert
-    '            Do While file_exists(_path & "\" & neuername & extension, False) = True
-    '                neuername = Stammname & "~" & version
-    '                _newfilename = neuername & extension
-    '                version = version + 1
-    '            Loop
-    '            _ziel = _path & "\" & _newfilename
-
-    '            If My.Settings.vLogErrorsonly = False Then
-    '                If neuername.Contains("~") Then _Logger.Info("Neuer Dateiname: " & _newfilename)
-
-    '                _Logger.Debug("Neuer Dateiname: " & _newfilename)
-    '                _Logger.Debug("Quelle: " & vDatei)
-    '                _Logger.Debug("Ziel: " & _ziel)
-    '            End If
-
-    '            If myFolderPath <> _path Then
-    '                _windreamNI.NEW_MOVE_FILE(_ziel, vDatei, "MO_RE")
-    '                'ClassLoggerNI.Add(" ######### Erfolgsmeldung - Datei wurde erfolgreich umbenannt und verschoben ###########")
-    '            Else
-    '                _Logger.Info("Verschieben nicht notwendig: Ordnerpfad identisch!")
-    '                Dim sw As New ClassStopwatch("RenameFile")
-    '                My.Computer.FileSystem.RenameFile(vDatei, _newfilename)
-    '                _Logger.Debug("Erfolgsmeldung - Datei wurde erfolgreich umbenannt")
-    '                Dim msg = sw.Done
-    '                If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-    '            End If
-    '            Execute_Command("INSERT INTO TBMO_RE_HISTORY (FILE_ORIGINAL, FILE_NEW, KUNDE, INDEX1, INDEX2, ERSTELLTWER) VALUES " &
-    '                            "('" & vDatei & "','" & _ziel & "','" & _kunde & "','" & _MRDeskrIndex & "','" & _MRDOKART & "','ToolCollection MORE')")
-    '            Return _ziel
-    '        Else
-    '            _Logger.Info("MO_RE Result was not 1 row: check select..." & oSelect)
-    '            Return False
-    '        End If
-    '    Catch ex As Exception
-    '        _Logger.Error(ex)
-    '        MsgBox(ex.Message, MsgBoxStyle.Critical)
-    '        Return False
-    '    End Try
-    'End Function
     Private Shared Function file_exists(ByVal _file As String, ByVal suche As Boolean)
         Try
             _file = _file.Replace("W:", "\\windream\objects")

ToolCollection/ClassNIDatenbankzugriff.vb

@@ -13,7 +13,6 @@ Public Class ClassNIDatenbankzugriff
     Private Shared _LastStep, _SQL As String
     Private Shared aTimerCount As Integer = 0
     Private Shared aTimer As System.Timers.Timer
-    Private Shared Oracle_Conn As New OracleConnection
     Private _firebird As Firebird
 
     Sub New(LogConf As DigitalData.Modules.Logging.LogConfig)
@@ -26,429 +25,14 @@ Public Class ClassNIDatenbankzugriff
 
 
     End Sub
-    ''' <summary>
-    ''' Start the timer.
-    ''' </summary>
-    Shared Sub Timer_Start()
-        aTimerCount = 0
-        aTimer = New System.Timers.Timer(1000)
-        AddHandler aTimer.Elapsed, AddressOf OnTimedEvent
-        aTimer.Enabled = True
-    End Sub
-    ''' <summary>
-    ''' Start the timer.
-    ''' </summary>
     Shared Sub Timer_Stop()
         aTimer.Enabled = False
         aTimerCount = 0
     End Sub
-    ' Specify what you want to happen when the Elapsed event is 
-    ' raised.
-    Private Shared Sub OnTimedEvent(source As Object, e As ElapsedEventArgs)
-        aTimerCount = aTimerCount + 1
-        If aTimerCount > 60 Then
-            _Logger.Warn("ClassNIDatenbankzugriff.OnTimedEvent-Die Maximaldauer (60sec) wurde überschritten!")
-            _Logger.Warn("OracleConnection.StatementCacheSize: " & Oracle_Conn.StatementCacheSize)
-            _Logger.Warn("Last Step: " & _LastStep)
-            _Logger.Warn("OracleConnection.Connection State: " & Oracle_Conn.State.ToString)
-            _Logger.Warn("OracleSQLCommand: " & _SQL)
-            Oracle_Conn.Close()
-            frmNIHauptseite.Abbruch_NI("Abbruch aufgrund Timeout Oracle", False, False)
-            _Logger.Info("INDEXIERUNG WIRD NEUGESTARTET")
-            'und Neustart 
-            frmNIHauptseite.Profile_Durchlaufen()
-            aTimer.Enabled = False
-            'Else
-            '    If My.Settings.vLogErrorsonly = False Then
-            '        _Logger.Debug("OracleConnection.StatementCacheSize: " & Oracle_Conn.StatementCacheSize)
-            '    End If
-        End If
-    End Sub
-    ' führt eine SQL-Anweisung auf der DB aus
-    Public Function GetValueFromOracleDb(Profilname As String, ByVal selectAnweisung As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String, ByVal myDS As DataSet, Optional ByVal Indexname As String = "", Optional ByVal QuellVektor As Boolean = False)
-        Dim swGvfO As New ClassStopwatch("GetValueFromOracleDb")
-        _SQL = selectAnweisung
-        'MsgBox(selectAnweisung)
-        _Logger.Debug("GetValueFromOracleDb: " & selectAnweisung)
-        Try
-            'die nötigen Variablen definieren
-            Dim result As Object = Nothing
-            'MsgBox("TestM: " & selectAnweisung)
-
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If host <> "" And servicename <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                servicename & ")));User Id=" & User & ";Password=" & pw & ";"
-            Else
-                conn.DataSource = host
-                conn.StatementCacheSize = 1
-                conn.UserID = User
-                conn.Password = pw
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
 
 
-
-            Oracle_Conn = New OracleConnection(connstr)
-
-            Dim Oracle_Command As OracleCommand = Nothing
-            Dim DataAdapter As OracleDataAdapter = Nothing
-
-            Dim DataSet As DataSet = Nothing
-            'ConnectionString.DataSource = datasource
-            'ConnectionString. = User
-            'ConnectionString.Password = pw
-
-
-            ' Verbindung zur Datenbank aufbauen
-            Try
-                _LastStep = "OracleCon wird geöffnet"
-                Oracle_Conn.Open()
-                _LastStep = "OracleCon.State: " & Oracle_Conn.State.ToString
-            Catch ex As Exception
-                _Logger.Error(ex)
-
-                ' DB-Connection schliessen
-                Me.CloseOracleDb(Oracle_Conn)
-                Return Nothing
-            End Try
-
-
-            ' SQL-Abfrage definieren
-            Try
-                Oracle_Command = New OracleCommand(selectAnweisung, Oracle_Conn) 'OracleCommand(selectAnweisung, Connection)
-                Oracle_Command.AddToStatementCache = True
-                _LastStep = "ORACLE Command definiert"
-            Catch ex As Exception
-                _Logger.Error(ex)
-
-                ' DB-Connection schliessen
-                Me.CloseOracleDb(Oracle_Conn)
-                Return Nothing
-            End Try
-
-            ' *** ÜBER EIN DATASET ***
-            If Command() IsNot Nothing Then
-                Try
-                    'Datenadapter laden
-                    DataAdapter = New OracleDataAdapter(Oracle_Command) 'OracleDataAdapter(Command)
-
-                    ' DataSet erzeugen
-                    DataSet = New DataSet()
-                    ' DataSet mit Daten füllen
-                    Dim count As Integer = 0
-                    _LastStep = "Ausführung ORACLE DataAdapter......"
-                    DataAdapter.Fill(DataSet)
-                    _LastStep = "ORACLE DataAdapter ausgeführt"
-                    'Do While DataAdapter.Fill(DataSet)
-                    '    count += 1
-                    '    If count > 2000 Then
-                    '        _Logger.Debug(">> ORACLE DataAdapter > 2000")
-                    '        _Logger.Debug(">> DataAdapter.Requery = " & DataAdapter.Requery.ToString)
-                    '        _Logger.Info(sw.Done())
-                    '        Return Nothing
-                    '    End If
-                    'Loop
-                    'DataAdapter.Fill(DataSet)
-                    Oracle_Conn.Close()
-                    ' DB-Connection schliessen
-                    _LastStep = "DataSet wird durchlaufen"
-                    If DataSet.Tables(0).Rows.Count > 1 Or QuellVektor = True Then
-                        'Beginne mit 0 
-                        Dim Index As Integer = 0
-                        For Each Row As DataRow In DataSet.Tables(0).Rows
-                            Dim Row1 As DataRow
-                            Row1 = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
-                            'filling the row with values. Item property is used to set the field value.
-                            Row1.Item("IndexName") = Indexname
-                            Row1.Item("Value") = CStr(Row.Item(0))
-                            myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(Row1)
-                            '                    ds.Tables("TBVEKTOR_ARRAYDataTable").Rows.Add(Temptable.Rows(0))
-                            Index = Index + 1
-                        Next
-                        _LastStep = "DataSet wurde durchlaufen"
-                        Dim msg = swGvfO.Done
-                        If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-                        Return Index
-                    Else
-                        If DataSet.Tables(0).Rows.Count = 1 Then
-                            _LastStep = "Rows.Count = 1"
-                            ' einen einzigen relevanten Wert zurückgeben (sollten keine mehrfachen Einträge auftauchen)
-                            _Logger.Debug("PLSQL-Ergebnis: '" & DataSet.Tables(0).Rows(0).Item(0) & "'")
-                            ' MsgBox("TestM: Wert: " & DataSet.Tables(0).Rows(0).Item(0).ToString)
-                            Dim msg = swGvfO.Done
-                            If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-                            Return DataSet.Tables(0).Rows(0).Item(0)
-                        Else
-                            _LastStep = "Rows.Count = 0"
-                            'If My.Settings.vLogErrorsonly = False Then _Logger.Info("Dataadapter Rows count = 0")
-                            Dim msg = swGvfO.Done
-                            If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-                            Return Nothing
-                        End If
-                    End If
-                Catch ex As Exception
-                    ' bei einem Fehler einen Eintrag in der Logdatei erzeugen
-                    _Logger.Error(ex)
-                    _Logger.Warn($"Unexpected error in GetValueFromOracleDB - Oracle-Command: {selectAnweisung}")
-                    ' DB-Connection schliessen
-                    Oracle_Conn.Close()
-                    Dim msg = swGvfO.Done
-                    If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-                    Return Nothing
-                End Try
-
-            Else
-                ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte
-                ' Eintrag in Logdatei machen
-                _Logger.Warn("ClassNIDatenbankzugriff.GetValueFromOracleDb", "SQL-Anweisung ist ungültig. Command-Objekt konnte nicht erstellt werden. (SQL: " & selectAnweisung & ")")
-                Dim msg = swGvfO.Done
-                If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-                Return Nothing
-            End If
-
-
-        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn($"Unexpected error in GetValueFromOracleDB: [{ex.Message}] -Oracle-Command: " & selectAnweisung)
-            ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-            Dim msg = swGvfO.Done
-            If msg <> "" Then _Logger.Debug($"SWResult: {msg}")
-            Return Nothing
-        End Try
-
-    End Function
-    ' führt eine SQL-Anweisung auf der DB aus
-    Public Function ExecuteonOracleDb(Profilname As String, ByVal plsqlcommand As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String)
-        Try
-            ' die nötigen Variablen definieren
-            Dim result As Object = Nothing
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If host <> "" And servicename <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                servicename & ")));User Id=" & User & ";Password=" & pw & ";"
-            Else
-                conn.DataSource = host
-                conn.UserID = User
-                conn.Password = pw
-                conn.Pooling = True
-                conn.StatementCacheSize = 1
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
-
-
-            Oracle_Conn = New OracleConnection(connstr)
-            Dim Oracle_Command As OracleCommand = Nothing
-            Dim DataAdapter As OracleDataAdapter = Nothing
-
-            ' Verbindung zur Datenbank aufbauen
-            Try
-                Oracle_Conn.Open()
-            Catch ex As Exception
-                _Logger.Error(ex)
-                ' DB-Connection schliessen
-                Me.CloseOracleDb(Oracle_Conn)
-                Return 0
-            End Try
-
-
-            ' SQL-Abfrage definieren
-            Try
-                Oracle_Command = New OracleCommand(plsqlcommand, Oracle_Conn)
-                Oracle_Command.AddToStatementCache = True
-                _Logger.Debug(">> Oracle-Command: " & plsqlcommand)
-            Catch ex As Exception
-                _Logger.Error(ex)
-                ' DB-Connection schliessen
-                Me.CloseOracleDb(Oracle_Conn)
-                Return 0
-            End Try
-
-
-            ' *** Ausführen des Command ***
-            If Command() IsNot Nothing Then
-
-                Try
-                    Oracle_Command.ExecuteNonQuery()
-                    ' DB-Connection schliessen
-                    Me.CloseOracleDb(Oracle_Conn)
-                    Return 1
-
-                Catch ex As Exception
-                    ' bei einem Fehler einen Eintrag in der Logdatei erzeugen
-                    _Logger.Error(ex)
-                    ' DB-Connection schliessen
-                    Me.CloseOracleDb(Oracle_Conn)
-                    Return 0
-                End Try
-
-            Else
-                ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte
-                ' Eintrag in Logdatei machen
-                _Logger.Warn("ClassNIDatenbankzugriff.ExecuteonOracleDb", "SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")")
-                Timer_Stop()
-                Return 0
-            End If
-
-
-        Catch ex As Exception
-            ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-            _Logger.Error(ex)
-            'If My.Settings.vMailsenden = True Then
-            '    email.Send_EMail("Profilname: " & Profilname & "<br>ClassNIDatenbankzugriff.ExecuteonOracleDb - Ein unbekannter Fehler in ExecuteonOracleDb: " & ex.Message)
-            'End If
-            Timer_Stop()
-            Return 0
-        End Try
-
-    End Function
-    Public Function ExecuteonOracleClient(Profilname As String, ByVal plsqlcommand As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String)
-        Try
-            ' die nötigen Variablen definieren
-            Dim result As Object = Nothing
-
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If host <> "" And servicename <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                servicename & ")));User Id=" & User & ";Password=" & pw & ";"
-            Else
-                conn.DataSource = host
-                conn.UserID = User
-                conn.StatementCacheSize = 1
-                conn.Password = pw
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
-            Oracle_Conn = New OracleConnection(conn.ConnectionString)
-            Dim Oracle_Command As OracleCommand = Nothing
-            Dim DataAdapter As OracleDataAdapter = Nothing
-
-            ' Verbindung zur Datenbank aufbauen
-            Try
-                Oracle_Conn.Open()
-            Catch ex As Exception
-                _Logger.Error(ex)
-
-                ' DB-Connection schliessen
-                Oracle_Conn.Close()
-                Timer_Stop()
-                Return 0
-            End Try
-
-
-            ' SQL-Abfrage definieren
-            Try
-                Oracle_Command = New OracleCommand(plsqlcommand, Oracle_Conn)
-                Oracle_Command.AddToStatementCache = True
-                _Logger.Debug(">> Oracle-Command: " & plsqlcommand)
-            Catch ex As Exception
-                _Logger.Error(ex)
-
-                ' DB-Connection schliessen
-                Oracle_Conn.Close()
-                Timer_Stop()
-                Return 0
-            End Try
-
-
-            ' *** Ausführen des Command ***
-            If Command() IsNot Nothing Then
-
-                Try
-                    Oracle_Command.ExecuteNonQuery()
-                    'Dim count = 1
-                    'Do While Oracle_Command.ExecuteNonQuery()
-                    '    count += 1
-                    '    If count > 2000 Then
-                    '        _Logger.Debug(">> Oracle_Command.ExecuteNonQuery > 2000")
-                    '        Oracle_Conn.Close()
-                    '        Timer_Stop()
-                    '        Return 0
-                    '    End If
-                    'Loop
-
-                    ' DB-Connection schliessen
-                    Oracle_Conn.Close()
-                    Timer_Stop()
-                    Return 1
-
-                Catch ex As Exception
-                    ' bei einem Fehler einen Eintrag in der Logdatei erzeugen
-                    _Logger.Error(ex)
-                    ' DB-Connection schliessen
-                    Oracle_Conn.Close()
-                    Timer_Stop()
-                    Return 0
-                End Try
-
-            Else
-                ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte
-                ' Eintrag in Logdatei machen
-                _Logger.Warn("ClassNIDatenbankzugriff.ExecuteonOracleClient", "SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")")
-                Timer_Stop()
-                Return 0
-            End If
-
-
-        Catch ex As Exception
-            ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-            _Logger.Error(ex)
-            Timer_Stop()
-            Return 0
-        End Try
-
-    End Function
     ' Überprüft den Indexwert und gibt 0 oder mehr zurück
-    Public Function CheckIndex_oracle(ByVal _scalar_select As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String)
-        Try
 
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If host <> "" And servicename <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                servicename & ")));User Id=" & User & ";Password=" & pw & ";"
-
-            Else
-                conn.DataSource = host
-                conn.UserID = User
-                conn.Password = pw
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
-            Dim Oracle_Connection As New OracleConnection(connstr)
-
-            Try
-                Oracle_Connection.Open()
-            Catch ex As Exception
-                _Logger.Error(ex)
-                ' DB-Connection schliessen
-                Return 99
-                Oracle_Connection.Close()
-            End Try
-            Dim Command As OracleCommand
-            ' Verbindung zur Datenbank aufbauen
-
-            ' SQL-Abfrage definieren
-
-            Command = New OracleCommand(_scalar_select, Oracle_Connection)
-            Dim ergebnis As String = Command.ExecuteScalar.ToString
-            Return CLng(ergebnis)
-        Catch ex As Exception
-            ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-            _Logger.Error(ex)
-
-            Return 0
-        End Try
-    End Function
     Public Function CheckIndex_mssql(Profilname As String, ByVal scalarselect As String, ByVal datasource As String, ByVal User As String, ByVal pw As String, ByVal myDS As DataSet, ByVal init_Cata As String)
         Try
             Dim Connection As SqlConnection = Nothing
@@ -487,16 +71,7 @@ Public Class ClassNIDatenbankzugriff
         End Try
     End Function
 
-    Private Sub CloseOracleDb(ByRef Connection As OracleConnection) 'OracleConnection)
-        Timer_Stop()
-        ' wenn eine Datenbank-Connection aufgebaut ist
-        If Connection IsNot Nothing Then
-            ' diese schliessen
-            Connection.Close()
-            Connection = Nothing
-        End If
 
-    End Sub
     Private Sub CloseMssqlDb(ByRef Connection As SqlConnection)
         ' wenn eine Datenbank-Connection aufgebaut ist
         If Connection IsNot Nothing Then
@@ -540,7 +115,6 @@ Public Class ClassNIDatenbankzugriff
             Catch ex As Exception
                 _Logger.Error(ex)
 
-                EMAIL_DD.Send_EMail("Profilname: " & Profilname & "<br>ClassNIDatenbankzugriff.GetValueFromMssqlDb - SQL-Abfrage definieren: " & ex.Message, "NIDB_GetValueFromMssqlDb")
 
                 ' DB-Connection schliessen
                 SQLconnect.Close()

ToolCollection/ClassNIEmail.vb

@@ -1,39 +0,0 @@
-Imports System.Net.Mail
-Imports System.IO
-Imports DigitalData.Modules.Logging
-Public Class ClassEmail
-    Private Shared _Logger As DigitalData.Modules.Logging.Logger
-    Public Shared err_message As String
-
-
-    Public Sub New(pLogConf As DigitalData.Modules.Logging.LogConfig)
-        _Logger = pLogConf.GetLogger()
-    End Sub
-    Public Sub Send_EMail(ByVal vBody As String, ByVal pRefString As String)
-        '#### E-MAIL NACHRICHT VERSENDEN
-        Try
-            If My.Settings.vMailRecipient <> "" And My.Settings.vMailsenden = True Then
-                If My.Settings.vMailRecipient.Contains(";") Then
-                    Dim oPROC As String
-                    Dim oBody As String = ""
-                    If My.Settings.vMailBodyPraefix <> String.Empty Then
-                        oBody = My.Settings.vMailBodyPraefix
-                    End If
-                    oBody += "<br>>> machinename: " & Environment.MachineName
-                    oBody += "<br>>> Domain-Name: " & Environment.UserDomainName
-                    oPROC = $"EXEC PREMAIL_NEW_EMAIL {My.Settings.vMailProfilID},'{My.Settings.vMailRecipient}','{My.Settings.vMailSubject}','{oBody}','{pRefString}',9999,8888,'ToolCollection'"
-                    If Not IsNothing(DB_ECM) Then
-                        If DB_ECM.DBInitialized Then
-                            DB_ECM.ExecuteNonQuery(oPROC)
-                        End If
-                    End If
-
-                End If
-            End If
-            '########
-        Catch ex As Exception
-            _Logger.Warn(">> Achtung: Fehler in Mailversand: " & ex.Message)
-        End Try
-    End Sub
-
-End Class

ToolCollection/ClassNIProfil.vb

@@ -67,7 +67,7 @@
 
     Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
-    Private _saved As Boolean
+    Private _saved As Boolean = True
     'Private _config As ClassNachindexierungKonfiguration = New ClassNachindexierungKonfiguration
 
     'Private _xmlConfigFile As String = My.Settings.vConfigDatei
@@ -81,11 +81,11 @@
     ''' <param name="dokumenttyp_string"></param>
     ''' <param name="windreamSuche"></param>
     ''' <remarks></remarks>
-    Sub New(ByVal profilname As String, ByVal dokumenttyp_string As String, ByVal windreamSuche As String, _
-            ByVal NI_Art As String, ByVal xmlEnd As String, ByVal folderxml As String, ByVal delfiles As String, ByVal dbArt As String, ByVal dataSource As String, ByVal userId As String, _
-              ByVal password As String, ByVal initialCatalog As String, ByVal SQLAnweisung As String, ByVal windreamIndex As String, ByVal checkIndexSQL As String, ByVal indexVali As String, ByVal indexFehler As String, _
-              ByVal finalerIndex As String, ByVal aktiv As String, ByVal mrDAIndex As String, ByVal mrKDIndex As String, ByVal move2Folder As String, ByVal intervall As Integer, ByVal lastRun As String, ByVal NB_AD As Boolean, _
-              ByVal getOrdRechte As Boolean, ByVal ordnerType As String, ByVal ordnerType_Eb As String, _
+    Sub New(ByVal profilname As String, ByVal dokumenttyp_string As String, ByVal windreamSuche As String,
+            ByVal NI_Art As String, ByVal xmlEnd As String, ByVal folderxml As String, ByVal delfiles As String, ByVal dbArt As String, ByVal dataSource As String, ByVal userId As String,
+              ByVal password As String, ByVal initialCatalog As String, ByVal SQLAnweisung As String, ByVal windreamIndex As String, ByVal checkIndexSQL As String, ByVal indexVali As String, ByVal indexFehler As String,
+              ByVal finalerIndex As String, ByVal aktiv As String, ByVal mrDAIndex As String, ByVal mrKDIndex As String, ByVal move2Folder As String, ByVal intervall As Integer, ByVal lastRun As String, ByVal NB_AD As Boolean,
+              ByVal getOrdRechte As Boolean, ByVal ordnerType As String, ByVal ordnerType_Eb As String,
                ByVal CreaFolderIndex As String, ByVal CreaFolder_Folder As String, ByVal CreaFolder_move As Boolean)
 
         Me._dokumenttypString = dokumenttyp_string
@@ -177,7 +177,7 @@
 
         Try
             ' wenn das Profil nicht gespeichert ist
-            If Not Me.IsSaved Then
+            If Not Me.GetSaved Then
                 ' wenn ein Profilname für dieses Profil gesetzt ist
                 If Me._profilname IsNot Nothing And Me._originalProfilname IsNot Nothing Then
                     ' XML-Datei initialisieren
@@ -288,7 +288,8 @@
                     ' Profil auf gespeichert setzen
                     Me._saved = True
 
-                    If msg = True And item = "profile" Then MsgBox("Das Profil '" & Me._originalProfilname & "' wurde erfolgreich gespeichert.", MsgBoxStyle.Information, "Profil gespeichert")
+                    'If msg = True And item = "profile" Then MsgBox("Das Profil '" & Me._originalProfilname & "' wurde erfolgreich gespeichert.", MsgBoxStyle.Information, "Profil gespeichert")
+                    If msg = True And item = "profile" Then MsgBox("Änderungen wurden erfolgreich gespeichert.", MsgBoxStyle.Information, "Profil gespeichert")
 
                     Return True
                 Else
@@ -364,34 +365,34 @@
 
     Public ReadOnly Property HasChanges() As Boolean
         Get
-            If Me._profilname = Me._originalProfilname And _
-               Me._windreamSuche = Me._originalWindreamSuche And _
-               Me._NI_ART = Me._originalNI_ART And _
-               Me._xmlEnd = Me._originalxmlEnd And _
-                Me._dbArt = Me._originalDbArt And _
-                Me._initialCatalog = Me._originalInitialCatalog And _
-                Me._dataSource = Me._originalDataSource And _
-                Me._userId = Me._originalUserId And _
-                Me._password = Me._originalPassword And _
-                Me._windreamIndex = Me._originalwindreamIndex And _
-                Me._checkIndexSQL = Me._originalcheckIndexSQL And _
-                Me._indexValidation = Me._originalindexValidation And _
-                Me._indexFehler = Me._originalindexFehler And _
+            If Me._profilname = Me._originalProfilname And
+               Me._windreamSuche = Me._originalWindreamSuche And
+               Me._NI_ART = Me._originalNI_ART And
+               Me._xmlEnd = Me._originalxmlEnd And
+                Me._dbArt = Me._originalDbArt And
+                Me._initialCatalog = Me._originalInitialCatalog And
+                Me._dataSource = Me._originalDataSource And
+                Me._userId = Me._originalUserId And
+                Me._password = Me._originalPassword And
+                Me._windreamIndex = Me._originalwindreamIndex And
+                Me._checkIndexSQL = Me._originalcheckIndexSQL And
+                Me._indexValidation = Me._originalindexValidation And
+                Me._indexFehler = Me._originalindexFehler And
                 Me._finalerIndex = Me._originalfinalerIndex And
-                Me._aktiv = Me._originalaktiv And _
-                Me._MR_IndexDokart = Me._originalMR_IndexDokart And _
-                Me._MR_IndexKunde = Me._originalMR_IndexKunde And _
-                Me._xmlFolder = Me._originalxmlFolder And _
-                Me._delete = Me._originaldelete And _
-                 Me._move2Folder = Me._originalmove2Folder And _
-               Me.Intervall = Me.OriginalIntervall And _
+                Me._aktiv = Me._originalaktiv And
+                Me._MR_IndexDokart = Me._originalMR_IndexDokart And
+                Me._MR_IndexKunde = Me._originalMR_IndexKunde And
+                Me._xmlFolder = Me._originalxmlFolder And
+                Me._delete = Me._originaldelete And
+                 Me._move2Folder = Me._originalmove2Folder And
+               Me.Intervall = Me.OriginalIntervall And
                Me.LastRun = Me.OriginallastRun And
-               Me.NachbearbeitungAD = Me.OriginalNachbearbeitungAD And _
-                Me._GetOrdnerRechte = Me._originalGetOrdnerRechte And _
-                Me._ordnerType = Me._originalordnerType And _
-                 Me._ordnerType_Eb = Me._originalordnerType_Eb And _
-                  Me._CrFolderIndex = _originalCrFolderIndex And _
-                Me._CrFolder_Folder = _originalCrFolder_Folder And _
+               Me.NachbearbeitungAD = Me.OriginalNachbearbeitungAD And
+                Me._GetOrdnerRechte = Me._originalGetOrdnerRechte And
+                Me._ordnerType = Me._originalordnerType And
+                 Me._ordnerType_Eb = Me._originalordnerType_Eb And
+                  Me._CrFolderIndex = _originalCrFolderIndex And
+                Me._CrFolder_Folder = _originalCrFolder_Folder And
                 Me._CrFolder_move = Me._originalCrFolder_move Then
 
                 Return False
@@ -401,12 +402,17 @@
         End Get
     End Property
 
-    Public ReadOnly Property IsSaved() As Boolean
+    Public ReadOnly Property GetSaved() As Boolean
         Get
             Return Me._saved
         End Get
     End Property
 
+    Public ReadOnly Property IsSaved() As Boolean
+        Get
+            Return Me._saved = True
+        End Get
+    End Property
 
     Public Property OriginalProfilname() As String
         Get

ToolCollection/ClassNIProfile.vb

@@ -4,6 +4,8 @@ Public Class ClassNIProfile
     Private Shared _profiles() As ClassNIProfil
     Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Public Shared xmlConfigFile As String
+    Public Shared aktivesProfil As ClassNIProfil
+    Public Shared aktivesProfilAusProfileigenschaften As Boolean = False
 
     Public Shared Sub Init()
         Dim oConfigPath As String = My.Application.Info.DirectoryPath & "\" & My.Settings.vNIConfigDatei
@@ -12,7 +14,6 @@ Public Class ClassNIProfile
         xmlConfigFile = oConfigPath
         ClassNIProfile.LoadFromXmlFile()
         ' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
-        _windream.Init()
     End Sub
     Public Shared Function IsXmlAccessable() As Boolean
         Dim xml As New Xml.XmlDocument
@@ -125,7 +126,7 @@ Public Class ClassNIProfile
                                                                                           xmlProfil.Attributes("NB_AD").Value,
                                                                                           xmlProfil.Attributes("getordneridx").Value,
                                                                                           xmlProfil.Attributes("ordnerType").Value,
-                                                                                           xmlProfil.Attributes("ordnerType_eb").Value,
+                                                                                          xmlProfil.Attributes("ordnerType_eb").Value,
                                                                                           xmlProfil.Attributes("crfolderindex").Value,
                                                                                           xmlProfil.Attributes("crfolder_folder").Value,
                                                                                           xmlProfil.Attributes("crfolder_move").Value)
@@ -349,6 +350,10 @@ Public Class ClassNIProfile
     ' gibt ein einzelnes Profil-Objekt zurück
     Public Shared Function getProfilByName(ByVal profilname As String) As ClassNIProfil
 
+        If _profiles Is Nothing Then
+            Return Nothing
+        End If
+
         ' alle Profile durchlaufen
         For Each profil As ClassNIProfil In _profiles
 

ToolCollection/ClassNIVerknüpfungen.vb

@@ -5,6 +5,7 @@ Public Class ClassNIVerknüpfungen
     Private _parentProfile As ClassNIProfil
     Public Shared xmlNIConfigFile As String
     Public selectedLink As ClassNIVerknüpfung
+    Private _linksSaved As Boolean = True
 
 
     Public Sub New(ByVal profil As ClassNIProfil)
@@ -201,11 +202,17 @@ Public Class ClassNIVerknüpfungen
 
     End Sub
 
+    Public ReadOnly Property GetSaved() As Boolean
+        Get
+            Return Me._linksSaved
+        End Get
+    End Property
 
-
-
-    Private _linksSaved As Boolean = True
-
+    Public ReadOnly Property IsSaved() As Boolean
+        Get
+            Return Me._linksSaved = True
+        End Get
+    End Property
 
     Public Function CountLinks()
         ' Anzahl der Verknüpfungen zurückgeben

ToolCollection/ClassNIWindream.vb

@@ -1,6 +1,9 @@
 Imports WINDREAMLib
 Imports WMOSRCHLib
 Imports DigitalData.Modules.Logging
+Imports System.Reflection
+Imports System.Runtime
+
 Public Class ClassNIWindream
     Inherits ClassWindream_allgemein
     Private Shared _Logger As DigitalData.Modules.Logging.Logger
@@ -174,21 +177,28 @@ Public Class ClassNIWindream
                                 _Logger.Debug("Typ des windream-Indexes: 8204 Integer")
                             Case 8
                                 _Logger.Debug("Typ des windream-Indexes: 8 Vektor Boolean")
+                            Case Else
+                                _Logger.Info($"RunIndexing_Vektor - Invalid type: {vType}")
                         End Select
 
-                        Dim Anzahl As Integer = aValues.Length - 1
+                        Dim oAnzahl_Werte As Integer = aValues.Length - 1
+                        Dim oIndex = 0
+                        For Each aValue As String In aValues
+                            oIndex += 1
+                        Next
+                        _Logger.Debug("RunIndexing_Vektor - oIndex = {0}", oIndex)
                         'Vektorfeld wird mit EINEM Wert gefüllt
-                        If Anzahl = 0 Then
+                        If oAnzahl_Werte = 0 Or oIndex = 1 Then
                             _Logger.Debug("RunIndexing_Vektor: Vektorfeld wird mit EINEM Wert gefüllt ")
                             ReDim myArray(0)
                             myArray(0) = Convert_IndexValue(vType, aValues(0))
                             _Logger.Debug("RunIndexing_Vektor: Konvertierter Wert: " & myArray(0).ToString)
                         Else
-                            _Logger.Debug($"RunIndexing_Vektor: Vektorfeld wird mit MEHREREN Werten [{Anzahl}] gefüllt ")
+                            _Logger.Debug($"RunIndexing_Vektor: Vektorfeld wird mit MEHREREN Werten [{oAnzahl_Werte}] gefüllt ")
                             Dim _value As String
                             Try
                                 'Die Größe des Arrays festlegen
-                                ReDim myArray(Anzahl)
+                                ReDim myArray(oAnzahl_Werte)
                                 Dim i1 As Integer = 0
                                 For Each aValue As String In aValues
                                     _value = aValue
@@ -444,7 +454,7 @@ Public Class ClassNIWindream
                                     vektor = True
                                 Case Else
                                     _Logger.Warn("Typ des windream-Indexes konnte nicht bestimmt werden!")
-                                    _Logger.Debug("Versuch des Auslesens (vType): " & vType)
+                                    _Logger.Info($"RunIndexing - Invalid IndexType: {vType}")
                                     'MsgBox(vType & vbNewLine & CStr(value), MsgBoxStyle.Exclamation, "Marlon-Case Else")
                                     convertValue = ""
                             End Select
@@ -469,7 +479,7 @@ Public Class ClassNIWindream
                                             _Logger.Info("Achtung das Ändern des Indexes: '" & aName & "' ist nicht mehr erlaubt! Bitte überprüfen Sie Ihre Nachindexierungslogik und den Objekttyp.")
                                             oDocument.Save()
                                         Else
-                                            _Logger.Warn("Unvorhergesehener Fehler bei NonVektor-SetVariableValue:")
+                                            _Logger.Warn($"Unvorhergesehener Fehler bei NonVektor-SetVariableValue - Indexname: {aName}")
                                             _Logger.Warn("Fehlermeldung:" & ex.Message)
                                             oDocument.Save()
                                             oDocument.unlock()
@@ -569,99 +579,138 @@ Public Class ClassNIWindream
                                         End If
                                     Else
                                         _Logger.Warn(">> Achtung: Das Profil konnte nicht geladen werden - _selectedProfil is NOTHING")
+                                    End If
+                                Else
+                                    If oAnzahl = 0 Then
+                                        _Logger.Debug($"Vektorfeld wird mit MEHREREN Werten [{oAnzahl}] gefüllt oAnzahl ist aber 0! ")
+                                        Dim oAnzahlCheck As Integer = 0
+                                        For Each DR In DT_VEKTOR.Rows
+                                            If DR.Item("IndexName") = aName.ToString Then
+                                                value = DR.Item("Value")
+                                                oAnzahlCheck += 1
+                                                _Logger.Debug($"Prüfung ob Value kommt: [{value}] ")
                                             End If
-                                        Else
-                                            _Logger.Debug($"Vektorfeld wird mit MEHREREN Werten [{oAnzahl}] gefüllt ")
-                                    ' das ausgewählte Profil in _selectedProfile laden
-                                    _selectedProfil = ClassNIProfile.getProfilByName(Profil)
+                                        Next
+                                        If oAnzahlCheck = 1 Then
+                                            _Logger.Debug($"Vektorfeld wird tatsächlich nur mit einem Wert gefüllt!! ")
+                                            myArray(0) = Convert_IndexValue(vType, value)
+                                            ReDim myArray(0)
+                                            oDocument.SetVariableValue(aName, myArray)
+                                            _Logger.Debug("'SetVariableValue' für VEKTOR nach Anzahl 1 erfolgreich")
 
-                                    'Die Größe des Arrays festlegen
-                                    ReDim myArray(oAnzahl - 1)
-                                    Dim i1 As Integer = 0
-                                    'Die Datatable durchlaufen und Werte für den Index in Array schreiben
-                                    For Each DR In DT_VEKTOR.Rows
-
-                                        If DR.Item("IndexName") = aName.ToString Then
-                                            myArray(i1) = Convert_IndexValue(vType, DR.Item("Value"))
-
-                                            _Logger.Debug("Value (" & i1 & "): '" & DR.Item("Value").ToString & "'")
-                                            i1 = i1 + 1
+                                            'Die Änderungen festsschreiben/speichern
+                                            oDocument.Save()
+                                            _Logger.Debug("Indexierung erfolgreich beendet (Save Anzahl 1 ...")
                                         End If
-                                    Next
-                                    _Logger.Debug("Array wurde erfolgreich erzeugt")
-
-                                    If _selectedProfil Is Nothing = False Then
-                                        Me._selectedProfil._links.selectedLink = Me._selectedProfil._links.getLinkByIndex(aName)
-                                        If Me._selectedProfil._links.selectedLink IsNot Nothing Then
-                                            Dim VektorArray
-                                            Select Case Me._selectedProfil._links.selectedLink.vktins_state
-                                                Case 1
-                                                    _Logger.Debug("vektInsState = '1' - Vektovalues will be replaced")
-                                                    Dim z As Integer = 0
-                                                    Try
-                                                        ReDim VektorArray(myArray.Length)
-                                                    Catch ex As Exception
-                                                        ReDim VektorArray(myArray.Count)
-                                                    End Try
+                                    Else
+                                        _Logger.Debug($"Vektorfeld wird mit MEHREREN Werten [{oAnzahl}] gefüllt ")
 
 
-                                                    For Each oVectValue As Object In myArray
-                                                        If oVectValue Is Nothing = False Then
-                                                            'Das Array anpassen
-                                                            ReDim Preserve VektorArray(z)
 
-                                                            'Den Wert im Array speichern
-                                                            VektorArray(z) = Convert_IndexValue(vType, oVectValue)
+                                        ' das ausgewählte Profil in _selectedProfile laden
+                                        _selectedProfil = ClassNIProfile.getProfilByName(Profil)
 
-                                                            z += 1
-                                                        End If
+                                        'Die Größe des Arrays festlegen
+                                        ReDim myArray(oAnzahl - 1)
+                                        Dim i1 As Integer = 0
+                                        'Die Datatable durchlaufen und Werte für den Index in Array schreiben
+                                        For Each DR In DT_VEKTOR.Rows
+
+                                            If DR.Item("IndexName") = aName.ToString Then
+                                                myArray(i1) = Convert_IndexValue(vType, DR.Item("Value"))
+
+                                                _Logger.Debug("Value (" & i1 & "): '" & DR.Item("Value").ToString & "'")
+                                                i1 = i1 + 1
+                                            End If
+                                        Next
+                                        _Logger.Debug("Array wurde erfolgreich erzeugt")
+
+                                        If _selectedProfil Is Nothing = False Then
+                                            Me._selectedProfil._links.selectedLink = Me._selectedProfil._links.getLinkByIndex(aName)
+                                            If Me._selectedProfil._links.selectedLink IsNot Nothing Then
+                                                Dim VektorArray
+                                                Select Case Me._selectedProfil._links.selectedLink.vktins_state
+                                                    Case 1
+                                                        _Logger.Debug("vektInsState = '1' - Vektovalues will be replaced")
+                                                        Dim z As Integer = 0
+                                                        Try
+                                                            ReDim VektorArray(myArray.Length)
+                                                        Catch ex As Exception
+                                                            ReDim VektorArray(myArray.Count)
+                                                        End Try
+
+
+                                                        For Each oVectValue As Object In myArray
+                                                            If oVectValue Is Nothing = False Then
+                                                                'Das Array anpassen
+                                                                ReDim Preserve VektorArray(z)
+
+                                                                'Den Wert im Array speichern
+                                                                VektorArray(z) = Convert_IndexValue(vType, oVectValue)
+
+                                                                z += 1
+                                                            End If
+                                                        Next
+                                                    Case 2 'Anfügen
+                                                        _Logger.Debug("vektInsState = '2'-638")
+                                                        VektorArray = Return_VektorArray(oDocument, aName, myArray, False, vType)
+                                                    Case 3 'Anfügen mit DuplikatCheck
+                                                        _Logger.Debug("vektInsState = '3'")
+                                                        VektorArray = Return_VektorArray(oDocument, aName, myArray, True, vType)
+                                                End Select
+                                                If VektorArray Is Nothing = False Then
+                                                    Dim oIndex As Integer = 0
+                                                    For Each oStr In VektorArray
+                                                        _Logger.Debug("For Each oStr In VektorArray - Value [{0}]", oStr)
+                                                        oIndex += 1
                                                     Next
-                                                Case 2 'Anfügen
-                                                    _Logger.Debug("vektInsState = '2'-638")
-                                                    VektorArray = Return_VektorArray(oDocument, aName, myArray, False, vType)
-                                                Case 3 'Anfügen mit DuplikatCheck
-                                                    _Logger.Debug("vektInsState = '3'")
-                                                    VektorArray = Return_VektorArray(oDocument, aName, myArray, True, vType)
-                                            End Select
-                                            If VektorArray Is Nothing = False Then
-                                                'Das Array wieder anpassen
-                                                Try
-                                                    ReDim myArray(VektorArray.Length - 1)
-                                                Catch ex As Exception
-                                                    ReDim myArray(VektorArray.count - 1)
-                                                End Try
-                                                Dim oIndex As Integer = 0
-                                                For Each oStr In VektorArray
-                                                    myArray(oIndex) = oStr
-                                                    oIndex += 1
-                                                Next
+                                                    If oIndex = 0 Then
+                                                        _Logger.Debug("VektorArray.length = 0 ... Skipping Redim")
+                                                    Else
+                                                        _Logger.Debug("RunIndexing - Nun nochmal redimensionieren Array für windeam...")
+                                                        'Das Array wieder anpassen
+                                                        Try
+                                                            ReDim myArray(VektorArray.Length - 1)
+                                                        Catch ex As Exception
+                                                            ReDim myArray(VektorArray.count - 1)
+                                                        End Try
+                                                        Dim oIndex1 As Integer = 0
+                                                        For Each oStr In VektorArray
+                                                            myArray(oIndex1) = oStr
+                                                            _Logger.Debug("RunIndexing - Value {0} - [{1}]", oIndex1, oStr)
+                                                            oIndex1 += 1
+                                                        Next
+                                                    End If
 
-                                                'Jetzt die Nachindexierung für Vektor-Felder
-                                                oDocument.SetVariableValue(aName, myArray)
-                                                _Logger.Debug("'SetVariableValue' für VEKTOR erfolgreich")
 
-                                                ' oDocument.LockRights()
+                                                    'Jetzt die Nachindexierung für Vektor-Felder
+                                                    oDocument.SetVariableValue(aName, myArray)
+                                                    _Logger.Debug("'SetVariableValue' für VEKTOR erfolgreich")
+
+                                                    ' oDocument.LockRights()
+
+                                                    'Die Änderungen festsschreiben/speichern
+                                                    oDocument.Save()
+                                                    _Logger.Debug("Indexierung erfolgreich beendet (Save ...")
+                                                Else
+                                                    If My.Settings.vLogErrorsonly = False Then _Logger.Info("Achtung: VektorArray Is NOTHING")
+                                                    oDocument.Save()
+                                                    Return True
+                                                End If
 
-                                                'Die Änderungen festsschreiben/speichern
-                                                oDocument.Save()
-                                                _Logger.Debug("Indexierung erfolgreich beendet (Save ...")
                                             Else
-                                                If My.Settings.vLogErrorsonly = False Then _Logger.Info("Achtung: VektorArray Is NOTHING")
+                                                _Logger.Warn(">> Achtung: Der Link konnte nicht geladen werden - _selectedProfil._links.selectedLink is NOTHING")
                                                 oDocument.Save()
                                                 Return True
                                             End If
-
                                         Else
-                                            _Logger.Warn(">> Achtung: Der Link konnte nicht geladen werden - _selectedProfil._links.selectedLink is NOTHING")
+                                            _Logger.Warn(">> Achtung: Das Profil konnte nicht geladen werden - _selectedProfil is NOTHING")
                                             oDocument.Save()
                                             Return True
                                         End If
-                                    Else
-                                        _Logger.Warn(">> Achtung: Das Profil konnte nicht geladen werden - _selectedProfil is NOTHING")
-                                        oDocument.Save()
-                                        Return True
                                     End If
 
+
                                 End If
 
                             End If
@@ -689,9 +738,6 @@ Public Class ClassNIWindream
                     i1 += 1
                 Next
             End If
-            If My.Settings.vMailsenden = True Then
-                'email.Send_EMail("Fehler bei RunIndexing - Datei: " & oDocument.aName.ToString & "<br>Profilname: " & Profil & "<br>Fehler: " & ex.Message)
-            End If
             oDocument.Save()
             oDocument.unlock()
             Return True
@@ -786,6 +832,7 @@ Public Class ClassNIWindream
                         End If
                     End If
                 Next
+                _Logger.Debug("Vektor-Array wurde erzeugt - Anzahl {0}", oValues.Count)
             End If
 
             Return oValues
@@ -913,9 +960,6 @@ Public Class ClassNIWindream
 
         Catch ex As Exception
             _Logger.Error(ex)
-            If My.Settings.vMailsenden = True Then
-                'email.Send_EMail("Fehler bei SetfinalIndex - Datei: " & oDocument.aName.ToString & " - Fehler: " & ex.Message)
-            End If
             oDocument.Save()
             oDocument.unlock()
         End Try
@@ -929,12 +973,13 @@ Public Class ClassNIWindream
         wdfLocation = wdfLocation.Replace("W:", "\\windream\objects")
         wdfLocation = wdfLocation.Replace("X:", "\\windream\objects")
         wdfLocation = wdfLocation.Replace("U:", "\\windream\objects")
+        _Logger.Debug(String.Format("Starting up GetSearchDocuments ..."))
         If System.IO.File.Exists(wdfLocation) Then
             Try
                 Dim ProfileName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1)
                 Dim ProfilePath = wdfLocation.Substring(0, wdfLocation.Length - ProfileName.Length)
 
-
+                _Logger.Debug(String.Format("WM Search exists ..."))
 
                 Me.oController.CheckSearchProfile(wdfLocation.ToLower)
                 Dim suchTyp = Me.oController.SearchProfileTargetProgID
@@ -949,9 +994,6 @@ Public Class ClassNIWindream
                 ''  Der öffentliche Member CheckSearchProfile für den Typ IWMQuickSearch7 wurde nicht gefunden. [Microsoft.VisualBasic] => GetSearchDocuments()
                 Select Case suchTyp.ToString.ToUpper
                     Case "WMOSRCH.WMQUICKSEARCH"
-                        'srchQuick.WMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer)
-
-                        'Me.oConnect.LoginSession(oWMSession) 'srchQuick.WMSession)
 
                         srchQuick.ClearSearch()
                         srchQuick.SearchProfilePath = ProfilePath
@@ -960,8 +1002,7 @@ Public Class ClassNIWindream
                         oSearch = srchQuick.GetSearch()
 
                     Case "WMOSRCH.WMINDEXSEARCH"
-                        srchIndex.WMSession = oWMSession 'CreateObject("Windream.WMSession", Me.GetCurrentServer)
-
+                        srchIndex.WMSession = oWMSession
                         'Me.oConnect.LoginSession(srchIndex.WMSession)
 
                         srchIndex.ClearSearch()
@@ -971,7 +1012,7 @@ Public Class ClassNIWindream
                         oSearch = srchIndex.GetSearch()
 
                     Case "WMOSRCH.WMOBJECTTYPESEARCH"
-                        srchObjectType.WMSession = oWMSession 'CreateObject("Windream.WMSession", Me.GetCurrentServer)
+                        srchObjectType.WMSession = oWMSession
 
                         'Me.oConnect.LoginSession(oWMSession) 'srchObjectType.WMSession)
 
@@ -997,7 +1038,10 @@ Public Class ClassNIWindream
             End Try
         Else
             If wdfLocation.ToUpper.Contains("SELECT") Or wdfLocation.ToUpper.Contains("EXEC") Then
+                _Logger.Info("WMSearch replaced with SQL Command ...:")
                 WMSearchIsSQL = True
+            Else
+                _Logger.Info(String.Format("WMSearch [{0}] was not found or is not accessible!", wdfLocation))
             End If
         End If
 
@@ -1023,26 +1067,33 @@ Public Class ClassNIWindream
     Public Function NEW_MOVE_FILE(targetpath As String, sourcepath As String, oMethod As String, pFileName As String) As Boolean
         Dim oWMFile As WINDREAMLib.WMObject
         Try
+            sourcepath = sourcepath.ToLower
+            targetpath = targetpath.ToLower
+            If IsNothing(oWMSession) Then
+                _Logger.Warn($"Error in NEW_MOVE_FILE -  oWMSession is nothing")
+                Return False
+            End If
             _Logger.Debug($"targetpath ({targetpath})")
             _Logger.Debug($"sourcepath ({sourcepath})")
 
 
             Dim sw As New ClassStopwatch("NEW_MOVE_FILE")
             Dim oTargetpath = System.IO.Path.GetDirectoryName(targetpath)
-            oTargetpath = oTargetpath.Replace("\\windream\objects", "")
-            oTargetpath = oTargetpath.Replace("W:\", "\")
+            oTargetpath = oTargetpath.Replace("windream\objects", "")
+            oTargetpath = oTargetpath.Replace("w:\", "\")
 
 
-            targetpath = targetpath.Replace("\\windream\objects", "")
-            targetpath = targetpath.Replace("W:\", "\")
+            targetpath = targetpath.Replace("windream\objects", "")
+            targetpath = targetpath.Replace("w:\", "\")
+
+            sourcepath = sourcepath.Replace("w:\", "\")
+            sourcepath = sourcepath.Replace("windream\objects", "")
+            sourcepath = sourcepath.Replace("\\", "\")
 
-            sourcepath = sourcepath.Replace("\\windream\objects", "")
-            sourcepath = sourcepath.Replace("W:\", "\")
             targetpath = targetpath.Replace("\\", "\")
             Const WMEntityDocument = 1
-            Dim IndexwertAusWindream As Object = Nothing
 
-            _Logger.Debug($"NEW_MOVE_FILE getting WMObject for: {sourcepath}")
+            _Logger.Debug($"getting WMObject for: {sourcepath}")
             Try
                 oWMFile = oWMSession.GetWMObjectByPath(WMEntityDocument, sourcepath)
             Catch ex As Exception

ToolCollection/ClassPasswordCrypto.vb

@@ -1,34 +1,26 @@
-Imports System.Text
-Imports System.Security.Cryptography
-Imports System.Collections.ObjectModel
+Imports System.Security.Cryptography
+Imports System.Text
 
-Public Class ClassLicenseManager
+Public Class ClassPasswordCrypto
 
     Private _password As String
-    Private _key As String
-    Public Shared _licenses As ClassLicenses
 
-    Public licenseString As String
-    Public licenseStringArray(,) As String
+    ' ++++++++++++++++++++++++++++++++++++++++++++++ Properties ++++++++++++++++++++++++++++++++++++++++++++++
 
+    ''' <summary>
+    ''' Liefert das Passwort zum Entschlüsseln des Lizenzschlüssels
+    ''' </summary>
+    ''' <value></value>
+    ''' <returns></returns>
+    ''' <remarks></remarks>
+    Public ReadOnly Property Password() As String
+        Get
+            Return Me._password
+        End Get
+    End Property
 
     ' ++++++++++++++++++++++++++++++++++++++++++++++ Methoden ++++++++++++++++++++++++++++++++++++++++++++++
 
-    ''' <summary>
-    ''' Konstruktor für den Lizenz-Manager
-    ''' </summary>
-    ''' <param name="password">Passwort zum Entschlüsseln des Lizenzkeys</param>
-    ''' <param name="key">verschlüsselter Lizenzkey</param>
-    ''' <remarks></remarks>
-    Sub New(ByVal password As String, ByVal key As String)
-        Me._password = password
-        Me._key = key
-
-        Me.licenseString = Me.DecodeLicenseKey(Me._key)
-        Me.licenseStringArray = Me.SplitLicenseString(Me.licenseString)
-
-        Me.LoadLicenses()
-    End Sub
     ''' <summary>
     ''' Konstruktor für den Lizenz-Manager ohne License load
     ''' </summary>
@@ -37,14 +29,6 @@ Public Class ClassLicenseManager
     Sub New(ByVal password As String)
         Me._password = password
     End Sub
-    ''' <summary>
-    ''' Lädt alle Lizenzen aus dem Lizenz-Array
-    ''' </summary>
-    ''' <remarks></remarks>
-    Public Sub LoadLicenses()
-        ClassLicenseManager._licenses = New ClassLicenses(Me.licenseStringArray)
-    End Sub
-
 
     ''' <summary>
     ''' Codiert eine Zeichenkette
@@ -53,7 +37,7 @@ Public Class ClassLicenseManager
     ''' <param name="password">das zur Verschlüsselung verwendete Passwort</param>
     ''' <returns>liefert eine verschlüsselte Zeichenkette</returns>
     ''' <remarks></remarks>
-    Public Function EncodeLicenseKey(ByVal str As String, ByVal password As String)
+    Public Function EncodePassword(ByVal str As String, ByVal password As String)
         Dim rd As New RijndaelManaged
 
         Dim md5 As New MD5CryptoServiceProvider
@@ -69,7 +53,7 @@ Public Class ClassLicenseManager
         ms.Write(iv, 0, iv.Length)
 
         Dim cs As New CryptoStream(ms, rd.CreateEncryptor, CryptoStreamMode.Write)
-        Dim data() As Byte = System.Text.Encoding.UTF8.GetBytes(Str)
+        Dim data() As Byte = System.Text.Encoding.UTF8.GetBytes(str)
 
         cs.Write(data, 0, data.Length)
         cs.FlushFinalBlock()
@@ -82,14 +66,13 @@ Public Class ClassLicenseManager
         Return result
     End Function
 
-
     ''' <summary>
     ''' Decodiert den verschlüsselten Lizenzkey
     ''' </summary>
     ''' <param name="licenseCodeStr">verschlüsselter Lizenzkey</param>
     ''' <returns></returns>
     ''' <remarks></remarks>
-    Public Function DecodeLicenseKey(ByVal licenseCodeStr As String)
+    Public Function DecodePassword(ByVal licenseCodeStr As String)
         Try
             Dim rd As New RijndaelManaged
             Dim rijndaelIvLength As Integer = 16
@@ -121,7 +104,6 @@ Public Class ClassLicenseManager
 
             Dim i As Integer = 0
 
-
             Try
 
                 i = cs.Read(data, 0, data.Length)
@@ -143,95 +125,4 @@ Public Class ClassLicenseManager
         Return Nothing
     End Function
 
-
-    ''' <summary>
-    ''' Zerlegt den entschlüsselten Lizenzkey
-    ''' </summary>
-    ''' <param name="licenseStr">entschlüsselter Lizenzkey</param>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Function SplitLicenseString(ByVal licenseStr As String) As String(,)
-
-        Try
-            If licenseStr IsNot Nothing Then
-                Dim licenseTemp() As String = licenseStr.Split(";")
-
-                Dim licenses(licenseTemp.Length, 3) As String
-
-                Dim i As Integer = 0
-
-                If licenseTemp IsNot Nothing Then
-                    For Each lizenz As String In licenseTemp
-
-                        Dim temp() = lizenz.Split(":")
-
-                        licenses(i, 0) = temp(0)
-                        licenses(i, 1) = temp(1)
-                        If temp.Length > 2 Then
-                            licenses(i, 2) = temp(2)
-                            licenses(i, 3) = temp(3)
-                            Dim expires As Date
-                            Date.TryParse(licenses(i, 1), expires)
-                        End If
-                        
-                       
-                        i += 1
-                    Next
-
-                    Return licenses
-                End If
-            End If
-        Catch ex As Exception
-            MsgBox("Fehler in SplitLicenseString: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-
-        Return Nothing
-
-    End Function
-
-
-
-    ' ++++++++++++++++++++++++++++++++++++++++++++++ Properties ++++++++++++++++++++++++++++++++++++++++++++++
-
-    ''' <summary>
-    ''' Liefert das Passwort zum Entschlüsseln des Lizenzschlüssels
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public ReadOnly Property Password() As String
-        Get
-            Return Me._password
-        End Get
-    End Property
-
-
-    ''' <summary>
-    ''' Liefert eine Sammlung von Lizenzobjekten
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public ReadOnly Property Licenses() As ClassLicenses
-        Get
-            Return ClassLicenseManager._licenses
-        End Get
-    End Property
-
-
-    ''' <summary>
-    ''' Liefert oder setzt den Lizenzschlüssel
-    ''' </summary>
-    ''' <value></value>
-    ''' <returns></returns>
-    ''' <remarks></remarks>
-    Public Property Key() As String
-        Get
-            Return Me._key
-        End Get
-        Set(ByVal value As String)
-            Me._key = value
-        End Set
-    End Property
-
 End Class

ToolCollection/ClassWD_Rechte.vb

@@ -63,6 +63,8 @@ Public Class ClassWD_Rechte
                 oServername = Me.GetCurrentServer()
                 ' Connection-Objekt instanziieren
                 Me.oConnect = CreateObject("Windream.WMConnect")
+
+
                 'MsgBox("windrem init 'ed")
 
             Catch ex As Exception
@@ -391,13 +393,13 @@ Public Class ClassWD_Rechte
     End Function
     Private Function WorkRight(_methode As String, createdFolder As String, _form As Boolean, oWMObject As WINDREAMLib.WMObject, deleteRights As Boolean, folgeRegel As Boolean, _UserOrGroup As String,
                                _GruppenUserRecht As String, _lRight As Integer) As Boolean
+        Dim Object2Change As WINDREAMLib.WMObject = Nothing
         Try
             Dim _Erfolgreich As Boolean = True
             Dim UserGroupRelation
             Dim UserOrGroup
             Dim oGroup
             Dim oUSer
-            Dim Object2Change As WINDREAMLib.WMObject
             If _methode = "AddRightFolder" Then
                 Object2Change = oWMObject.aParentWMObject
             ElseIf _methode = "AddRightCreatedFolder" Then
@@ -729,6 +731,13 @@ Public Class ClassWD_Rechte
             Return _Erfolgreich
         Catch ex As Exception
             _Logger.Error(ex)
+            Try
+                If Object2Change IsNot Nothing AndAlso Object2Change.aLocked Then
+                    Object2Change.unlock()
+                    _Logger.Debug("WorkRight Catch: Object2Change unlocked after error.")
+                End If
+            Catch
+            End Try
             Return False
         End Try
     End Function

ToolCollection/ClassWindream_allgemein.vb

@@ -49,7 +49,84 @@ Public Class ClassWindream_allgemein
             ' Process.GetCurrentProcess.Kill()
         End If
     End Sub
+    Private Sub LogoutCurrentSession()
+        If Not IsNothing(CURRENToWMSession) Then
+            Try
+                CURRENToWMSession.Logout()
+            Catch
+                ' ignorieren – Session war evtl. schon tot
+            End Try
+            CURRENToWMSession = Nothing
+        End If
+    End Sub
 
+    Public Function GetWMSessionAsUser(Domain, ServerName, UserName, Password)
+        LogoutCurrentSession()
+
+        Dim SessionAsUser
+        Dim aConnect, aUserId, aSession
+        On Error Resume Next
+
+        ' Hilfsobjekte erschaffen, um eine Verbindung zum windream Server herzustellen
+        ' mit der gewünschten Benutzer-Identität
+        aConnect = CreateObject("Windream.WMConnect")
+        'Bei einer impersonifizierten Session ist zu beachten, dass die ModuleID 9 zu nutzen ist. 
+        'Wird keine Session-ID angegeben, hat die Session die ID 0 (‚Default‘).
+        aConnect.ModuleId = 9
+        If Err.Number <> 0 Then
+            Dim msg = "Fehler bei CreateObject (aConnect) - Err.Number: " & Err.Number & vbNewLine & Err.Description
+            _Logger.Warn(msg)
+            SessionAsUser = Nothing
+            Return SessionAsUser
+        End If
+
+        aUserId = CreateObject("WMOTool.WMUserIdentity")
+        If Err.Number <> 0 Then
+            Dim msg = "Fehler bei CreateObject('WMOTool.WMUserIdentity') - Err.Number: " & Err.Number & vbNewLine & Err.Description
+
+            _Logger.Warn(msg)
+
+            SessionAsUser = Nothing
+            Return SessionAsUser
+        End If
+
+        aUserId.aDomain = Domain
+        aUserId.aServerName = ServerName
+        aUserId.aUserName = UserName
+        aUserId.aPassword = Password
+
+        aSession = aConnect.Login(aUserId)
+
+
+        If Err.Number <> 0 Then
+            Dim msg = "Fehler bei aConnect.Login(aUserId) - Err.Number: " & Err.Number & vbNewLine & Err.Description
+            _Logger.Warn(msg)
+
+            SessionAsUser = Nothing
+            Return SessionAsUser
+        Else
+            SessionAsUser = aSession
+            If aSession.aLoggedin = True Then
+                _Logger.Debug($"#Impersonate login [{UserName}] successfull!")
+                Me.oWMSession = aSession
+                CURRENToWMSession = aSession
+                CURRENToWMSession_Created = Now
+                Me.oObjekttypen = aSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+                If Err.Number <> 0 Then
+                    _Logger.Warn("Fehler beim Laden der Objekttypen nach Impersonate-Login: " & Err.Description)
+                    Err.Clear()
+                End If
+                Me.oOrdnerTypen = aSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
+                If Err.Number <> 0 Then
+                    _Logger.Warn("Fehler beim Laden der Ordnertypen nach Impersonate-Login: " & Err.Description)
+                    Err.Clear()
+                End If
+                Return True
+            End If
+
+        End If
+        Return False
+    End Function
 
     ''' <summary>
     ''' Initialisiert die statische Klasse (Login, Session starten, usw.)
@@ -57,111 +134,118 @@ Public Class ClassWindream_allgemein
     ''' <returns>Liefert True wenn das Anmelden erfolgreich war, sonst False</returns>
     ''' <remarks></remarks>
     Public Function Init() As Boolean
-        Dim oHourDifference As Integer
-        oHourDifference = CInt(DateDiff(DateInterval.Hour, CURRENToWMSession_Created, Now))
-
-
-
-        If IsNothing(CURRENToWMSession) Or oHourDifference >= 2 Then
-            Try
-
-                Try
-                    ' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
-                    Me.oWMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer)
-                    ' Connection-Objekt instanziieren
-                    Me.oConnect = CreateObject("Windream.WMConnect")
-                    CURRENToWMConnect = oConnect
-                    'MsgBox("windrem init 'ed")
-                Catch ex As Exception
-                    clsHelper.Add_Application_log("Unexpected error in Windream.Init(CreateObjects): " & ex.Message)
-                    EMAIL_DD.Send_EMail("Unexpected error in Windream.Init(CreateObjects): " & ex.Message, "WMInit77")
-                    Return False
-                End Try
-
-
-                ' wenn windream nicht angemeldet ist
-                If Not Me.IsLoggedIn Then
-
-                    ' Art der Anmeldung an windream festlegen
-                    '   0x0L (also 0)                   = Standard windream Benutzer
-                    '   WM_MODULE_ID_DOCTYPEEDITOR_LIC  = ermöglicht Zugriff auf die windream Management Funktionen (Z.B. zur Verwaltung der windream Dokumententypen, Auswahllisten, etc.)
-                    '   WM_MODULE_ID_INDEXSERVICE       = ermöglicht der Session die Indexierungs-Events vom windream DMS-Service zu empfangen
-                    Me.oConnect.ModuleID = 0
-
-                    ' setzt die minimal erwartete windream-Version 
-                    Me.oConnect.MinReqVersion = "3"
-
-                    ' -- Impersonifizierung nur möglich mit registry-eintrag --
-                    'oConnect.UserName = "\digitaldata\schreiberm"
-                    'oConnect.Password = "schreiber"
-
-                    ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
-                    Me.oConnect.LoginSession(Me.oWMSession)
-
-                    If Me.oWMSession.aLoggedin = False Then
-                        clsHelper.Add_Application_log("Unexpected error in Windream.Init(oSession.aloggedIn): Could not check session-state")
-                        EMAIL_DD.Send_EMail("Unexpected error in Windream.Init(oSession.aloggedIn): Could not check session-state", "clswmallgInit")
-                        Return False
-                    End If
-
-                    ' AUSGABE VON SYSTEMINFORMATIONEN
-                    ' Gibt die Versionsart (Lizenztyp) also Small-Business-Edition (SBE), Small-Business-Extension (SBX) 
-                    ' oder Business-Edition (BE) aus
-                    'MsgBox("WindreamVersion: " & oSession.GetSystemInfo("WindreamVersion") & vbNewLine & "LicenceKey: " & oSession.GetSystemInfo("LicenceKey") & vbNewLine & _
-                    '       vbNewLine & "LicenceName: " & oSession.GetSystemInfo("LicenceName"))
-
-                    'Dim WMCtrl As AISCONTROLDATACOMLib.AISControlData
-                    'WMCtrl = New AISCONTROLDATACOMLib.AISControlData
-
-                    '' liefert die Versionsnummer des Clients
-                    'MsgBox(WMCtrl.WMWorkstationBuildNo)
-                    'MsgBox(WMCtrl.W
-                    '' liefert den Servernamen des angemeldeten windreams
-                    'MsgBox(WMCtrl.WMServerName)
-
-                    Try
-                        Me.oWMSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
-                        ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine 
-                        ' Ordnertypen ausgelesen werden
-                        Me.oObjekttypen = Me.oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
-                        ' Ordnertypen auslesen
-                        Me.oOrdnerTypen = Me.oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
-                        ' den Objekttyp laden
-                        ' Me.oSystemIndizes = Me.oSession.GetWMObjectByName(WMObjectRelationTypeObjectByName)
-                    Catch ex As Exception
-                        Return False
-                    End Try
-
-                End If
-                _Logger.Info("WMSession has been created! (clsWindreamAllgemein)")
-                CURRENToWMSession = oWMSession
-                CURRENToWMSession_Created = Now
-                Return True
-
-            Catch ex As Exception
-                If Err.Number = -2147220985 Then
-                    clsHelper.Add_Application_log("Unexpected error in Windream.Init(2147220985): " & ex.Message)
-
-                Else
-                    If Not ex.Message.Contains("Already logged in") Then
-                        clsHelper.Add_Application_log("Unexpected error in Windream.Init(Already logged in): " & ex.Message)
-                        EMAIL_DD.Send_EMail("Unexpected error in Windream.Init(Already logged in): " & ex.Message, "clswmallgInit2")
-                    Else
-                        Return True
-                    End If
-                End If
-                Return False
-            End Try
 
+        If IsNothing(CURRENToWMSession) OrElse Not CBool(CURRENToWMSession.aLoggedin) Then
+            If WMLOGIN_DOMAIN <> String.Empty Then
+                Return GetWMSessionAsUser(WMLOGIN_DOMAIN, Me.GetCurrentServer, WMLOGIN_USER, WMLOGIN_PW)
+            Else
+                Return GetWMSession()
+            End If
 
         Else
             If My.Settings.vLogErrorsonly = False Then _Logger.Debug("WMSession already created!")
             oWMSession = CURRENToWMSession
+            If IsNothing(oObjekttypen) Then
+                oObjekttypen = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+            End If
+            If IsNothing(oOrdnerTypen) Then
+                oOrdnerTypen = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
+            End If
             Return True
         End If
 
-
     End Function
+    Private Function GetWMSession()
+        LogoutCurrentSession()
+
+        Try
+            Try
+                ' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
+                Me.oWMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer)
+                ' Connection-Objekt instanziieren
+                Me.oConnect = CreateObject("Windream.WMConnect")
+                CURRENToWMConnect = oConnect
+                'MsgBox("windrem init 'ed")
+            Catch ex As Exception
+                clsHelper.Add_Application_log("Unexpected error in Windream.Init(CreateObjects): " & ex.Message)
+                Return False
+            End Try
+
+
+            ' wenn windream nicht angemeldet ist
+            If Not Me.IsLoggedIn Then
+
+                ' Art der Anmeldung an windream festlegen
+                '   0x0L (also 0)                   = Standard windream Benutzer
+                '   WM_MODULE_ID_DOCTYPEEDITOR_LIC  = ermöglicht Zugriff auf die windream Management Funktionen (Z.B. zur Verwaltung der windream Dokumententypen, Auswahllisten, etc.)
+                '   WM_MODULE_ID_INDEXSERVICE       = ermöglicht der Session die Indexierungs-Events vom windream DMS-Service zu empfangen
+                Me.oConnect.ModuleID = 0
+
+                ' setzt die minimal erwartete windream-Version 
+                Me.oConnect.MinReqVersion = "3"
+
+                ' -- Impersonifizierung nur möglich mit registry-eintrag --
+                'oConnect.UserName = "\digitaldata\schreiberm"
+                'oConnect.Password = "schreiber"
+
+                ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
+                Me.oConnect.LoginSession(Me.oWMSession)
+
+                If Me.oWMSession.aLoggedin = False Then
+                    clsHelper.Add_Application_log("Unexpected error in Windream.Init(oSession.aloggedIn): Could not check session-state")
+
+                    Return False
+                End If
+
+                ' AUSGABE VON SYSTEMINFORMATIONEN
+                ' Gibt die Versionsart (Lizenztyp) also Small-Business-Edition (SBE), Small-Business-Extension (SBX) 
+                ' oder Business-Edition (BE) aus
+                'MsgBox("WindreamVersion: " & oSession.GetSystemInfo("WindreamVersion") & vbNewLine & "LicenceKey: " & oSession.GetSystemInfo("LicenceKey") & vbNewLine & _
+                '       vbNewLine & "LicenceName: " & oSession.GetSystemInfo("LicenceName"))
+
+                'Dim WMCtrl As AISCONTROLDATACOMLib.AISControlData
+                'WMCtrl = New AISCONTROLDATACOMLib.AISControlData
+
+                '' liefert die Versionsnummer des Clients
+                'MsgBox(WMCtrl.WMWorkstationBuildNo)
+                'MsgBox(WMCtrl.W
+                '' liefert den Servernamen des angemeldeten windreams
+                'MsgBox(WMCtrl.WMServerName)
+
+                Try
+                    Me.oWMSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
+                    ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine 
+                    ' Ordnertypen ausgelesen werden
+                    Me.oObjekttypen = Me.oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+                    ' Ordnertypen auslesen
+                    Me.oOrdnerTypen = Me.oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
+                    ' den Objekttyp laden
+                    ' Me.oSystemIndizes = Me.oSession.GetWMObjectByName(WMObjectRelationTypeObjectByName)
+                Catch ex As Exception
+                    Return False
+                End Try
+
+            End If
+            _Logger.Info("WMSession has been created! (clsWindreamAllgemein)")
+            CURRENToWMSession = oWMSession
+            CURRENToWMSession_Created = Now
+            Return True
+
+        Catch ex As Exception
+            If Err.Number = -2147220985 Then
+                clsHelper.Add_Application_log("Unexpected error in Windream.Init(2147220985): " & ex.Message)
+
+            Else
+                If Not ex.Message.Contains("Already logged in") Then
+                    clsHelper.Add_Application_log("Unexpected error in Windream.Init(Already logged in): " & ex.Message)
+                Else
+                    Return True
+                End If
+            End If
+            Return False
+        End Try
+    End Function
+
 #End Region
 
 #Region "+++++ Funktionen die für den Objekttyp relevate Informationen zurückliefern +++++"
@@ -309,7 +393,7 @@ Public Class ClassWindream_allgemein
             Dim oIndexAttributes As WMObjectRelation
             Dim oIndexAttribute As WMObject
             Dim oIndex As WMObject
-            Dim oRelProperties As WMObjectRelationClass
+            Dim oRelProperties As Object
 
             ' den Objekttyp laden
             oObjectType = Me.oWMSession.GetWMObjectByName(WMEntityObjectType, name)
@@ -367,7 +451,7 @@ Public Class ClassWindream_allgemein
             Dim oIndexAttributes As WMObjectRelation
             Dim oIndexAttribute As WMObject
             Dim oIndex As WMObject
-            Dim oRelProperties As WMObjectRelationClass
+            Dim oRelProperties As Object
             For Each OrdnerType In Me.oOrdnerTypen
                 If OrdnerType.aName = Ordnertyp Then
                     oOrdnerType = OrdnerType
@@ -478,6 +562,9 @@ Public Class ClassWindream_allgemein
     ''' <remarks></remarks>
     Public Function IsLoggedIn() As Boolean
         Try
+            If IsNothing(Me.oWMSession) Then
+                Return False
+            End If
             Return Me.oWMSession.aLoggedin
         Catch ex As Exception
             clsHelper.Add_Application_log("Unexpected error in Windream.IsLoggedIn: " & ex.Message)
@@ -498,7 +585,6 @@ Public Class ClassWindream_allgemein
             Return server 'ClassWindream.oBrowser.GetCurrentServer
         Catch ex As Exception
             clsHelper.Add_Application_log("Unexpected error in Windream.GetCurrentServer: " & ex.Message)
-            EMAIL_DD.Send_EMail("Unexpected error in Windream.GetCurrentServer: " & ex.Message, "GetCurrentServer")
             'MsgBox("Der aktuell gewählte windream-Server konnte nicht ausgelesen werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen des windream-Servers")
         End Try
 

ToolCollection/ModuleCURRENT.vb

@@ -6,6 +6,9 @@ Module ModuleCURRENT
 
     Public NI_OPENED As Boolean = False
 
+    Public AUTOSTART_FIM As Boolean = False
+    Public AUTOSTART_FIH As Boolean = False
+
     Public CURRENT_STATE As String = ""
 
     Public DI_PAGECOUNT As Integer
@@ -32,6 +35,9 @@ Module ModuleCURRENT
     Public CURRENT_DOCID As Int64
     Public WMSearchIsSQL As Boolean = False
     Public DB_ECM As MSSQLServer
-    Public EMAIL_DD As ClassEmail
-
+    Public DIDurchlaufRunning As Boolean = False
+    Public NIDurchlaufRunning As Boolean = False
+    Public WMLOGIN_USER As String = ""
+    Public WMLOGIN_PW As String = ""
+    Public WMLOGIN_DOMAIN As String = ""
 End Module

ToolCollection/ModuleSettings.vb

@@ -1,4 +1,3 @@
 Module ModuleSettings
-    Public LICENSE_MoveRename As Boolean
-    Public LICENSE_AD As Boolean
+
 End Module

ToolCollection/My Project/AssemblyInfo.vb

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("ToolCollection")>
-<Assembly: AssemblyCopyright("Copyright © Digital Data 2019")>
+<Assembly: AssemblyCopyright("Copyright © Digital Data 2025")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.9.5.0")>
-<Assembly: AssemblyFileVersion("2.9.5.0")>
+<Assembly: AssemblyVersion("2.10.4.0")>
+<Assembly: AssemblyFileVersion("2.9.9.0")>

ToolCollection/My Project/Settings.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,14 +15,14 @@ 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.14.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "Automatische My.Settings-Speicherfunktion"
+#Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
@@ -54,19 +54,6 @@ Namespace My
             End Get
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute(""),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property licensekey() As String
-            Get
-                Return CType(Me("licensekey"),String)
-            End Get
-            Set
-                Me("licensekey") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
@@ -106,73 +93,6 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("1")>  _
-        Public ReadOnly Property vMailProfilID() As Integer
-            Get
-                Return CType(Me("vMailProfilID"),Integer)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("support-flow@digitaldata.works")>  _
-        Public ReadOnly Property vMailRecipient() As String
-            Get
-                Return CType(Me("vMailRecipient"),String)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Fehler in Modul ToolCollection"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property vMailSubject() As String
-            Get
-                Return CType(Me("vMailSubject"),String)
-            End Get
-            Set
-                Me("vMailSubject") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("<p>__________________<br>"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"  <b><font face=""Arial"">Achtung Fehler:</font></b><fon"& _ 
-            "t face=""Arial""><br>"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"  <br>"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"  Folgender Fehler wurde festgestellt:</font> </p>"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property vMailBodyPraefix() As String
-            Get
-                Return CType(Me("vMailBodyPraefix"),String)
-            End Get
-            Set
-                Me("vMailBodyPraefix") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        Public ReadOnly Property vMailsenden() As Boolean
-            Get
-                Return CType(Me("vMailsenden"),Boolean)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("0, 0"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property frmNI_SQL_Loc() As Global.System.Drawing.Point
-            Get
-                Return CType(Me("frmNI_SQL_Loc"),Global.System.Drawing.Point)
-            End Get
-            Set
-                Me("frmNI_SQL_Loc") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("dd"),  _
@@ -186,32 +106,6 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("0"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property NIDurchlauf_Intervall() As Integer
-            Get
-                Return CType(Me("NIDurchlauf_Intervall"),Integer)
-            End Get
-            Set
-                Me("NIDurchlauf_Intervall") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property vDIDurchlaufRunning() As Boolean
-            Get
-                Return CType(Me("vDIDurchlaufRunning"),Boolean)
-            End Get
-            Set
-                Me("vDIDurchlaufRunning") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("0, 0"),  _
@@ -637,32 +531,6 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("25"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property vemailPort() As Integer
-            Get
-                Return CType(Me("vemailPort"),Integer)
-            End Get
-            Set
-                Me("vemailPort") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
-        Public Property NI_RUNNING() As Boolean
-            Get
-                Return CType(Me("NI_RUNNING"),Boolean)
-            End Get
-            Set
-                Me("NI_RUNNING") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("DigitalData\windream_CLIENT_WMCC_Neustart")>  _
@@ -704,7 +572,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("01;02;03;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("01;02;03;08;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23")>  _
         Public ReadOnly Property NI_WORKING_HOURS() As String
             Get
                 Return CType(Me("NI_WORKING_HOURS"),String)
@@ -789,13 +657,117 @@ Namespace My
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _ 
+            "Info=True;User ID=sa;Password=dd;Encrypt=False")>  _
         Public ReadOnly Property DDECMConString() As String
             Get
                 Return CType(Me("DDECMConString"),String)
             End Get
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("@Domain#@User#@PW")>  _
+        Public ReadOnly Property WM_PERS_LOGIN() As String
+            Get
+                Return CType(Me("WM_PERS_LOGIN"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _
+        Public Property vDeleteLogsTime() As Date
+            Get
+                Return CType(Me("vDeleteLogsTime"),Date)
+            End Get
+            Set
+                Me("vDeleteLogsTime") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property vAutoDeleteLogs() As Boolean
+            Get
+                Return CType(Me("vAutoDeleteLogs"),Boolean)
+            End Get
+            Set
+                Me("vAutoDeleteLogs") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property Setting() As String
+            Get
+                Return CType(Me("Setting"),String)
+            End Get
+            Set
+                Me("Setting") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("01/01/0001 03:00:00")>  _
+        Public Property vDefaultDeleteLogsTime() As Date
+            Get
+                Return CType(Me("vDefaultDeleteLogsTime"),Date)
+            End Get
+            Set
+                Me("vDefaultDeleteLogsTime") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property vNIStatusFinished() As Boolean
+            Get
+                Return CType(Me("vNIStatusFinished"),Boolean)
+            End Get
+            Set
+                Me("vNIStatusFinished") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property vInstanceName() As String
+            Get
+                Return CType(Me("vInstanceName"),String)
+            End Get
+            Set
+                Me("vInstanceName") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property vNIRunning() As Boolean
+            Get
+                Return CType(Me("vNIRunning"),Boolean)
+            End Get
+            Set
+                Me("vNIRunning") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property vNIsingleProfileRunning() As Boolean
+            Get
+                Return CType(Me("vNIsingleProfileRunning"),Boolean)
+            End Get
+            Set
+                Me("vNIsingleProfileRunning") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

ToolCollection/My Project/Settings.settings

@@ -2,9 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
-    <Setting Name="licensekey" Roaming="true" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="DIDurchlaufRunning" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -14,37 +11,9 @@
     <Setting Name="vDIConfigDatei" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">modDateiimportConfig.xml</Value>
     </Setting>
-    <Setting Name="vMailProfilID" Roaming="true" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">1</Value>
-    </Setting>
-    <Setting Name="vMailRecipient" Roaming="true" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">support-flow@digitaldata.works</Value>
-    </Setting>
-    <Setting Name="vMailSubject" Roaming="true" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Fehler in Modul ToolCollection</Value>
-    </Setting>
-    <Setting Name="vMailBodyPraefix" Roaming="true" Type="System.String" Scope="User">
-      <Value Profile="(Default)">&lt;p&gt;__________________&lt;br&gt;
-  &lt;b&gt;&lt;font face="Arial"&gt;Achtung Fehler:&lt;/font&gt;&lt;/b&gt;&lt;font face="Arial"&gt;&lt;br&gt;
-  &lt;br&gt;
-  Folgender Fehler wurde festgestellt:&lt;/font&gt; &lt;/p&gt;
-</Value>
-    </Setting>
-    <Setting Name="vMailsenden" Roaming="true" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="frmNI_SQL_Loc" Roaming="true" Type="System.Drawing.Point" Scope="User">
-      <Value Profile="(Default)">0, 0</Value>
-    </Setting>
     <Setting Name="vPW_Admin" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">dd</Value>
     </Setting>
-    <Setting Name="NIDurchlauf_Intervall" Roaming="true" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="vDIDurchlaufRunning" Roaming="true" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="frmNIHauptseite_Loc" Roaming="true" Type="System.Drawing.Point" Scope="User">
       <Value Profile="(Default)">0, 0</Value>
     </Setting>
@@ -147,12 +116,6 @@
     <Setting Name="errortext" Type="System.String" Scope="User">
       <Value Profile="(Default)">Fehlermeldung</Value>
     </Setting>
-    <Setting Name="vemailPort" Roaming="true" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">25</Value>
-    </Setting>
-    <Setting Name="NI_RUNNING" Roaming="true" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="WMCC_RESTART" Type="System.String" Scope="Application">
       <Value Profile="(Default)">DigitalData\windream_CLIENT_WMCC_Neustart</Value>
     </Setting>
@@ -166,7 +129,7 @@
       <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="NI_WORKING_HOURS" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">01;02;03;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23</Value>
+      <Value Profile="(Default)">01;02;03;08;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23</Value>
     </Setting>
     <Setting Name="FB_DATASOURCE" Type="System.String" Scope="Application">
       <Value Profile="(Default)" />
@@ -195,10 +158,37 @@
     <Setting Name="DDECMConString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
-  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</Value>
+    </Setting>
+    <Setting Name="WM_PERS_LOGIN" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">@Domain#@User#@PW</Value>
+    </Setting>
+    <Setting Name="vDeleteLogsTime" Type="System.DateTime" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="vAutoDeleteLogs" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="Setting" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="vDefaultDeleteLogsTime" Type="System.DateTime" Scope="User">
+      <Value Profile="(Default)">01/01/0001 03:00:00</Value>
+    </Setting>
+    <Setting Name="vNIStatusFinished" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="vInstanceName" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="vNIRunning" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="vNIsingleProfileRunning" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
 </SettingsFile>

ToolCollection/My Project/licenses.licx

@@ -0,0 +1,3 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ToolCollection/TCService.vb

@@ -83,71 +83,7 @@ Public Class TCService
         ClassLoggerService.Add("###############################################################", False)
     End Sub
     Private Sub Profil_DurchlaufNI()
-        'Try
-        '    For Each profil As ClassNIProfilS In ClassNIProfileS.Profile
 
-        '        ' aktuelles Profil der Klasse mitteilen
-        '        Me.aktivesProfil = profil
-
-        '        ' Ausgabe an Logdatei über nächstes Profil
-        '        _Logger.Info("", False)
-        '        _Logger.Info(">> Starte Durchlauf für Profil: " & profil.Profilname, False)
-
-
-        '        ' Überprüfen ob Profil aktiv oder inaktiv
-        '        If CBool(Me.aktivesProfil.Aktiv) = False Then
-        '            _Logger.Info(">> Profil: " & profil.Profilname & " ist inaktiv geschaltet", False)
-        '            _Logger.Info("", False)
-        '        Else
-        '            ' den Durchlaufszeitpunkt speichern
-        '            aktivesProfil.LastRun = Now
-        '            aktivesProfil.Save(False)
-
-        '            If file_exists(Me.aktivesProfil.WindreamSuche, True) = False Then
-        '                _Logger.Info(">> Windream Suche für Profil: " & profil.Profilname & " konnte nicht ausgeführt werden! Datei " & Me.aktivesProfil.WindreamSuche & " existiert nicht!", False)
-        '            Else
-        '                ' windream-Suche für Profil starten
-        '                Dim windreamSucheErgebnisse As WMObjects = Me._windreamNI.GetSearchDocuments(Me.aktivesProfil.WindreamSuche)
-
-        '                If windreamSucheErgebnisse.Count > 0 Then
-        '                    ' neue Anzahl von Dateien an ProgressBar2
-        '                    For Each dok As WMObject In windreamSucheErgebnisse
-        '                        ' aktuelles Dokument der Klasse mitteilen
-        '                        Me.aktivesDokument = dok
-        '                        '####### Go für das Dokument ##########
-        '                        ' Thread für diese Datei starten
-        '                        Me.startDateiDurchlauf()
-        '                        '######################################
-        '                        ' solange der Datei-Thread noch nicht abgeschlossen wurde
-        '                        While Me.bwDatei.IsBusy
-        '                            ' warten
-        '                        End While
-        '                        ' nächste Datei an ProgressBar2
-        '                        bwProfil.ReportProgress(-1)
-        '                        ' Vorgang abbrechen
-        '                        If bwProfil.CancellationPending Then Exit Sub
-
-        '                    Next
-        '                Else
-        '                    _Logger.Info("Keine windream-Dokumente für Profil: " & profil.Profilname & " gefunden!", False)
-        '                    _Logger.Info("", False)
-        '                    ' keine Dateien zum Importieren
-        '                End If
-        '            End If
-
-        '        End If
-        '        ' nächstes Profil an ProgressBar1
-
-        '    Next
-        '    ' Do Stuff Here...
-        '    EventLog1.WriteEntry("Durchlauf der Profile erfolgreich.")
-        'Catch ex As System.Exception
-        '    EventLog1.WriteEntry("TCService stellte einen Fehler fest '" & _
-        '        ex.Message & "'", EventLogEntryType.Error)
-        '    EventLog1.WriteEntry("TCService Stack Trace: " & _
-        '        ex.StackTrace, EventLogEntryType.Error)
-        '    ClassLoggerService.Add("Fehler in Profil_Durchlauf", ex.Message)
-        'End Try
     End Sub
     Private Sub Profil_DurchlaufDI()
         Try

ToolCollection/ToolCollection.vbproj

@@ -30,6 +30,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -86,21 +88,23 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Sparkline.v21.2.Core, 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.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <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>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>packages\EntityFramework.6.0.2\lib\net45\EntityFramework.dll</HintPath>
@@ -109,48 +113,38 @@
       <HintPath>packages\EntityFramework.6.0.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="Interop.Scripting">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.Scripting.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.Scripting.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Interop.WINDREAMLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
+    <Reference Include="Interop.WINDREAMLib">
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOBRWSLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOSRCHLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WMOTOOLLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.0.2\lib\net46\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Linq" />
     <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>packages\System.Data.SQLite.1.0.91.3\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>packages\System.Data.SQLite.1.0.91.3\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Deployment" />
     <Reference Include="System.DirectoryServices" />
@@ -191,9 +185,7 @@
     <Compile Include="ClassDIRegel.vb" />
     <Compile Include="ClassDIRegeln.vb" />
     <Compile Include="ClassLDAP.vb" />
-    <Compile Include="ClassLicense.vb" />
-    <Compile Include="ClassLicenseManager.vb" />
-    <Compile Include="ClassLicenses.vb" />
+    <Compile Include="ClassPasswordCrypto.vb" />
     <Compile Include="ClassLoggerDI.vb" />
     <Compile Include="ClassLoggerService.vb" />
     <Compile Include="ClassMI_Profile.vb" />
@@ -201,7 +193,6 @@
     <Compile Include="ClassMoveRenameLogger.vb" />
     <Compile Include="ClassMO_RE.vb" />
     <Compile Include="ClassNIDatenbankzugriff.vb" />
-    <Compile Include="ClassNIEmail.vb" />
     <Compile Include="ClassNIProfil.vb" />
     <Compile Include="ClassNIProfile.vb" />
     <Compile Include="ClassNIVerknüpfung.vb" />
@@ -332,18 +323,6 @@
     <Compile Include="frmDIRegelverwaltung.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmLogin_DI.Designer.vb">
-      <DependentUpon>frmLogin_DI.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmLogin_DI.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmLogin_NI.Designer.vb">
-      <DependentUpon>frmLogin_NI.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmLogin_NI.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmMIProfileigenschaften.Designer.vb">
       <DependentUpon>frmMIProfileigenschaften.vb</DependentUpon>
     </Compile>
@@ -374,12 +353,6 @@
     <Compile Include="frmNI_SQLTest.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmLizenzmanager.Designer.vb">
-      <DependentUpon>frmLizenzmanager.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmLizenzmanager.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmNIProfileigenschaften.Designer.vb">
       <DependentUpon>frmNIProfileigenschaften.vb</DependentUpon>
     </Compile>
@@ -505,12 +478,6 @@
     <EmbeddedResource Include="frmDIRegelverwaltung.resx">
       <DependentUpon>frmDIRegelverwaltung.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmLogin_DI.resx">
-      <DependentUpon>frmLogin_DI.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmLogin_NI.resx">
-      <DependentUpon>frmLogin_NI.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmMIProfileigenschaften.resx">
       <DependentUpon>frmMIProfileigenschaften.vb</DependentUpon>
     </EmbeddedResource>
@@ -527,9 +494,6 @@
     <EmbeddedResource Include="frmNI_SQLTest.resx">
       <DependentUpon>frmNI_SQLTest.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmLizenzmanager.resx">
-      <DependentUpon>frmLizenzmanager.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmNIProfileigenschaften.resx">
       <DependentUpon>frmNIProfileigenschaften.vb</DependentUpon>
     </EmbeddedResource>
@@ -542,6 +506,7 @@
     <EmbeddedResource Include="frmUebersicht.resx">
       <DependentUpon>frmUebersicht.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
@@ -842,6 +807,7 @@
     <None Include="Resources\database_refresh.png" />
     <None Include="Resources\arrow_up.png" />
     <None Include="Resources\bullet_arrow_down1.png" />
+    <Content Include="Interop.Scripting.dll" />
     <Content Include="Interop.WINDREAMLib.dll" />
     <None Include="Resources\action_add_16xMD.png" />
     <None Include="Resources\folder_Closed_16xMD.png" />
@@ -849,12 +815,6 @@
     <None Include="Resources\CheckConstraints_5634.png" />
     <Content Include="modDateiimportConfig.xml" />
     <Content Include="modNachindexierungConfig.xml" />
-    <Content Include="x64\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="Resources\user_suit.png" />
     <None Include="Resources\user.png" />
     <None Include="Resources\rosette.png" />
@@ -900,6 +860,13 @@
     <Folder Include="Log\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

ToolCollection/app.config

@@ -11,7 +11,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="ToolCollection.My.MySettings.DDECMConString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
+    <add name="ToolCollection.My.MySettings.DDECMConString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
       providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.diagnostics>
@@ -36,9 +36,6 @@
   </system.diagnostics>
   <userSettings>
     <ToolCollection.My.MySettings>
-      <setting name="licensekey" serializeAs="String">
-        <value />
-      </setting>
       <setting name="DIDurchlaufRunning" serializeAs="String">
         <value>False</value>
       </setting>
@@ -48,28 +45,9 @@
       <setting name="vDIConfigDatei" serializeAs="String">
         <value>modDateiimportConfig.xml</value>
       </setting>
-      <setting name="vMailSubject" serializeAs="String">
-        <value>Fehler in Modul ToolCollection</value>
-      </setting>
-      <setting name="vMailBodyPraefix" serializeAs="String">
-        <value>&lt;p&gt;__________________&lt;br&gt;
-  &lt;b&gt;&lt;font face="Arial"&gt;Achtung Fehler:&lt;/font&gt;&lt;/b&gt;&lt;font face="Arial"&gt;&lt;br&gt;
-  &lt;br&gt;
-  Folgender Fehler wurde festgestellt:&lt;/font&gt; &lt;/p&gt;
-</value>
-      </setting>
-      <setting name="frmNI_SQL_Loc" serializeAs="String">
-        <value>0, 0</value>
-      </setting>
       <setting name="vPW_Admin" serializeAs="String">
         <value>dd</value>
       </setting>
-      <setting name="NIDurchlauf_Intervall" serializeAs="String">
-        <value>0</value>
-      </setting>
-      <setting name="vDIDurchlaufRunning" serializeAs="String">
-        <value>False</value>
-      </setting>
       <setting name="frmNIHauptseite_Loc" serializeAs="String">
         <value>0, 0</value>
       </setting>
@@ -160,31 +138,40 @@
       <setting name="errortext" serializeAs="String">
         <value>Fehlermeldung</value>
       </setting>
-      <setting name="vemailPort" serializeAs="String">
-        <value>25</value>
-      </setting>
-      <setting name="NI_RUNNING" serializeAs="String">
-        <value>False</value>
-      </setting>
       <setting name="VFS_RESTART" serializeAs="String">
         <value>DigitalData\windream_VFS_RESTART</value>
       </setting>
       <setting name="myDateiname" serializeAs="String">
         <value>myInvalidDateiname.pdf</value>
       </setting>
+      <setting name="vDeleteLogsTime" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="vAutoDeleteLogs" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="Setting" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="vDefaultDeleteLogsTime" serializeAs="String">
+        <value>01/01/0001 03:00:00</value>
+      </setting>
+      <setting name="vNIStatusFinished" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="vInstanceName" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="vNIRunning" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="vNIsingleProfileRunning" serializeAs="String">
+        <value>False</value>
+      </setting>
     </ToolCollection.My.MySettings>
   </userSettings>
   <applicationSettings>
     <ToolCollection.My.MySettings>
-      <setting name="vMailProfilID" serializeAs="String">
-        <value>1</value>
-      </setting>
-      <setting name="vMailRecipient" serializeAs="String">
-        <value>support-flow@digitaldata.works</value>
-      </setting>
-      <setting name="vMailsenden" serializeAs="String">
-        <value>False</value>
-      </setting>
       <setting name="MRWD_Laufwerk" serializeAs="String">
         <value>W</value>
       </setting>
@@ -207,7 +194,7 @@
         <value>0</value>
       </setting>
       <setting name="NI_WORKING_HOURS" serializeAs="String">
-        <value>01;02;03;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23</value>
+        <value>01;02;03;08;09;10;11;12;13;14;15;16;17;18;19;20;21;22;23</value>
       </setting>
       <setting name="FB_DATASOURCE" serializeAs="String">
         <value />
@@ -230,6 +217,9 @@
       <setting name="REGEX_INVALID_PATH" serializeAs="String">
         <value>[\\\/:\*\?""'&lt;&gt;|]</value>
       </setting>
+      <setting name="WM_PERS_LOGIN" serializeAs="String">
+        <value>@Domain#@User#@PW</value>
+      </setting>
     </ToolCollection.My.MySettings>
   </applicationSettings>
   <startup>
@@ -246,14 +236,7 @@
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
     </providers>
   </entityFramework>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SQLite" />
-      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".Net Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-    </DbProviderFactories>
-  </system.data>
+  
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

ToolCollection/clsNIFulltext.vb

@@ -87,7 +87,7 @@ Public Class clsNIFulltext
                                 End If
                             Else
                                 'Es gibt nur From, also auch nur einen Wert
-                                If Pos_From = oCountMatchedElements Then
+                                If Pos_From = i Then
                                     'Das Ende ist erreicht - Ausstieg
                                     ReDim Preserve Ergebnis(0)
                                     Ergebnis(0) = Convert.ToString(g.ToString)

ToolCollection/clsNI_DB.vb

@@ -18,7 +18,8 @@ Public Class clsNI_DB
                 _Logger.Info("Check Deskriptiven Index-Value - Select Scalar: " & _vsql)
 
                 If _dbTyp = "Oracle" Then
-                    Dim ergebnis As Integer = CheckIndex_oracle(_vsql, datasource, initialcatalog, userid, pw)
+                    _Logger.Warn("ORACLE SQL-Command nicht integriert!")
+                    Dim ergebnis As Integer = 0
                     If ergebnis = 1 Then
                         Return 1
                     Else
@@ -49,52 +50,7 @@ Public Class clsNI_DB
         End Try
     End Function
     ' Überprüft den Indexwert und gibt 0 oder mehr zurück
-    Public Shared Function CheckIndex_oracle(ByVal _scalar_select As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String) As Integer
-        Try
 
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If host <> "" And servicename <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                servicename & ")));User Id=" & User & ";Password=" & pw & ";"
-            Else
-                conn.DataSource = host
-                conn.UserID = User
-                conn.Password = pw
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
-            Dim Oracle_Connection As New OracleConnection(connstr)
-
-            Try
-                Oracle_Connection.Open()
-            Catch ex As Exception
-                _Logger.Error(ex)
-
-                ' DB-Connection schliessen
-                Return 99
-                Oracle_Connection.Close()
-            End Try
-            Dim Command As OracleCommand
-            ' Verbindung zur Datenbank aufbauen
-
-            ' SQL-Abfrage definieren
-
-            Command = New OracleCommand(_scalar_select, Oracle_Connection)
-            Dim ergebnis As String = Command.ExecuteScalar.ToString
-            Return CLng(ergebnis)
-        Catch ex As Exception
-            If ex.Message.Contains("ORA-00904") Then
-                _Logger.Info("Error in CheckIndex_Oracle: " & ex.Message)
-            Else
-                _Logger.Warn(ex)
-            End If
-            ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-
-            Return 0
-        End Try
-    End Function
     Public Shared Function CheckIndex_MSSSQL(ByVal scalar_select As String, ByVal datasource As String, ByVal User As String, ByVal pw As String, ByVal init_Cata As String) As Integer
         Try
             _Logger.Info("MSSQL-Command: " & scalar_select)

ToolCollection/clsNI_WorkFile.vb

@@ -63,8 +63,6 @@ Public Class clsNI_WorkFile
             'bei einem Fehler einen Eintrag in der Logdatei machen
             _Logger.Warn("ACHTUNG Schwerwiegender Fehler in Work_File: " & ex.Message)
 
-            EMAIL_DD.Send_EMail("Schwerwiegender Fehler bei Work_File - <br> Profil: " & aktivesProfil.Profilname & "<br> Datei: " & dokument.aName.ToString & "<br> Fehler: " & ex.Message, "clsNIWorkFileWorkFile")
-
             Return False
         End Try
     End Function
@@ -314,7 +312,8 @@ Public Class clsNI_WorkFile
             _Logger.Debug("- Check Deskriptiven Index-Value - Select Scalar: " & _vsql)
 
             If aktivesProfil.DbArt = "Oracle" Then
-                Dim ergebnis As Integer = clsNI_DB.CheckIndex_oracle(_vsql, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password)
+                _Logger.Warn("ORACLE nicht integriert! 315")
+                Dim ergebnis As Integer = 0
                 If ergebnis = 1 Then
                     Return 1
                 Else
@@ -486,7 +485,7 @@ Public Class clsNI_WorkFile
                             'MessageBox.Show("Select: " & vbNewLine & selectArray(i))
                             ' die SQL-Abfrage durchführen (liefert den Wert der in den windream-Index geschrieben werden soll)
                             If aktivesProfil.DbArt = "Oracle" Then
-                                _NidxWert = database.GetValueFromOracleDb(aktivesProfil.Profilname, selectArray(i), aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, _Index)
+                                _NidxWert = Nothing
                             ElseIf aktivesProfil.DbArt = "MS-SQL" Then
                                 _NidxWert = database.GetValueFromMssqlDb(_WDFileINWORK.aName, aktivesProfil.Profilname, selectArray(i), aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, aktivesProfil.InitialCatalog, _Index)
                             ElseIf aktivesProfil.DbArt = "ODBC" Then

ToolCollection/frmDIHauptseite.Designer.vb

@@ -101,7 +101,7 @@ Partial Class frmDIHauptseite
         Me.tcMain.Location = New System.Drawing.Point(0, 0)
         Me.tcMain.Name = "tcMain"
         Me.tcMain.SelectedIndex = 0
-        Me.tcMain.Size = New System.Drawing.Size(722, 513)
+        Me.tcMain.Size = New System.Drawing.Size(784, 519)
         Me.tcMain.TabIndex = 51
         '
         'tpMain
@@ -124,7 +124,7 @@ Partial Class frmDIHauptseite
         Me.tpMain.Location = New System.Drawing.Point(4, 22)
         Me.tpMain.Name = "tpMain"
         Me.tpMain.Padding = New System.Windows.Forms.Padding(3)
-        Me.tpMain.Size = New System.Drawing.Size(714, 487)
+        Me.tpMain.Size = New System.Drawing.Size(776, 493)
         Me.tpMain.TabIndex = 0
         Me.tpMain.Text = "Hauptseite"
         Me.tpMain.UseVisualStyleBackColor = True
@@ -154,7 +154,7 @@ Partial Class frmDIHauptseite
         Me.btnAbbrechen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnAbbrechen.Image = Global.ToolCollection.My.Resources.Resources.cross
         Me.btnAbbrechen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnAbbrechen.Location = New System.Drawing.Point(553, 448)
+        Me.btnAbbrechen.Location = New System.Drawing.Point(615, 454)
         Me.btnAbbrechen.Name = "btnAbbrechen"
         Me.btnAbbrechen.Size = New System.Drawing.Size(154, 30)
         Me.btnAbbrechen.TabIndex = 32
@@ -170,7 +170,7 @@ Partial Class frmDIHauptseite
         Me.cmbProfilauswahl.FormattingEnabled = True
         Me.cmbProfilauswahl.Location = New System.Drawing.Point(11, 62)
         Me.cmbProfilauswahl.Name = "cmbProfilauswahl"
-        Me.cmbProfilauswahl.Size = New System.Drawing.Size(296, 21)
+        Me.cmbProfilauswahl.Size = New System.Drawing.Size(339, 21)
         Me.cmbProfilauswahl.Sorted = True
         Me.cmbProfilauswahl.TabIndex = 24
         '
@@ -259,6 +259,7 @@ Partial Class frmDIHauptseite
         '
         Me.numIntervallDurchlauf.DataBindings.Add(New System.Windows.Forms.Binding("Value", Global.ToolCollection.My.MySettings.Default, "DIDurchlauf_Intervall", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.numIntervallDurchlauf.Location = New System.Drawing.Point(55, 120)
+        Me.numIntervallDurchlauf.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.numIntervallDurchlauf.Name = "numIntervallDurchlauf"
         Me.numIntervallDurchlauf.Size = New System.Drawing.Size(46, 22)
         Me.numIntervallDurchlauf.TabIndex = 43
@@ -291,7 +292,7 @@ Partial Class frmDIHauptseite
         '
         Me.btnZielordner.Enabled = False
         Me.btnZielordner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnZielordner.Location = New System.Drawing.Point(278, 149)
+        Me.btnZielordner.Location = New System.Drawing.Point(321, 149)
         Me.btnZielordner.Name = "btnZielordner"
         Me.btnZielordner.Size = New System.Drawing.Size(29, 23)
         Me.btnZielordner.TabIndex = 40
@@ -304,16 +305,16 @@ Partial Class frmDIHauptseite
         Me.txtZielordner.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtZielordner.Location = New System.Drawing.Point(11, 151)
         Me.txtZielordner.Name = "txtZielordner"
-        Me.txtZielordner.Size = New System.Drawing.Size(261, 21)
+        Me.txtZielordner.Size = New System.Drawing.Size(304, 21)
         Me.txtZielordner.TabIndex = 39
         '
         'progressImport
         '
         Me.progressImport.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.progressImport.Location = New System.Drawing.Point(11, 415)
+        Me.progressImport.Location = New System.Drawing.Point(11, 421)
         Me.progressImport.Name = "progressImport"
-        Me.progressImport.Size = New System.Drawing.Size(696, 27)
+        Me.progressImport.Size = New System.Drawing.Size(758, 27)
         Me.progressImport.TabIndex = 29
         Me.progressImport.Visible = False
         '
@@ -334,7 +335,7 @@ Partial Class frmDIHauptseite
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblLog.AutoSize = True
         Me.lblLog.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblLog.Location = New System.Drawing.Point(339, 46)
+        Me.lblLog.Location = New System.Drawing.Point(371, 46)
         Me.lblLog.Name = "lblLog"
         Me.lblLog.Size = New System.Drawing.Size(103, 13)
         Me.lblLog.TabIndex = 31
@@ -344,7 +345,7 @@ Partial Class frmDIHauptseite
         '
         Me.btnQuellordner.Enabled = False
         Me.btnQuellordner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnQuellordner.Location = New System.Drawing.Point(278, 109)
+        Me.btnQuellordner.Location = New System.Drawing.Point(321, 109)
         Me.btnQuellordner.Name = "btnQuellordner"
         Me.btnQuellordner.Size = New System.Drawing.Size(29, 23)
         Me.btnQuellordner.TabIndex = 37
@@ -355,7 +356,7 @@ Partial Class frmDIHauptseite
         '
         Me.lblProgress.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblProgress.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "GUID", True))
-        Me.lblProgress.Location = New System.Drawing.Point(11, 448)
+        Me.lblProgress.Location = New System.Drawing.Point(11, 454)
         Me.lblProgress.Name = "lblProgress"
         Me.lblProgress.Size = New System.Drawing.Size(536, 33)
         Me.lblProgress.TabIndex = 33
@@ -378,7 +379,7 @@ Partial Class frmDIHauptseite
         Me.txtQuellordner.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtQuellordner.Location = New System.Drawing.Point(11, 109)
         Me.txtQuellordner.Name = "txtQuellordner"
-        Me.txtQuellordner.Size = New System.Drawing.Size(261, 21)
+        Me.txtQuellordner.Size = New System.Drawing.Size(304, 21)
         Me.txtQuellordner.TabIndex = 36
         '
         'tvLog
@@ -389,10 +390,10 @@ Partial Class frmDIHauptseite
         Me.tvLog.ContextMenuStrip = Me.contextLog
         Me.tvLog.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.tvLog.HideSelection = False
-        Me.tvLog.Location = New System.Drawing.Point(342, 62)
+        Me.tvLog.Location = New System.Drawing.Point(374, 62)
         Me.tvLog.Name = "tvLog"
         Me.tvLog.ShowNodeToolTips = True
-        Me.tvLog.Size = New System.Drawing.Size(365, 347)
+        Me.tvLog.Size = New System.Drawing.Size(395, 347)
         Me.tvLog.TabIndex = 34
         '
         'Label5
@@ -436,7 +437,7 @@ Partial Class frmDIHauptseite
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(722, 513)
+        Me.ClientSize = New System.Drawing.Size(784, 519)
         Me.Controls.Add(Me.tcMain)
         Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmDIHauptseite_Loc", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))

ToolCollection/frmDIHauptseite.vb

@@ -60,6 +60,8 @@ Public Class frmDIHauptseite
     Private CriticalErrorInBackgroundWorker As Boolean = False
     Private manProfile As String
 
+    Private FehlerProfileListe As New List(Of String)
+    Private FehlerMsgBoxVisible As Boolean = False
 
     Private Alles_OK As Boolean = True
 
@@ -155,7 +157,6 @@ Public Class frmDIHauptseite
                 Me.tvLog.Visible = False
                 Me.timRun_Dateiimport.Stop()
                 Durchlauf = False
-                My.Settings.vDIDurchlaufRunning = False
 
             End If
             Me.progressImport.Enabled = False
@@ -239,9 +240,14 @@ Public Class frmDIHauptseite
     Private Sub frmDIHauptseite_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
         Formloaded = True
         Me.LoadProfilesInCombobox()
-        If My.Settings.vDIDurchlaufRunning = True Then
+
+        If AUTOSTART_FIM Then
             Me.rbAutomatisch.Checked = True
             Automatischer_Durchlauf(False)
+            _Logger.Info("AUTOSTART_FIM = True - Dateiimport wird gestartet.")
+            AUTOSTART_FIM = False
+        Else
+            _Logger.Info("Dateiimport Hauptformular wurde geladen - Dateiimport wird NICHT gestartet.")
         End If
     End Sub
 #End Region
@@ -264,7 +270,7 @@ Public Class frmDIHauptseite
 #End Region
 
 #Region "*** DoWork: während der BackgroundWorker aktiv ist ***"
-    Private Sub threadDateiimport_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) 'Handles threadDateiimport.DoWork
+    Private Sub threadDateiimport_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
         Dim _TimeStart As Date
         Dim _TimeEnd As Date
         Try
@@ -279,9 +285,11 @@ Public Class frmDIHauptseite
             _TimeStart = Now
             ClassLoggerDI.Add(" Intervall: " & Me.numIntervallDurchlauf.Value, False)
             ClassLoggerDI.Add("======================================================================", False)
+
+            ' Liste für fehlerhafte Profile zurücksetzen
+            FehlerProfileListe.Clear()
+
             If _windream.Init Then
-
-
                 If Manuell = True Then
                     ClassLoggerDI.Add(">> Manueller Durchlauf", False)
                     ClassLoggerDI.Add("Profilname: " & manProfile, False)
@@ -294,42 +302,51 @@ Public Class frmDIHauptseite
                     '1. ###### Zählen der Files
                     Gesamtfiles = 0
                     Dim files_Durchlauf As ReadOnlyCollection(Of String)
-                    For Each item As ClassDIProfil In ClassDIProfile.Profile
 
+                    For Each item As ClassDIProfil In ClassDIProfile.Profile
                         Me.selectedProfile = ClassDIProfile.getProfilByName(item.OriginalProfilname)
 
                         'Nur die files der Aktiven Profile zählen
                         If CBool(selectedProfile.Aktiv) = True Then
-                            If Me.selectedProfile.Subdirectories = True Then
-                                files_Durchlauf = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchAllSubDirectories, "*.*")
-                            Else
-                                files_Durchlauf = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
-                            End If
-                            'files_Durchlauf = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
-                            Gesamtfiles += files_Durchlauf.Count
+                            Try
+                                If Me.selectedProfile.Subdirectories = True Then
+                                    files_Durchlauf = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchAllSubDirectories, "*.*")
+                                Else
+                                    files_Durchlauf = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
+                                End If
+                                Gesamtfiles += files_Durchlauf.Count
+                            Catch ex As Exception
+                                ' Profil zur Fehlerliste hinzufügen
+                                FehlerProfileListe.Add(item.OriginalProfilname)
+                                ClassLoggerDI.Add($"## FEHLER beim Zugriff auf Quellordner für Profil '{item.OriginalProfilname}': {ex.Message}", True)
+                            End Try
                         End If
-
-                        'MsgBox(files_Durchlauf.Count, MsgBoxStyle.Information, item.OriginalProfilname)
                     Next
+
                     ClassLoggerDI.Add("Gesamtanzahl der zu importierenden Dateien: " & Gesamtfiles, False)
+
                     If Gesamtfiles > 0 Then
                         '2. Jetzt das Durchlaufen jedes Profiles
                         For Each item As ClassDIProfil In ClassDIProfile.Profile
                             Me.selectedProfile = ClassDIProfile.getProfilByName(item.OriginalProfilname)
                             ClassLoggerDI.Add("Profilname: " & selectedProfile.Profilname, False)
+
                             ' Überprüfen ob Profil aktiv oder inaktiv
                             If CBool(selectedProfile.Aktiv) = False Then
                                 ClassLoggerDI.Add(">> Profil: " & selectedProfile.Profilname & " ist inaktiv geschaltet", False)
                                 ClassLoggerDI.Add("", False)
+                            ElseIf FehlerProfileListe.Contains(item.OriginalProfilname) Then
+                                ' Profil überspringen, wenn es bereits als fehlerhaft markiert wurde
+                                ClassLoggerDI.Add(">> Profil: " & selectedProfile.Profilname & " wird übersprungen (fehlerhafter Pfad)", False)
+                                ClassLoggerDI.Add("", False)
                             Else
                                 ' den Durchlaufszeitpunkt speichern
                                 selectedProfile.LastRun = Now
                                 selectedProfile.Save(False)
-                                'Und nun das PRofil durchlaufen
+                                'Und nun das Profil durchlaufen
                                 ClassLoggerDI.Add("- Start des Profildurchlaufes ", False)
                                 Profil_Durchlauf()
                             End If
-
                         Next
                     End If
                 End If
@@ -338,10 +355,9 @@ Public Class frmDIHauptseite
             End If
             '###
         Catch ex As Exception
-            '    'MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei threadDateiimport_DoWork:")
             ClassLoggerDI.Add(" ## Fehler bei thread_DI_DoWork: " & ex.Message, False)
-            '    Resume Next
         End Try
+
         _TimeEnd = Now
         Dim seconds As Integer = (_TimeEnd - _TimeStart).TotalSeconds
 
@@ -354,8 +370,6 @@ Public Class frmDIHauptseite
         Else
             ClassLoggerDI.Add(" Dauer: " & (seconds / 60).ToString & " Minuten", False)
         End If
-
-
     End Sub
     Public Function func_check_file_use(ByVal filename) As Boolean
         filename = filename.Replace(My.Settings.vWLaufwerk, "\\windream\objects")
@@ -422,11 +436,22 @@ Public Class frmDIHauptseite
         Dim oFileAusschlussList As New ArrayList
         'Variable für das "Letzte Subdirectory"
         Dim oLastFolderinFiles As String = ""
-        If Me.selectedProfile.Subdirectories = True Then
-            Me.ImportFileList = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchAllSubDirectories, "*.*")
-        Else
-            Me.ImportFileList = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
-        End If
+
+        Try
+            If Me.selectedProfile.Subdirectories = True Then
+                Me.ImportFileList = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchAllSubDirectories, "*.*")
+            Else
+                Me.ImportFileList = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
+            End If
+        Catch ex As Exception
+            ' Profil zur Fehlerliste hinzufügen, falls noch nicht vorhanden
+            If Not FehlerProfileListe.Contains(Me.selectedProfile.OriginalProfilname) Then
+                FehlerProfileListe.Add(Me.selectedProfile.OriginalProfilname)
+            End If
+            ClassLoggerDI.Add($"## FEHLER beim Zugriff auf Quellordner für Profil '{Me.selectedProfile.OriginalProfilname}': {ex.Message}", True)
+            Exit Sub
+        End Try
+
         Dim oError As Boolean = False
         Dim DT_TBTC_DI_REGEX_MATCH As DataTable
         Try
@@ -722,15 +747,10 @@ Public Class frmDIHauptseite
                                         'DAS Windream-Laufwerk ist nicht verfügbar!
                                         CriticalErrorInBackgroundWorker = True
                                         Import_Abbrechen()
-                                        EMAIL_DD.Send_EMail("ESKALATIONSTUFE 1: Schwerwiegender Fehler in Dateiimporter windream <br>ERROR: " & Err.Description & "<br> DAS WINDREAM-LAUFWERK oder der Netzwerkname IST NICHT VERFÜGBAR!<br>" &
-                                                             "Der Importvorgang wurde abgebrochen!<br>Fehlerbehebung: ==> Starten Sie windream und den den Dateiimporter neu!", "DI_WMNOTACCESSIBLE")
 
                                         MsgBox("Schwerwiegender Fehler in Dateiimporter windream!" & vbNewLine & "ERROR: " & Err.Description & vbNewLine & "DAS WINDREAM-LAUFWERK IST NICHT VERFÜGBAR!" & vbNewLine &
                                                                 "Der Importvorgang wurde abgebrochen!" & vbNewLine & "Fehlerbehebung: ==> Starten Sie windream und den den Dateiimporter neu!")
                                         Exit Sub
-                                    Else
-                                        EMAIL_DD.Send_EMail("Fehler bei Datei: " & oFilenameQuelle & " <br\>ERROR: " & Err.Description, "DI_WMFILEACCESS")
-
                                     End If
 
 
@@ -873,9 +893,7 @@ Public Class frmDIHauptseite
 #End Region
 
 #Region "*** BackgroundWorker wurde beendet ***"
-    Private Sub threadDateiimport_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted
-        ' This event fires when the DoWork event completes
-
+    Private Sub threadDateiimport_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs)
         Try
             Dim result As String = ""
 
@@ -885,19 +903,40 @@ Public Class frmDIHauptseite
                 MsgBox("Beim Dateiimport ist ein Fehler aufgetreten. Der Vorgang wurde abgebrochen." & vbNewLine & vbNewLine & "Dateiimport: Fehlernachricht:" & vbNewLine & e.Error.Message, MsgBoxStyle.Exclamation, "Vorgang auf Grund eines Fehlers abgebrochen")
             Else
                 Me.progressImport.Value = 100
-                'MsgBox("Der Dateiimport für das Profil '" & Me.cmbProfilauswahl.SelectedItem & "' wurde erfolgreich durchgeführt.", MsgBoxStyle.Information, "Dateiimport: Vorgang erfolgreich beendet")
-            End If
 
-            ''MsgBox(filenameQuelle.Substring(0, filenameQuelle.LastIndexOf("\")))
-            'If Me.selectedProfile.VerzeichnisLöschen Then
-            '    Try
-            '        If Me.txtQuellordner.Text <> "" Then
-            '             My.Computer.FileSystem.DeleteDirectory(Me.txtQuellordner.Text, FileIO.DeleteDirectoryOption.ThrowIfDirectoryNonEmpty)
-            '        End If
-            '    Catch ex As Exception
-            '        MsgBox("Der Vorgang wurde abgeschlossen. Das Quellverzeichnis konnte jedoch nicht gelöscht werden, da sich in dem Ordner noch Dateien/Verzeichnisse befinden.", MsgBoxStyle.Information, "Vorgang beendet:")
-            '    End Try
-            'End If
+                ' Fehlermeldung für fehlerhafte Profile anzeigen
+                ' NUR wenn keine MessageBox bereits angezeigt wird
+                If FehlerProfileListe.Count > 0 AndAlso Not FehlerMsgBoxVisible Then
+                    ' Flag setzen BEVOR die MessageBox angezeigt wird
+                    FehlerMsgBoxVisible = True
+
+                    Dim fehlerMessage As New System.Text.StringBuilder()
+                    fehlerMessage.AppendLine("ACHTUNG: Fehler in folgenden Profilen:")
+                    fehlerMessage.AppendLine()
+
+                    For Each profilname As String In FehlerProfileListe
+                        fehlerMessage.AppendLine("  • " & profilname)
+                    Next
+
+                    fehlerMessage.AppendLine()
+                    fehlerMessage.AppendLine("Bitte kontrollieren Sie die hinterlegten Quell- und Zielpfade,")
+                    fehlerMessage.AppendLine("sowie die Zugriffsberechtigungen!")
+
+                    ' MessageBox anzeigen (blockiert bis Benutzer OK klickt)
+                    MsgBox(fehlerMessage.ToString(), MsgBoxStyle.Exclamation, "Fehlerhafte Profile erkannt")
+
+                    ' Flag zurücksetzen NACHDEM die MessageBox geschlossen wurde
+                    FehlerMsgBoxVisible = False
+
+                    ' Fehler auch im Log vermerken
+                    ClassLoggerDI.Add("======================================================================", False)
+                    ClassLoggerDI.Add(" FEHLERHAFTE PROFILE: " & FehlerProfileListe.Count, True)
+                    For Each profilname As String In FehlerProfileListe
+                        ClassLoggerDI.Add(" - " & profilname, True)
+                    Next
+                    ClassLoggerDI.Add("======================================================================", False)
+                End If
+            End If
 
             ' den ersten Knoten öffnen und direkt wieder schließen, damit der letzte Knoten korrekt angezeigt wird
             '    -> sonst wird das letzte Element nicht richtig (nur zur Hälfte) angezeigt
@@ -1148,40 +1187,58 @@ Public Class frmDIHauptseite
                     _Step = "3.1.1"
                     DetailLog("_Step: " & _Step)
                     ' wenn auf die Datei zugeriffen werden konnte ist sie bereits vorhanden -> Datum anhängen
-                    DetailLog("-> DATEI IST BEREITS VORHANDEN")
+                    DetailLog("DATEI IST BEREITS VORHANDEN - MUSS VERSIONIERT WERDEN!")
                     Err.Clear()
                     '### Automatische Versionierung mit ~ (Tilde) ###
-                    Dim version As Integer = 2
+                    Dim oMyVersion As Integer = 2
                     Dim extension As String = Quelldatei_Name.Substring(Quelldatei_Name.LastIndexOf("."))
-                    Dim Stammname As String = zielpfad.Substring(2) & "\" & Quelldatei_Name.Substring(0, Quelldatei_Name.LastIndexOf("."))
-                    Dim neuername As String = zielpfad.Substring(2) & "\" & Quelldatei_Name.Substring(0, Quelldatei_Name.LastIndexOf("."))
+                    If zielpfad.StartsWith("\\Windream\Objects") Then
+                        DetailLog("Replacing windream\objects...")
+                        zielpfad = zielpfad.Replace("\\Windream\Objects", "")
+                    Else
+                        zielpfad = zielpfad.Substring(2)
+                    End If
 
-                    Do While file_exists(My.Settings.vWLaufwerk & ":\" & neuername & extension) = True
-                        DetailLog("Datei " & endgültigerDateiname & " ist vorhanden!")
-                        neuername = Stammname & "~" & version
+                    Dim Stammname As String = zielpfad & "\" & Quelldatei_Name.Substring(0, Quelldatei_Name.LastIndexOf("."))
+                    Dim neuername As String = zielpfad & "\" & Quelldatei_Name.Substring(0, Quelldatei_Name.LastIndexOf("."))
+                    DetailLog("Stammname [" & Stammname & "]")
+                    DetailLog("neuername [" & neuername & "]")
+                    Do While file_exists("\\WINDREAM\OBJECTS\" & neuername & extension) = True
+                        DetailLog("Versionierung - Datei [" & neuername & extension & "] ist vorhanden!")
+                        neuername = Stammname & "~" & oMyVersion
+                        DetailLog("Versionierung - neuername [" & neuername & "]")
                         endgültigerDateiname = neuername & extension
-                        version = version + 1
+                        oMyVersion = oMyVersion + 1
                     Loop
+                    DetailLog("Datei [" & endgültigerDateiname & "] wird benutzt um den Filestream nach WM zu erzeugen...")
                     _Step = "3.1.2"
                     DetailLog("_Step: " & _Step)
-                    oNewWMObject = _windream.oWMSession.GetNewWMObjectFS(WMEntityDocument, endgültigerDateiname, WMObjectEditModeObject)
+                    Try
+                        oNewWMObject = _windream.oWMSession.GetNewWMObjectFS(WMEntityDocument, endgültigerDateiname, WMObjectEditModeObject)
+                    Catch ex As Exception
+                        ClassLoggerDI.Add(" FEHLER DATEI_VORHANDEN GetNewWMObjectFS...")
+                        ClassLoggerDI.Add(" FEHLER bei _windream.oWMSession.GetNewWMObjectFS: '" & ex.Message)
+                        Return -1
+                    End Try
+
                     If Err.Number > 0 Then
-                        ClassLoggerDI.Add(" FEHLER: Neues WMObject (Kopie) konnte nicht erzeugt werden - Error: '" & Err.Description & "'")
-                        If My.Settings.StopwatchTimerActive = True Then
-                            oStopWatchTimer.Done()
-                            oStopWatchTimerC.Done()
+                            ClassLoggerDI.Add(" FEHLER: Neues WMObject (Kopie) konnte nicht erzeugt werden - Error: '" & Err.Description & "'")
+                            If My.Settings.StopwatchTimerActive = True Then
+                                oStopWatchTimer.Done()
+                                oStopWatchTimerC.Done()
+                            End If
+                            'MsgBox(Err.Description)
                         End If
-                        'MsgBox(Err.Description)
+                        DetailLog("...WMObject-Filestream zugewiesen")
                     End If
-                    DetailLog("WMObject zugewiesen")
-                End If
-                _Step = "3.2"
+                    _Step = "3.2"
                 DetailLog("_Step: " & _Step)
                 DetailLog("ENDGÜLTIGER DATEINAME => " & endgültigerDateiname)
                 If oNewWMObject IsNot Nothing Then
                     ' lock object for file system access (to change the file itself)
                     oNewWMObject.lock()
                     ' set fileIO the local source file
+                    DetailLog("Now Streaming from filenameQuelle...")
                     oFileIO.bstrOriginalFileName = filenameQuelle
                     If Err.Number > 0 Then
                         'MsgBox(Err.Number.ToString)
@@ -1198,8 +1255,25 @@ Public Class frmDIHauptseite
                     End If
                     _Step = "3.3"
                     DetailLog("_Step: " & _Step)
-                    ' open the windream object's file stream for writing
-                    oWMStream = oNewWMObject.OpenStream(STREAM_BinaryObject, WMObjectStreamOpenModeReadWrite)
+                    Try
+                        ' open the windream object's file stream for writing
+                        oWMStream = oNewWMObject.OpenStream(STREAM_BinaryObject, WMObjectStreamOpenModeReadWrite)
+                    Catch ex As Exception
+                        ClassLoggerDI.Add(" FEHLER bei OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
+                        oNewWMObject.Unlock()
+                        Try
+                            System.IO.File.Delete(My.Settings.vWLaufwerk & ":" & endgültigerDateiname)
+                        Catch ex1 As Exception
+
+                        End Try
+
+                        If My.Settings.StopwatchTimerActive = True Then
+                            oStopWatchTimer.Done()
+                            oStopWatchTimerC.Done()
+                        End If
+                        Return -1
+                    End Try
+
                     If Err.Number > 0 Then
                         ClassLoggerDI.Add(" FEHLER bei OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                         oNewWMObject.Unlock()
@@ -2267,7 +2341,6 @@ Public Class frmDIHauptseite
 
                     Me.timRun_Dateiimport.Interval = Me.numIntervallDurchlauf.Value * 60 * 1000
                     Me.timRun_Dateiimport.Start()
-                    My.Settings.vDIDurchlaufRunning = True
                     My.Settings.Save()
                     'Direkt einen Durchlauf starten
                     If runnow = True Then
@@ -2286,7 +2359,6 @@ Public Class frmDIHauptseite
                 Me.tvLog.Visible = False
                 Me.timRun_Dateiimport.Stop()
                 Durchlauf = False
-                My.Settings.vDIDurchlaufRunning = False
             End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei btnDurchlauf.Click:")

ToolCollection/frmDIProfilEigenschaften.Designer.vb

@@ -24,22 +24,21 @@ Partial Class frmDIProfilEigenschaften
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDIProfilEigenschaften))
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton()
         Me.cmbProfilauswahl = New System.Windows.Forms.ToolStripSplitButton()
         Me.tslblAnzahl = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton()
         Me.lblProfil = New System.Windows.Forms.ToolStripStatusLabel()
         Me.dlgQuellordner = New System.Windows.Forms.FolderBrowserDialog()
         Me.dlgZielordner = New System.Windows.Forms.FolderBrowserDialog()
         Me.dlgBackupordner = New System.Windows.Forms.FolderBrowserDialog()
         Me.pnlProfileigenschaften = New System.Windows.Forms.Panel()
-        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.Label10 = New System.Windows.Forms.Label()
-        Me.cmbl2Nav_Index = New System.Windows.Forms.ComboBox()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.cmbl2NavDokartindex = New System.Windows.Forms.ComboBox()
-        Me.Label8 = New System.Windows.Forms.Label()
-        Me.btnLink2Navision = New System.Windows.Forms.Button()
-        Me.txtLink2Navision = New System.Windows.Forms.TextBox()
-        Me.chkbxlink2Navision = New System.Windows.Forms.CheckBox()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.txtlastRun = New System.Windows.Forms.TextBox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
@@ -60,9 +59,9 @@ Partial Class frmDIProfilEigenschaften
         Me.rbUV_Date1 = New System.Windows.Forms.RadioButton()
         Me.chkb_DateUV = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
+        Me.btnRegeln = New System.Windows.Forms.Button()
         Me.boxImportoptionenLoeschen = New System.Windows.Forms.GroupBox()
         Me.chkUVloeschen = New System.Windows.Forms.CheckBox()
-        Me.chkQuellverzeichnisLoeschen = New System.Windows.Forms.CheckBox()
         Me.chkDateienLoeschen = New System.Windows.Forms.CheckBox()
         Me.boxImportoptionenBackup = New System.Windows.Forms.GroupBox()
         Me.txtBackupordner = New System.Windows.Forms.TextBox()
@@ -75,18 +74,8 @@ Partial Class frmDIProfilEigenschaften
         Me.Label1 = New System.Windows.Forms.Label()
         Me.txtProfilname = New System.Windows.Forms.TextBox()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.btnRegeln = New System.Windows.Forms.Button()
-        Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton()
         Me.StatusStrip1.SuspendLayout()
         Me.pnlProfileigenschaften.SuspendLayout()
-        Me.GroupBox3.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.boxImportoptionenLoeschen.SuspendLayout()
@@ -107,6 +96,41 @@ Partial Class frmDIProfilEigenschaften
         Me.StatusStrip1.TabIndex = 21
         Me.StatusStrip1.Text = "StatusStrip1"
         '
+        'btnSpeichern
+        '
+        Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnSpeichern.Enabled = False
+        Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save
+        Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnSpeichern.Name = "btnSpeichern"
+        Me.btnSpeichern.ShowDropDownArrow = False
+        Me.btnSpeichern.Size = New System.Drawing.Size(20, 20)
+        Me.btnSpeichern.Text = "Profil speichern"
+        '
+        'btnLöschen
+        '
+        Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnLöschen.Enabled = False
+        Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete
+        Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnLöschen.Name = "btnLöschen"
+        Me.btnLöschen.ShowDropDownArrow = False
+        Me.btnLöschen.Size = New System.Drawing.Size(20, 20)
+        Me.btnLöschen.Text = "Profil löschen"
+        '
+        'btnHinzufügen
+        '
+        Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add
+        Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnHinzufügen.Name = "btnHinzufügen"
+        Me.btnHinzufügen.ShowDropDownArrow = False
+        Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20)
+        Me.btnHinzufügen.Text = "Profil hinzufügen"
+        '
         'cmbProfilauswahl
         '
         Me.cmbProfilauswahl.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@@ -122,6 +146,49 @@ Partial Class frmDIProfilEigenschaften
         Me.tslblAnzahl.Size = New System.Drawing.Size(94, 17)
         Me.tslblAnzahl.Text = "Anzahl Profile: "
         '
+        'tsbtnfirst
+        '
+        Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnfirst.DoubleClickEnabled = True
+        Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind
+        Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnfirst.Name = "tsbtnfirst"
+        Me.tsbtnfirst.ShowDropDownArrow = False
+        Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnfirst.Text = "Erstes Profil"
+        '
+        'tsbtnprevious
+        '
+        Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left
+        Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnprevious.Name = "tsbtnprevious"
+        Me.tsbtnprevious.ShowDropDownArrow = False
+        Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnprevious.Text = "ToolStripDropDownButton2"
+        Me.tsbtnprevious.ToolTipText = "Vorheriges Profil"
+        '
+        'tsbtnnext
+        '
+        Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right
+        Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnnext.Name = "tsbtnnext"
+        Me.tsbtnnext.ShowDropDownArrow = False
+        Me.tsbtnnext.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnnext.Text = "ToolStripDropDownButton3"
+        Me.tsbtnnext.ToolTipText = "Nächstes Profil"
+        '
+        'tsbtnlast
+        '
+        Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward
+        Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnlast.Name = "tsbtnlast"
+        Me.tsbtnlast.ShowDropDownArrow = False
+        Me.tsbtnlast.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnlast.Text = "Letztes Profil"
+        '
         'lblProfil
         '
         Me.lblProfil.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -132,7 +199,6 @@ Partial Class frmDIProfilEigenschaften
         'pnlProfileigenschaften
         '
         Me.pnlProfileigenschaften.Controls.Add(Me.Button1)
-        Me.pnlProfileigenschaften.Controls.Add(Me.GroupBox3)
         Me.pnlProfileigenschaften.Controls.Add(Me.txtlastRun)
         Me.pnlProfileigenschaften.Controls.Add(Me.Label7)
         Me.pnlProfileigenschaften.Controls.Add(Me.GroupBox2)
@@ -155,101 +221,17 @@ Partial Class frmDIProfilEigenschaften
         Me.pnlProfileigenschaften.TabIndex = 22
         Me.pnlProfileigenschaften.Visible = False
         '
-        'GroupBox3
+        'Button1
         '
-        Me.GroupBox3.Controls.Add(Me.Label10)
-        Me.GroupBox3.Controls.Add(Me.cmbl2Nav_Index)
-        Me.GroupBox3.Controls.Add(Me.Label9)
-        Me.GroupBox3.Controls.Add(Me.cmbl2NavDokartindex)
-        Me.GroupBox3.Controls.Add(Me.Label8)
-        Me.GroupBox3.Controls.Add(Me.btnLink2Navision)
-        Me.GroupBox3.Controls.Add(Me.txtLink2Navision)
-        Me.GroupBox3.Controls.Add(Me.chkbxlink2Navision)
-        Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox3.Location = New System.Drawing.Point(15, 408)
-        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(563, 136)
-        Me.GroupBox3.TabIndex = 59
-        Me.GroupBox3.TabStop = False
-        Me.GroupBox3.Text = "Zusatzmodule/-funktionen:"
-        '
-        'Label10
-        '
-        Me.Label10.AutoSize = True
-        Me.Label10.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label10.Location = New System.Drawing.Point(230, 84)
-        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(134, 13)
-        Me.Label10.TabIndex = 44
-        Me.Label10.Text = "Indexwert zur Übergabe:"
-        '
-        'cmbl2Nav_Index
-        '
-        Me.cmbl2Nav_Index.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbl2Nav_Index.FormattingEnabled = True
-        Me.cmbl2Nav_Index.Location = New System.Drawing.Point(233, 99)
-        Me.cmbl2Nav_Index.Name = "cmbl2Nav_Index"
-        Me.cmbl2Nav_Index.Size = New System.Drawing.Size(218, 21)
-        Me.cmbl2Nav_Index.TabIndex = 43
-        '
-        'Label9
-        '
-        Me.Label9.AutoSize = True
-        Me.Label9.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(3, 84)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(109, 13)
-        Me.Label9.TabIndex = 42
-        Me.Label9.Text = "Dokumentartindex: "
-        '
-        'cmbl2NavDokartindex
-        '
-        Me.cmbl2NavDokartindex.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbl2NavDokartindex.FormattingEnabled = True
-        Me.cmbl2NavDokartindex.Location = New System.Drawing.Point(6, 99)
-        Me.cmbl2NavDokartindex.Name = "cmbl2NavDokartindex"
-        Me.cmbl2NavDokartindex.Size = New System.Drawing.Size(218, 21)
-        Me.cmbl2NavDokartindex.TabIndex = 41
-        '
-        'Label8
-        '
-        Me.Label8.AutoSize = True
-        Me.Label8.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label8.Location = New System.Drawing.Point(6, 40)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(138, 13)
-        Me.Label8.TabIndex = 40
-        Me.Label8.Text = "Pfad zu DDLink2Navision:"
-        '
-        'btnLink2Navision
-        '
-        Me.btnLink2Navision.Enabled = False
-        Me.btnLink2Navision.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnLink2Navision.Location = New System.Drawing.Point(532, 54)
-        Me.btnLink2Navision.Name = "btnLink2Navision"
-        Me.btnLink2Navision.Size = New System.Drawing.Size(24, 21)
-        Me.btnLink2Navision.TabIndex = 4
-        Me.btnLink2Navision.Text = "..."
-        Me.btnLink2Navision.UseVisualStyleBackColor = True
-        '
-        'txtLink2Navision
-        '
-        Me.txtLink2Navision.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtLink2Navision.Location = New System.Drawing.Point(6, 55)
-        Me.txtLink2Navision.Name = "txtLink2Navision"
-        Me.txtLink2Navision.Size = New System.Drawing.Size(520, 22)
-        Me.txtLink2Navision.TabIndex = 2
-        '
-        'chkbxlink2Navision
-        '
-        Me.chkbxlink2Navision.AutoSize = True
-        Me.chkbxlink2Navision.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkbxlink2Navision.Location = New System.Drawing.Point(6, 20)
-        Me.chkbxlink2Navision.Name = "chkbxlink2Navision"
-        Me.chkbxlink2Navision.Size = New System.Drawing.Size(406, 17)
-        Me.chkbxlink2Navision.TabIndex = 1
-        Me.chkbxlink2Navision.Text = "Link2Navision (Legt für die importierte Datei einen Link in MS Navision an)"
-        Me.chkbxlink2Navision.UseVisualStyleBackColor = True
+        Me.Button1.Image = Global.ToolCollection.My.Resources.Resources.lines_Text_code_16xLG
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(584, 11)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(184, 23)
+        Me.Button1.TabIndex = 60
+        Me.Button1.Text = "Regular Expressions"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button1.UseVisualStyleBackColor = True
         '
         'txtlastRun
         '
@@ -359,7 +341,7 @@ Partial Class frmDIProfilEigenschaften
         '
         'txtVerzoegerung
         '
-        Me.txtVerzoegerung.Location = New System.Drawing.Point(400, 562)
+        Me.txtVerzoegerung.Location = New System.Drawing.Point(400, 421)
         Me.txtVerzoegerung.Name = "txtVerzoegerung"
         Me.txtVerzoegerung.Size = New System.Drawing.Size(45, 22)
         Me.txtVerzoegerung.TabIndex = 55
@@ -368,7 +350,7 @@ Partial Class frmDIProfilEigenschaften
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(18, 558)
+        Me.Label6.Location = New System.Drawing.Point(18, 417)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(376, 26)
         Me.Label6.TabIndex = 54
@@ -466,15 +448,26 @@ Partial Class frmDIProfilEigenschaften
         Me.Label5.TabIndex = 50
         Me.Label5.Text = "*  bei diesem Feld handelt es sich um ein Pflichtfeld"
         '
+        'btnRegeln
+        '
+        Me.btnRegeln.Image = Global.ToolCollection.My.Resources.Resources.f5
+        Me.btnRegeln.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRegeln.Location = New System.Drawing.Point(774, 10)
+        Me.btnRegeln.Name = "btnRegeln"
+        Me.btnRegeln.Size = New System.Drawing.Size(155, 49)
+        Me.btnRegeln.TabIndex = 6
+        Me.btnRegeln.Text = "Regeln verwalten ..."
+        Me.btnRegeln.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRegeln.UseVisualStyleBackColor = True
+        '
         'boxImportoptionenLoeschen
         '
         Me.boxImportoptionenLoeschen.Controls.Add(Me.chkUVloeschen)
-        Me.boxImportoptionenLoeschen.Controls.Add(Me.chkQuellverzeichnisLoeschen)
         Me.boxImportoptionenLoeschen.Controls.Add(Me.chkDateienLoeschen)
         Me.boxImportoptionenLoeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.boxImportoptionenLoeschen.Location = New System.Drawing.Point(584, 110)
         Me.boxImportoptionenLoeschen.Name = "boxImportoptionenLoeschen"
-        Me.boxImportoptionenLoeschen.Size = New System.Drawing.Size(345, 99)
+        Me.boxImportoptionenLoeschen.Size = New System.Drawing.Size(345, 73)
         Me.boxImportoptionenLoeschen.TabIndex = 46
         Me.boxImportoptionenLoeschen.TabStop = False
         Me.boxImportoptionenLoeschen.Text = "Löschen"
@@ -483,7 +476,7 @@ Partial Class frmDIProfilEigenschaften
         '
         Me.chkUVloeschen.AutoSize = True
         Me.chkUVloeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkUVloeschen.Location = New System.Drawing.Point(8, 65)
+        Me.chkUVloeschen.Location = New System.Drawing.Point(8, 47)
         Me.chkUVloeschen.Name = "chkUVloeschen"
         Me.chkUVloeschen.Size = New System.Drawing.Size(230, 17)
         Me.chkUVloeschen.TabIndex = 2
@@ -491,23 +484,11 @@ Partial Class frmDIProfilEigenschaften
         Me.chkUVloeschen.UseVisualStyleBackColor = True
         Me.chkUVloeschen.Visible = False
         '
-        'chkQuellverzeichnisLoeschen
-        '
-        Me.chkQuellverzeichnisLoeschen.AutoSize = True
-        Me.chkQuellverzeichnisLoeschen.Enabled = False
-        Me.chkQuellverzeichnisLoeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkQuellverzeichnisLoeschen.Location = New System.Drawing.Point(8, 42)
-        Me.chkQuellverzeichnisLoeschen.Name = "chkQuellverzeichnisLoeschen"
-        Me.chkQuellverzeichnisLoeschen.Size = New System.Drawing.Size(217, 17)
-        Me.chkQuellverzeichnisLoeschen.TabIndex = 1
-        Me.chkQuellverzeichnisLoeschen.Text = "Quellverzeichnis nach Import löschen"
-        Me.chkQuellverzeichnisLoeschen.UseVisualStyleBackColor = True
-        '
         'chkDateienLoeschen
         '
         Me.chkDateienLoeschen.AutoSize = True
         Me.chkDateienLoeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkDateienLoeschen.Location = New System.Drawing.Point(8, 19)
+        Me.chkDateienLoeschen.Location = New System.Drawing.Point(8, 23)
         Me.chkDateienLoeschen.Name = "chkDateienLoeschen"
         Me.chkDateienLoeschen.Size = New System.Drawing.Size(200, 17)
         Me.chkDateienLoeschen.TabIndex = 0
@@ -629,108 +610,6 @@ Partial Class frmDIProfilEigenschaften
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        'Button1
-        '
-        Me.Button1.Image = Global.ToolCollection.My.Resources.Resources.lines_Text_code_16xLG
-        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(584, 11)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(184, 23)
-        Me.Button1.TabIndex = 60
-        Me.Button1.Text = "Regular Expressions"
-        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button1.UseVisualStyleBackColor = True
-        '
-        'btnRegeln
-        '
-        Me.btnRegeln.Image = Global.ToolCollection.My.Resources.Resources.f5
-        Me.btnRegeln.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRegeln.Location = New System.Drawing.Point(774, 10)
-        Me.btnRegeln.Name = "btnRegeln"
-        Me.btnRegeln.Size = New System.Drawing.Size(155, 49)
-        Me.btnRegeln.TabIndex = 6
-        Me.btnRegeln.Text = "Regeln verwalten ..."
-        Me.btnRegeln.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRegeln.UseVisualStyleBackColor = True
-        '
-        'btnSpeichern
-        '
-        Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnSpeichern.Enabled = False
-        Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save
-        Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnSpeichern.Name = "btnSpeichern"
-        Me.btnSpeichern.ShowDropDownArrow = False
-        Me.btnSpeichern.Size = New System.Drawing.Size(20, 20)
-        Me.btnSpeichern.Text = "Profil speichern"
-        '
-        'btnLöschen
-        '
-        Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnLöschen.Enabled = False
-        Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete
-        Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnLöschen.Name = "btnLöschen"
-        Me.btnLöschen.ShowDropDownArrow = False
-        Me.btnLöschen.Size = New System.Drawing.Size(20, 20)
-        Me.btnLöschen.Text = "Profil löschen"
-        '
-        'btnHinzufügen
-        '
-        Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add
-        Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnHinzufügen.Name = "btnHinzufügen"
-        Me.btnHinzufügen.ShowDropDownArrow = False
-        Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20)
-        Me.btnHinzufügen.Text = "Profil hinzufügen"
-        '
-        'tsbtnfirst
-        '
-        Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnfirst.DoubleClickEnabled = True
-        Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind
-        Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnfirst.Name = "tsbtnfirst"
-        Me.tsbtnfirst.ShowDropDownArrow = False
-        Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnfirst.Text = "Erstes Profil"
-        '
-        'tsbtnprevious
-        '
-        Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left
-        Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnprevious.Name = "tsbtnprevious"
-        Me.tsbtnprevious.ShowDropDownArrow = False
-        Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnprevious.Text = "ToolStripDropDownButton2"
-        Me.tsbtnprevious.ToolTipText = "Vorheriges Profil"
-        '
-        'tsbtnnext
-        '
-        Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right
-        Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnnext.Name = "tsbtnnext"
-        Me.tsbtnnext.ShowDropDownArrow = False
-        Me.tsbtnnext.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnnext.Text = "ToolStripDropDownButton3"
-        Me.tsbtnnext.ToolTipText = "Nächstes Profil"
-        '
-        'tsbtnlast
-        '
-        Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward
-        Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnlast.Name = "tsbtnlast"
-        Me.tsbtnlast.ShowDropDownArrow = False
-        Me.tsbtnlast.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnlast.Text = "Letztes Profil"
-        '
         'frmDIProfilEigenschaften
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -750,8 +629,6 @@ Partial Class frmDIProfilEigenschaften
         Me.StatusStrip1.PerformLayout()
         Me.pnlProfileigenschaften.ResumeLayout(False)
         Me.pnlProfileigenschaften.PerformLayout()
-        Me.GroupBox3.ResumeLayout(False)
-        Me.GroupBox3.PerformLayout()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
@@ -775,7 +652,6 @@ Partial Class frmDIProfilEigenschaften
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents btnRegeln As System.Windows.Forms.Button
     Friend WithEvents boxImportoptionenLoeschen As System.Windows.Forms.GroupBox
-    Friend WithEvents chkQuellverzeichnisLoeschen As System.Windows.Forms.CheckBox
     Friend WithEvents chkDateienLoeschen As System.Windows.Forms.CheckBox
     Friend WithEvents boxImportoptionenBackup As System.Windows.Forms.GroupBox
     Friend WithEvents txtBackupordner As System.Windows.Forms.TextBox
@@ -808,16 +684,7 @@ Partial Class frmDIProfilEigenschaften
     Friend WithEvents tsbtnlast As System.Windows.Forms.ToolStripDropDownButton
     Friend WithEvents tslblAnzahl As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents lblProfil As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
-    Friend WithEvents chkbxlink2Navision As System.Windows.Forms.CheckBox
-    Friend WithEvents Label8 As System.Windows.Forms.Label
-    Friend WithEvents btnLink2Navision As System.Windows.Forms.Button
-    Friend WithEvents txtLink2Navision As System.Windows.Forms.TextBox
     Friend WithEvents OpenFileDialog1 As System.Windows.Forms.OpenFileDialog
-    Friend WithEvents cmbl2NavDokartindex As System.Windows.Forms.ComboBox
-    Friend WithEvents Label9 As System.Windows.Forms.Label
-    Friend WithEvents Label10 As System.Windows.Forms.Label
-    Friend WithEvents cmbl2Nav_Index As System.Windows.Forms.ComboBox
     Friend WithEvents chkb_Subdirectories As System.Windows.Forms.CheckBox
     Friend WithEvents chkUVloeschen As System.Windows.Forms.CheckBox
     Friend WithEvents rbUV_Date3 As System.Windows.Forms.RadioButton

ToolCollection/frmDIProfilEigenschaften.vb

@@ -4,7 +4,6 @@ Imports System.IO
 Public Class frmDIProfilEigenschaften
     ' entspricht dem, über die Toolbar-Combobox ausgewählten, Profil und enthält alle relevanten Informationen darüber
     Private selectedProfile As ClassDIProfil
-    Private licenseManager As ClassLicenseManager
     Dim Formloaded As Boolean = False
     'Zum Speichern der Positionen
     Dim _pos As Integer
@@ -28,14 +27,7 @@ Public Class frmDIProfilEigenschaften
 
         ' alle Profile in die Toolbar-Combobox eintragen
         Me.LoadProfilesInCombobox()
-        Try
-            Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
-            Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
-            Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-            Me.licenseManager.LoadLicenses()
-        Catch ex As Exception
-            MsgBox("Fehler beim Laden der Lizenzen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
+
     End Sub
     Public Sub ReDimEx(ByRef MyArray As Object, ByVal iDimX As Integer, ByVal iDimY As Integer)
 
@@ -57,11 +49,11 @@ Public Class frmDIProfilEigenschaften
     End Sub
     Private Sub LoadProfilesInCombobox()
         'Schreibt die Profile in die Combobox in der Toolbar.
-        Try
-            ClassDIProfile.Init()
-            Me.cmbProfilauswahl.DropDownItems.Clear()
+        'Try
+        ClassDIProfile.Init()
 
-            If ClassDIProfile.Profile IsNot Nothing Then
+        Me.cmbProfilauswahl.DropDownItems.Clear()
+        If ClassDIProfile.Profile IsNot Nothing Then
                 Dim anz As Integer = 0
                 For Each item As ClassDIProfil In ClassDIProfile.Profile
                     Me.cmbProfilauswahl.DropDownItems.Add(item.Profilname)
@@ -73,9 +65,9 @@ Public Class frmDIProfilEigenschaften
                 Prof_Anzahl = anz
                 Me.tslblAnzahl.Text = "Anzahl Profile: " & anz
             End If
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Profile in Auswahlliste:")
-        End Try
+        'Catch ex As Exception
+        '    MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Profile in Auswahlliste:")
+        'End Try
     End Sub
     Sub Lade_Profil(ByVal profilname As String)
         ' das ausgewählte Profil in selectedProfile laden
@@ -138,23 +130,6 @@ Public Class frmDIProfilEigenschaften
             Me.txtBackupordner.Text = Me.selectedProfile.Backupordner
             Me.chkDateienUeberschreiben.Checked = Me.selectedProfile.Overwrite
             Me.chkDateienLoeschen.Checked = Me.selectedProfile.DateiLöschen
-            Me.chkQuellverzeichnisLoeschen.Checked = Me.selectedProfile.VerzeichnisLöschen
-            Me.chkbxlink2Navision.Checked = Me.selectedProfile.Link2Navision
-            If Me.chkbxlink2Navision.Checked = True Then
-                Me.txtLink2Navision.Text = My.Settings.PathLink2Navision
-                Me.txtLink2Navision.Enabled = True
-                Me.btnLink2Navision.Enabled = True
-                Me.cmbl2Nav_Index.Enabled = True
-                Me.cmbl2NavDokartindex.Enabled = True
-
-                load_indexe_inComboboxen()
-
-            Else
-                Me.txtLink2Navision.Enabled = False
-                Me.btnLink2Navision.Enabled = False
-                Me.cmbl2Nav_Index.Enabled = False
-                Me.cmbl2NavDokartindex.Enabled = False
-            End If
 
             If CBool(Me.selectedProfile.Aktiv) = True Then
                 Me.chkbxAktiv.Checked = True
@@ -183,7 +158,6 @@ Public Class frmDIProfilEigenschaften
         Me.txtBackupordner.Enabled = Me.chkImportoptionenBackup.Checked
         Me.btnBackupordner.Enabled = Me.chkImportoptionenBackup.Checked
         Me.chkDateienUeberschreiben.Enabled = Me.chkImportoptionenBackup.Checked
-        Me.chkQuellverzeichnisLoeschen.Enabled = Me.chkDateienLoeschen.Checked
         'End If
     End Sub
     Sub rbBoxenenablen()
@@ -197,49 +171,14 @@ Public Class frmDIProfilEigenschaften
             rbUV_Date3.Enabled = True
         End If
     End Sub
-    Sub load_indexe_inComboboxen()
-        Me.cmbl2NavDokartindex.Items.Clear()
-        Me.cmbl2Nav_Index.Items.Clear()
-        Dim indexe = _windream.GetIndicesByObjecttype(Me.selectedProfile.DokumenttypString, True, "DI")
-        If indexe IsNot Nothing Then
-            Me.cmbl2NavDokartindex.Items.Add("")
-            Me.cmbl2Nav_Index.Items.Add("")
-            For Each index As String In indexe
-                Me.cmbl2NavDokartindex.Items.Add(index)
-                Me.cmbl2Nav_Index.Items.Add(index)
-            Next
-            Me.cmbl2NavDokartindex.SelectedIndex = -1
-            Me.cmbl2NavDokartindex.SelectedItem = 0
-            Me.cmbl2Nav_Index.SelectedIndex = -1
-            Me.cmbl2Nav_Index.SelectedItem = 0
 
-            If Me.selectedProfile.Link2Navision_dokart <> "" Then
-                'Wenn bereits eine Dokart gewählt wurde
-                Me.cmbl2NavDokartindex.SelectedIndex = Me.cmbl2NavDokartindex.FindStringExact(Me.selectedProfile.Link2Navision_dokart)
-            Else
-                'Wenn noch KEINE Dokart gewählt wurde
-                Me.cmbl2NavDokartindex.SelectedIndex = -1
-                Me.cmbl2NavDokartindex.SelectedItem = ""
-            End If
-            If Me.selectedProfile.Link2Navision_Index <> "" Then
-                'Wenn bereits ein Index gewählt wurde
-                Me.cmbl2Nav_Index.SelectedIndex = Me.cmbl2Nav_Index.FindStringExact(Me.selectedProfile.Link2Navision_Index)
-            Else
-                'Wenn noch KEIN Index gewählt wurde
-                Me.cmbl2Nav_Index.SelectedIndex = -1
-                Me.cmbl2Nav_Index.SelectedItem = ""
-            End If
-        End If
-    End Sub
     ' ++++++++++++++++++++++++++++++++++++++++++++++ Events ++++++++++++++++++++++++++++++++++++++++++++++
 
     ' +++ Elemente auf Toolbar +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     Private Sub cmbProfilauswahl_DropDownItemClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ToolStripItemClickedEventArgs) Handles cmbProfilauswahl.DropDownItemClicked
 
-        ' wenn bereits ein Profil ausgewählt wurde
         If Me.selectedProfile IsNot Nothing Then
-            ' wenn es sich bei dem ausgewählten Element um das gleiche handelt wie das Aktive, dann nichts tun
             If e.ClickedItem.Text = Me.selectedProfile.Profilname Then Exit Sub
 
             If selectedProfile.HasChanges Then
@@ -251,30 +190,18 @@ Public Class frmDIProfilEigenschaften
         'Dim changeProfile As Boolean = Me.AskToSaveIfNeccessary(False)
 
         Lade_Profil(e.ClickedItem.Text)
-
+        For i = 0 To arrProfile.GetUpperBound(0)
+            If arrProfile(i, 0) = e.ClickedItem.Text Then
+                _pos = arrProfile(i, 1)
+            End If
+        Next
 
     End Sub
 
     Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click
-        Try
-            For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                Select Case license.Modulename.ToUpper
-                    Case "DATEIIMPORT"
-                        If Prof_Anzahl + 1 > license.Anz_Profile Then
-                            MsgBox("Die Maximalanzahl der lizensierten Dateiimport-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
-                            Exit Sub
-                        End If
-                End Select
-
-            Next
-        Catch ex As Exception
-            If My.Settings.licensekey <> "DD MaxLicense" Or My.Settings.licensekey.ToUpper <> "DDALLIN" Or My.Settings.licensekey.ToUpper <> "DD_ALL_IN" Then
-                MsgBox("Error Adding Profile due to license issue!", MsgBoxStyle.Critical)
-            End If
-        End Try
-
         ' das Formular zum Erstellen eines neuen Profil öffnen
-        frmLogin_DI.ShowDialog()
+        frmDIProfilHinzufuegen.ShowDialog()
+        'frmLogin_DI.ShowDialog()
         'frmDIProfilHinzufuegen.ShowDialog()
         ' wenn das Formular geschlossen wurde, werden die Profile neu in die Combobox geladen
         Me.LoadProfilesInCombobox()
@@ -299,6 +226,8 @@ Public Class frmDIProfilEigenschaften
                 Me.btnLöschen.Enabled = False
                 ' kein Profil als selektiert wählen
                 Me.selectedProfile = Nothing
+
+                Me.lblProfil.Text = "Kein Profil gewählt"
                 ' die Profile neu in die Combobox laden
                 Me.LoadProfilesInCombobox()
             End If
@@ -354,7 +283,6 @@ Public Class frmDIProfilEigenschaften
                 Me.chkDateienLoeschen.Checked = Me.selectedProfile.DateiLöschen
                 Me.chkDateienUeberschreiben.Checked = Me.selectedProfile.Overwrite
                 Me.chkImportoptionenBackup.Checked = Me.selectedProfile.Backup
-                Me.chkQuellverzeichnisLoeschen.Checked = Me.selectedProfile.DateiLöschen
             End If
 
         End If
@@ -521,7 +449,7 @@ Public Class frmDIProfilEigenschaften
             Else
                 MsgBox("Der angegebene Quellordner '" & txtQuellordner.Text & "' existiert nicht!", MsgBoxStyle.Exclamation, "Achtung:")
             End If
-           
+
         End If
     End Sub
 
@@ -537,7 +465,7 @@ Public Class frmDIProfilEigenschaften
             Else
                 MsgBox("Der angegebene Ordner '" & txtZielordner.Text & "' existiert nicht!", MsgBoxStyle.Exclamation, "Achtung:")
             End If
-           
+
         End If
     End Sub
 
@@ -575,7 +503,7 @@ Public Class frmDIProfilEigenschaften
             Else
                 MsgBox("Der angegebene Ordner '" & txtBackupordner.Text & "' existiert nicht!", MsgBoxStyle.Exclamation, "Achtung:")
             End If
-          
+
         End If
     End Sub
 
@@ -601,17 +529,6 @@ Public Class frmDIProfilEigenschaften
         End If
     End Sub
 
-    Private Sub chkQuellverzeichnisLoeschen_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkQuellverzeichnisLoeschen.CheckedChanged
-        If Me.selectedProfile IsNot Nothing Then
-            Me.selectedProfile.VerzeichnisLöschen = Me.chkQuellverzeichnisLoeschen.Checked
-            If Not Me.chkQuellverzeichnisLoeschen.Checked = Me.selectedProfile.OriginalVerzeichnisLöschen Then
-                Me.btnSpeichern.Enabled = True
-            Else
-                Me.btnSpeichern.Enabled = False
-            End If
-        End If
-    End Sub
-
     Private Sub btnRegeln_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnRegeln.Click
 
         'Dim regelverwaltung As Control = New pnlDateiimportRegelverwaltung()
@@ -653,7 +570,7 @@ Public Class frmDIProfilEigenschaften
                     rbUV_Date1.Checked = True
                     variante = "YYYY-MM-DD"
             End Select
-                txtUV_Date.Text = variante
+            txtUV_Date.Text = variante
         Else
             txtUV_Date.Text = ""
         End If
@@ -799,44 +716,6 @@ Public Class frmDIProfilEigenschaften
         End If
     End Sub
 
-    Private Sub chkbxlink2Navision_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles chkbxlink2Navision.CheckedChanged
-        If Me.selectedProfile IsNot Nothing Then
-            Me.selectedProfile.Link2Navision = Me.chkbxlink2Navision.Checked
-            If Not Me.chkbxlink2Navision.Checked = Me.selectedProfile.OriginalLink2Navision Then
-                Me.btnSpeichern.Enabled = True
-            Else
-                Me.btnSpeichern.Enabled = False
-            End If
-            If Me.chkbxlink2Navision.Checked Then
-                Me.txtLink2Navision.Enabled = True
-                Me.btnLink2Navision.Enabled = True
-                Me.cmbl2NavDokartindex.Enabled = True
-                Me.cmbl2Nav_Index.Enabled = True
-
-                load_indexe_inComboboxen()
-
-            Else
-                Me.txtLink2Navision.Enabled = False
-                Me.btnLink2Navision.Enabled = False
-                Me.cmbl2NavDokartindex.Enabled = False
-                Me.cmbl2Nav_Index.Enabled = False
-            End If
-        End If
-    End Sub
-
-    Private Sub btnLink2Navision_Click(sender As System.Object, e As System.EventArgs) Handles btnLink2Navision.Click
-        With OpenFileDialog1
-            ' Do
-            .Filter = "NavisionLink.exe|*.exe"
-            .FilterIndex = 1
-            .Title = "Pfad zu DDNavisionLink:"
-            If .ShowDialog() = DialogResult.OK Then
-                Me.txtLink2Navision.Text = .FileName
-                setAppSetting("PathLink2Navision", .FileName)
-                Me.txtLink2Navision.Text = .FileName
-            End If
-        End With
-    End Sub
     Private Sub setAppSetting(ByVal name As String, ByVal value As String)
         Dim _folder As New IO.DirectoryInfo(System.IO.Directory.GetCurrentDirectory())
         Dim aryFi1 As IO.FileInfo() = _folder.GetFiles("*.config")
@@ -855,32 +734,6 @@ Public Class frmDIProfilEigenschaften
 
     End Sub
 
-    Private Sub cmbl2NavDokartindex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbl2NavDokartindex.SelectedIndexChanged
-        If Me.selectedProfile IsNot Nothing Then
-            If Me.cmbl2NavDokartindex.SelectedIndex <> -1 Then
-                Me.selectedProfile.Link2Navision_dokart = Me.cmbl2NavDokartindex.Text
-                If Not Me.selectedProfile.Link2Navision_dokart = Me.selectedProfile.OriginalLink2Navision_dokart Then
-                    Me.btnSpeichern.Enabled = True
-                Else
-                    Me.btnSpeichern.Enabled = False
-                End If
-            End If
-        End If
-    End Sub
-
-    Private Sub cmbl2Nav_Index_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbl2Nav_Index.SelectedIndexChanged
-        If Me.selectedProfile IsNot Nothing Then
-            If Me.cmbl2Nav_Index.SelectedIndex <> -1 Then
-                Me.selectedProfile.Link2Navision_Index = Me.cmbl2Nav_Index.Text
-                If Not Me.selectedProfile.Link2Navision_Index = Me.selectedProfile.Link2Navision_Index Then
-                    Me.btnSpeichern.Enabled = True
-                Else
-                    Me.btnSpeichern.Enabled = False
-                End If
-            End If
-        End If
-    End Sub
-
     Private Sub cmbProfilauswahl_ButtonClick(sender As System.Object, e As System.EventArgs) Handles cmbProfilauswahl.ButtonClick
 
     End Sub

ToolCollection/frmDIProfilHinzufuegen.Designer.vb

@@ -50,9 +50,9 @@ Partial Class frmDIProfilHinzufuegen
         Me.btnZielverzeichnisLöschen = New System.Windows.Forms.Button()
         Me.btnQuellverzeichnisLöschen = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.Label6 = New System.Windows.Forms.Label()
         Me.chkb_DateUV = New System.Windows.Forms.CheckBox()
         Me.chkb_Subdirectories = New System.Windows.Forms.CheckBox()
-        Me.Label6 = New System.Windows.Forms.Label()
         Me.boxImportoptionenLoeschen.SuspendLayout()
         Me.boxImportoptionenBackup.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
@@ -74,7 +74,7 @@ Partial Class frmDIProfilHinzufuegen
         '
         Me.chkUVloeschen.AutoSize = True
         Me.chkUVloeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkUVloeschen.Location = New System.Drawing.Point(250, 42)
+        Me.chkUVloeschen.Location = New System.Drawing.Point(8, 42)
         Me.chkUVloeschen.Name = "chkUVloeschen"
         Me.chkUVloeschen.Size = New System.Drawing.Size(230, 17)
         Me.chkUVloeschen.TabIndex = 18
@@ -86,12 +86,13 @@ Partial Class frmDIProfilHinzufuegen
         '
         Me.chkQuellverzeichnisLoeschen.AutoSize = True
         Me.chkQuellverzeichnisLoeschen.Enabled = False
-        Me.chkQuellverzeichnisLoeschen.Location = New System.Drawing.Point(8, 42)
+        Me.chkQuellverzeichnisLoeschen.Location = New System.Drawing.Point(250, 19)
         Me.chkQuellverzeichnisLoeschen.Name = "chkQuellverzeichnisLoeschen"
         Me.chkQuellverzeichnisLoeschen.Size = New System.Drawing.Size(217, 17)
         Me.chkQuellverzeichnisLoeschen.TabIndex = 17
         Me.chkQuellverzeichnisLoeschen.Text = "Quellverzeichnis nach Import löschen"
         Me.chkQuellverzeichnisLoeschen.UseVisualStyleBackColor = True
+        Me.chkQuellverzeichnisLoeschen.Visible = False
         '
         'chkDateienLoeschen
         '
@@ -326,6 +327,17 @@ Partial Class frmDIProfilHinzufuegen
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Erweiterte Ordnerstrukturen"
         '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label6.Location = New System.Drawing.Point(28, 40)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(243, 15)
+        Me.Label6.TabIndex = 1
+        Me.Label6.Text = "Detaileinstellungen nach Speichern im Profil"
+        Me.Label6.Visible = False
+        '
         'chkb_DateUV
         '
         Me.chkb_DateUV.AutoSize = True
@@ -346,17 +358,6 @@ Partial Class frmDIProfilHinzufuegen
         Me.chkb_Subdirectories.Text = "Unterverzeichnisse einbeziehen (Ordnerstruktur wird komplett übernommen)"
         Me.chkb_Subdirectories.UseVisualStyleBackColor = True
         '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(28, 40)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(243, 15)
-        Me.Label6.TabIndex = 1
-        Me.Label6.Text = "Detaileinstellungen nach Speichern im Profil"
-        Me.Label6.Visible = False
-        '
         'frmDIProfilHinzufuegen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

ToolCollection/frmDIProfilHinzufuegen.resx

@@ -121,17 +121,17 @@
   <data name="btnBackupverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
-        C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
-        cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
-        dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
-        dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
-        J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
-        0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
-        QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
-        gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
-        fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
-        AAAAAElFTkSuQmCC
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
+        OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
+        Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
+        M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
+        Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
+        NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
+        UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
+        GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
+        uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
+        o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <metadata name="dlgQuellordner.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -146,33 +146,33 @@
   <data name="btnZielverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
-        C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
-        cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
-        dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
-        dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
-        J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
-        0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
-        QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
-        gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
-        fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
-        AAAAAElFTkSuQmCC
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
+        OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
+        Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
+        M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
+        Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
+        NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
+        UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
+        GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
+        uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
+        o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="btnQuellverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
-        C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
-        cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
-        dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
-        dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
-        J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
-        0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
-        QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
-        gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
-        fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
-        AAAAAElFTkSuQmCC
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
+        OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
+        Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
+        M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
+        Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
+        NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
+        UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
+        GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
+        uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
+        o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

ToolCollection/frmDIProfilHinzufuegen.vb

@@ -31,7 +31,6 @@
         Me.chkQuellverzeichnisLoeschen.Checked = False
 
         Me.ObjekttypenEintragen()
-        frmLogin_DI.Close()
         Label6.Visible = False
     End Sub
     Private Sub btnQuellordner_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnQuellordner.Click

ToolCollection/frmGrundeinstellungen.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmGrundeinstellungen
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmGrundeinstellungen
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGrundeinstellungen))
         Me.Label1 = New System.Windows.Forms.Label()
@@ -28,29 +28,37 @@ Partial Class frmGrundeinstellungen
         Me.cmlLogart = New System.Windows.Forms.ComboBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.TextBox4 = New System.Windows.Forms.TextBox()
+        Me.lblLogDeleteTime = New System.Windows.Forms.Label()
+        Me.lblTimeDeleteLogs = New System.Windows.Forms.Label()
+        Me.txtTimeDeleteLogs = New System.Windows.Forms.TextBox()
+        Me.chkAutoDeleteLogs = New System.Windows.Forms.CheckBox()
         Me.Label6 = New System.Windows.Forms.Label()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.cmbCores = New System.Windows.Forms.ComboBox()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.txterrorIndex = New System.Windows.Forms.TextBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
-        Me.TextBox3 = New System.Windows.Forms.TextBox()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
-        Me.cmbSleeptill = New System.Windows.Forms.ComboBox()
         Me.Label9 = New System.Windows.Forms.Label()
-        Me.cmbSleepFrom = New System.Windows.Forms.ComboBox()
         Me.Label8 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
+        Me.GroupBox6 = New System.Windows.Forms.GroupBox()
+        Me.txtInstanceName = New System.Windows.Forms.TextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.cmbSleeptill = New System.Windows.Forms.ComboBox()
+        Me.cmbSleepFrom = New System.Windows.Forms.ComboBox()
+        Me.TextBox3 = New System.Windows.Forms.TextBox()
+        Me.txterrorIndex = New System.Windows.Forms.TextBox()
+        Me.TextBox4 = New System.Windows.Forms.TextBox()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
         Me.GroupBox4.SuspendLayout()
         Me.GroupBox5.SuspendLayout()
+        Me.GroupBox6.SuspendLayout()
         Me.SuspendLayout()
         '
         'Label1
@@ -91,6 +99,10 @@ Partial Class frmGrundeinstellungen
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.lblLogDeleteTime)
+        Me.GroupBox1.Controls.Add(Me.lblTimeDeleteLogs)
+        Me.GroupBox1.Controls.Add(Me.txtTimeDeleteLogs)
+        Me.GroupBox1.Controls.Add(Me.chkAutoDeleteLogs)
         Me.GroupBox1.Controls.Add(Me.TextBox4)
         Me.GroupBox1.Controls.Add(Me.Label6)
         Me.GroupBox1.Controls.Add(Me.Label1)
@@ -102,19 +114,45 @@ Partial Class frmGrundeinstellungen
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top
         Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(470, 114)
+        Me.GroupBox1.Size = New System.Drawing.Size(470, 209)
         Me.GroupBox1.TabIndex = 6
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Log-Einstellungen:"
         '
-        'TextBox4
+        'lblLogDeleteTime
         '
-        Me.TextBox4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "logolder_then", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.TextBox4.Location = New System.Drawing.Point(232, 79)
-        Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(84, 22)
-        Me.TextBox4.TabIndex = 7
-        Me.TextBox4.Text = Global.ToolCollection.My.MySettings.Default.logolder_then
+        Me.lblLogDeleteTime.AutoSize = True
+        Me.lblLogDeleteTime.Location = New System.Drawing.Point(6, 169)
+        Me.lblLogDeleteTime.Name = "lblLogDeleteTime"
+        Me.lblLogDeleteTime.Size = New System.Drawing.Size(211, 13)
+        Me.lblLogDeleteTime.TabIndex = 11
+        Me.lblLogDeleteTime.Text = "Logs werden automatisch gelöscht um: "
+        '
+        'lblTimeDeleteLogs
+        '
+        Me.lblTimeDeleteLogs.AutoSize = True
+        Me.lblTimeDeleteLogs.Location = New System.Drawing.Point(229, 112)
+        Me.lblTimeDeleteLogs.Name = "lblTimeDeleteLogs"
+        Me.lblTimeDeleteLogs.Size = New System.Drawing.Size(209, 13)
+        Me.lblTimeDeleteLogs.TabIndex = 10
+        Me.lblTimeDeleteLogs.Text = "Zeitpunkt der automatischen Löschung"
+        '
+        'txtTimeDeleteLogs
+        '
+        Me.txtTimeDeleteLogs.Location = New System.Drawing.Point(232, 128)
+        Me.txtTimeDeleteLogs.Name = "txtTimeDeleteLogs"
+        Me.txtTimeDeleteLogs.Size = New System.Drawing.Size(84, 22)
+        Me.txtTimeDeleteLogs.TabIndex = 9
+        '
+        'chkAutoDeleteLogs
+        '
+        Me.chkAutoDeleteLogs.AutoSize = True
+        Me.chkAutoDeleteLogs.Location = New System.Drawing.Point(9, 130)
+        Me.chkAutoDeleteLogs.Name = "chkAutoDeleteLogs"
+        Me.chkAutoDeleteLogs.Size = New System.Drawing.Size(146, 17)
+        Me.chkAutoDeleteLogs.TabIndex = 8
+        Me.chkAutoDeleteLogs.Text = "Automatisches Löschen"
+        Me.chkAutoDeleteLogs.UseVisualStyleBackColor = True
         '
         'Label6
         '
@@ -125,30 +163,12 @@ Partial Class frmGrundeinstellungen
         Me.Label6.TabIndex = 6
         Me.Label6.Text = "LogDateien löschen - ""Älter als""-Tage:"
         '
-        'TextBox1
-        '
-        Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogNI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.TextBox1.Location = New System.Drawing.Point(9, 34)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(188, 22)
-        Me.TextBox1.TabIndex = 1
-        Me.TextBox1.Text = Global.ToolCollection.My.MySettings.Default.vLogNI
-        '
-        'TextBox2
-        '
-        Me.TextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogDI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.TextBox2.Location = New System.Drawing.Point(9, 79)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(188, 22)
-        Me.TextBox2.TabIndex = 3
-        Me.TextBox2.Text = Global.ToolCollection.My.MySettings.Default.vLogDI
-        '
         'GroupBox2
         '
         Me.GroupBox2.Controls.Add(Me.Label4)
         Me.GroupBox2.Controls.Add(Me.cmbCores)
         Me.GroupBox2.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GroupBox2.Location = New System.Drawing.Point(0, 114)
+        Me.GroupBox2.Location = New System.Drawing.Point(0, 209)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(470, 68)
         Me.GroupBox2.TabIndex = 7
@@ -178,22 +198,13 @@ Partial Class frmGrundeinstellungen
         Me.GroupBox3.Controls.Add(Me.txterrorIndex)
         Me.GroupBox3.Controls.Add(Me.Label5)
         Me.GroupBox3.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GroupBox3.Location = New System.Drawing.Point(0, 182)
+        Me.GroupBox3.Location = New System.Drawing.Point(0, 277)
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.Size = New System.Drawing.Size(470, 67)
         Me.GroupBox3.TabIndex = 8
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Fehlerhandling:"
         '
-        'txterrorIndex
-        '
-        Me.txterrorIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "ERROR_INDEX", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.txterrorIndex.Location = New System.Drawing.Point(15, 34)
-        Me.txterrorIndex.Name = "txterrorIndex"
-        Me.txterrorIndex.Size = New System.Drawing.Size(182, 22)
-        Me.txterrorIndex.TabIndex = 2
-        Me.txterrorIndex.Text = Global.ToolCollection.My.MySettings.Default.ERROR_INDEX
-        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -207,21 +218,13 @@ Partial Class frmGrundeinstellungen
         '
         Me.GroupBox4.Controls.Add(Me.TextBox3)
         Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GroupBox4.Location = New System.Drawing.Point(0, 249)
+        Me.GroupBox4.Location = New System.Drawing.Point(0, 344)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(470, 50)
         Me.GroupBox4.TabIndex = 9
         Me.GroupBox4.TabStop = False
         Me.GroupBox4.Text = "Verweise"
         '
-        'TextBox3
-        '
-        Me.TextBox3.Location = New System.Drawing.Point(9, 21)
-        Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(188, 22)
-        Me.TextBox3.TabIndex = 0
-        Me.TextBox3.Text = Global.ToolCollection.My.MySettings.Default.DLL_WMOTOOL
-        '
         'GroupBox5
         '
         Me.GroupBox5.Controls.Add(Me.cmbSleeptill)
@@ -230,23 +233,13 @@ Partial Class frmGrundeinstellungen
         Me.GroupBox5.Controls.Add(Me.Label8)
         Me.GroupBox5.Controls.Add(Me.Label7)
         Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GroupBox5.Location = New System.Drawing.Point(0, 299)
+        Me.GroupBox5.Location = New System.Drawing.Point(0, 394)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(470, 100)
         Me.GroupBox5.TabIndex = 10
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "ToolCollection Sleep-Modus:"
         '
-        'cmbSleeptill
-        '
-        Me.cmbSleeptill.FormattingEnabled = True
-        Me.cmbSleeptill.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"})
-        Me.cmbSleeptill.Location = New System.Drawing.Point(90, 69)
-        Me.cmbSleeptill.Name = "cmbSleeptill"
-        Me.cmbSleeptill.Size = New System.Drawing.Size(63, 21)
-        Me.cmbSleeptill.TabIndex = 4
-        Me.cmbSleeptill.Text = Global.ToolCollection.My.MySettings.Default.Sleep_End
-        '
         'Label9
         '
         Me.Label9.AutoSize = True
@@ -256,16 +249,6 @@ Partial Class frmGrundeinstellungen
         Me.Label9.TabIndex = 3
         Me.Label9.Text = "Stunde bis"
         '
-        'cmbSleepFrom
-        '
-        Me.cmbSleepFrom.FormattingEnabled = True
-        Me.cmbSleepFrom.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"})
-        Me.cmbSleepFrom.Location = New System.Drawing.Point(9, 69)
-        Me.cmbSleepFrom.Name = "cmbSleepFrom"
-        Me.cmbSleepFrom.Size = New System.Drawing.Size(63, 21)
-        Me.cmbSleepFrom.TabIndex = 2
-        Me.cmbSleepFrom.Text = Global.ToolCollection.My.MySettings.Default.Sleep_Begin
-        '
         'Label8
         '
         Me.Label8.AutoSize = True
@@ -285,12 +268,105 @@ Partial Class frmGrundeinstellungen
         Me.Label7.TabIndex = 0
         Me.Label7.Text = "Bestimmen Sie hier die Zeitspanne in welcher weder ein Import " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "noch eine Nachind" &
     "exierung erfolgen soll:"
+        '
+        'GroupBox6
+        '
+        Me.GroupBox6.Controls.Add(Me.Label10)
+        Me.GroupBox6.Controls.Add(Me.txtInstanceName)
+        Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Top
+        Me.GroupBox6.Location = New System.Drawing.Point(0, 494)
+        Me.GroupBox6.Name = "GroupBox6"
+        Me.GroupBox6.Size = New System.Drawing.Size(470, 74)
+        Me.GroupBox6.TabIndex = 11
+        Me.GroupBox6.TabStop = False
+        Me.GroupBox6.Text = "Instanz-Einstellungen"
+        '
+        'txtInstanceName
+        '
+        Me.txtInstanceName.Location = New System.Drawing.Point(15, 36)
+        Me.txtInstanceName.Name = "txtInstanceName"
+        Me.txtInstanceName.Size = New System.Drawing.Size(182, 22)
+        Me.txtInstanceName.TabIndex = 0
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(12, 20)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(97, 13)
+        Me.Label10.TabIndex = 1
+        Me.Label10.Text = "Name für Instanz:"
+        '
+        'cmbSleeptill
+        '
+        Me.cmbSleeptill.FormattingEnabled = True
+        Me.cmbSleeptill.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"})
+        Me.cmbSleeptill.Location = New System.Drawing.Point(90, 69)
+        Me.cmbSleeptill.Name = "cmbSleeptill"
+        Me.cmbSleeptill.Size = New System.Drawing.Size(63, 21)
+        Me.cmbSleeptill.TabIndex = 4
+        Me.cmbSleeptill.Text = Global.ToolCollection.My.MySettings.Default.Sleep_End
+        '
+        'cmbSleepFrom
+        '
+        Me.cmbSleepFrom.FormattingEnabled = True
+        Me.cmbSleepFrom.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"})
+        Me.cmbSleepFrom.Location = New System.Drawing.Point(9, 69)
+        Me.cmbSleepFrom.Name = "cmbSleepFrom"
+        Me.cmbSleepFrom.Size = New System.Drawing.Size(63, 21)
+        Me.cmbSleepFrom.TabIndex = 2
+        Me.cmbSleepFrom.Text = Global.ToolCollection.My.MySettings.Default.Sleep_Begin
+        '
+        'TextBox3
+        '
+        Me.TextBox3.Location = New System.Drawing.Point(15, 21)
+        Me.TextBox3.Name = "TextBox3"
+        Me.TextBox3.Size = New System.Drawing.Size(182, 22)
+        Me.TextBox3.TabIndex = 0
+        Me.TextBox3.Text = Global.ToolCollection.My.MySettings.Default.DLL_WMOTOOL
+        '
+        'txterrorIndex
+        '
+        Me.txterrorIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "ERROR_INDEX", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.txterrorIndex.Location = New System.Drawing.Point(15, 34)
+        Me.txterrorIndex.Name = "txterrorIndex"
+        Me.txterrorIndex.Size = New System.Drawing.Size(182, 22)
+        Me.txterrorIndex.TabIndex = 2
+        Me.txterrorIndex.Text = Global.ToolCollection.My.MySettings.Default.ERROR_INDEX
+        '
+        'TextBox4
+        '
+        Me.TextBox4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "logolder_then", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.TextBox4.Location = New System.Drawing.Point(232, 79)
+        Me.TextBox4.Name = "TextBox4"
+        Me.TextBox4.Size = New System.Drawing.Size(84, 22)
+        Me.TextBox4.TabIndex = 7
+        Me.TextBox4.Text = Global.ToolCollection.My.MySettings.Default.logolder_then
+        '
+        'TextBox1
+        '
+        Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogNI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.TextBox1.Location = New System.Drawing.Point(9, 34)
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.Size = New System.Drawing.Size(188, 22)
+        Me.TextBox1.TabIndex = 1
+        Me.TextBox1.Text = Global.ToolCollection.My.MySettings.Default.vLogNI
+        '
+        'TextBox2
+        '
+        Me.TextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogDI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.TextBox2.Location = New System.Drawing.Point(9, 79)
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Size = New System.Drawing.Size(188, 22)
+        Me.TextBox2.TabIndex = 3
+        Me.TextBox2.Text = Global.ToolCollection.My.MySettings.Default.vLogDI
         '
         'frmGrundeinstellungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(470, 407)
+        Me.ClientSize = New System.Drawing.Size(470, 607)
+        Me.Controls.Add(Me.GroupBox6)
         Me.Controls.Add(Me.GroupBox5)
         Me.Controls.Add(Me.GroupBox4)
         Me.Controls.Add(Me.GroupBox3)
@@ -310,6 +386,8 @@ Partial Class frmGrundeinstellungen
         Me.GroupBox4.PerformLayout()
         Me.GroupBox5.ResumeLayout(False)
         Me.GroupBox5.PerformLayout()
+        Me.GroupBox6.ResumeLayout(False)
+        Me.GroupBox6.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -336,4 +414,11 @@ Partial Class frmGrundeinstellungen
     Friend WithEvents cmbSleeptill As System.Windows.Forms.ComboBox
     Friend WithEvents Label9 As System.Windows.Forms.Label
     Friend WithEvents cmbSleepFrom As System.Windows.Forms.ComboBox
+    Friend WithEvents chkAutoDeleteLogs As CheckBox
+    Friend WithEvents lblTimeDeleteLogs As Label
+    Friend WithEvents txtTimeDeleteLogs As TextBox
+    Friend WithEvents lblLogDeleteTime As Label
+    Friend WithEvents GroupBox6 As GroupBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents txtInstanceName As TextBox
 End Class

ToolCollection/frmGrundeinstellungen.vb

@@ -1,5 +1,10 @@
-Public Class frmGrundeinstellungen
+Imports ToolCollection.My
+
+Public Class frmGrundeinstellungen
+
     Private Shared _Instance As frmGrundeinstellungen = Nothing
+    Private _isLoading As Boolean = False
+
     Public Shared Function Instance() As frmGrundeinstellungen
         If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then
             _Instance = New frmGrundeinstellungen
@@ -20,7 +25,8 @@
         End If
     End Sub
 
-    Private Sub frmGrundeinstellungen_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
+    Private Sub frmGrundeinstellungen_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        txtTimeDeleteLogs.Text = My.Settings.vDeleteLogsTime
         My.Settings.Save()
     End Sub
 
@@ -56,4 +62,90 @@
     Private Sub txterrorIndex_TextChanged(sender As Object, e As EventArgs) Handles txterrorIndex.TextChanged
 
     End Sub
+
+    Private Sub chkAutoDeleteLogs_CheckedChanged(sender As Object, e As EventArgs) Handles chkAutoDeleteLogs.CheckedChanged
+        If _isLoading Then Exit Sub
+
+        If chkAutoDeleteLogs.Checked Then
+
+            Dim dt As DateTime
+            If Not DateTime.TryParse(txtTimeDeleteLogs.Text, dt) Then
+                MsgBox("Ungültige Eingabe! Der Zeitpunkt für die Löschung wurde auf 03:00 Uhr gesetzt. Bitte geben Sie die Uhrzeit in folgendem Format ein: HH:mm.", MsgBoxStyle.Information)
+                'chkAutoDeleteLogs.Checked = False
+                'txtTimeDeleteLogs.Text = ""
+                My.Settings.vAutoDeleteLogs = chkAutoDeleteLogs.Checked
+                txtTimeDeleteLogs.Text = My.Settings.vDefaultDeleteLogsTime.ToShortTimeString
+                My.Settings.Save()
+            Else
+                My.Settings.vDeleteLogsTime = txtTimeDeleteLogs.Text
+                My.Settings.vAutoDeleteLogs = chkAutoDeleteLogs.Checked
+                My.Settings.Save()
+                lblLogDeleteTime.Text = "Logs werden automatisch gelöscht um: " & My.Settings.vDeleteLogsTime.ToShortTimeString & " Uhr."
+                frmStart.Instance().ToolStripStatusLabel_LogDeleteTime.Text = "Logs werden automatisch gelöscht um: " & My.Settings.vDeleteLogsTime.ToShortTimeString & " Uhr."
+
+                frmStart.Instance().SetupTimerDeleteLogfiles()
+            End If
+
+        Else
+            txtTimeDeleteLogs.Text = ""
+            My.Settings.vAutoDeleteLogs = chkAutoDeleteLogs.Checked
+            My.Settings.Save()
+
+            lblLogDeleteTime.Text = "Automatisches Löschen von Logs ist inaktiv."
+            frmStart.Instance().ToolStripStatusLabel_LogDeleteTime.Text = "Automatisches Löschen von Logs ist inaktiv."
+            frmStart.Instance().TimerDeleteLogfiles.Stop()
+        End If
+    End Sub
+
+    Private Sub FrmGrundeinstellungen_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+        _isLoading = True
+
+        txtInstanceName.Text = My.Settings.vInstanceName
+
+        Try
+            If My.Settings.vAutoDeleteLogs Then
+                chkAutoDeleteLogs.Checked = My.Settings.vAutoDeleteLogs
+                If String.IsNullOrWhiteSpace(My.Settings.vDeleteLogsTime.ToString) Then
+                    txtTimeDeleteLogs.Text = My.Settings.vDefaultDeleteLogsTime.ToShortTimeString
+                    lblLogDeleteTime.Text = "Logs werden automatisch gelöscht um: " & My.Settings.vDefaultDeleteLogsTime.ToShortTimeString & " Uhr."
+                Else
+                    txtTimeDeleteLogs.Text = My.Settings.vDeleteLogsTime.ToShortTimeString
+                    lblLogDeleteTime.Text = "Logs werden automatisch gelöscht um: " & My.Settings.vDeleteLogsTime.ToShortTimeString & " Uhr."
+                End If
+            Else
+                txtTimeDeleteLogs.Text = ""
+                lblLogDeleteTime.Text = "Automatisches Löschen von Logs ist inaktiv."
+            End If
+        Catch ex As Exception
+
+        End Try
+
+        _isLoading = False
+    End Sub
+
+    Private Sub txtTimeDeleteLogs_TextChanged(sender As Object, e As EventArgs) Handles txtTimeDeleteLogs.TextChanged
+        ' Falls gerade geladen wird oder Checkbox nicht aktiv ist → nichts machen
+        If _isLoading OrElse Not chkAutoDeleteLogs.Checked Then Exit Sub
+
+        Dim dt As DateTime
+        ' Prüfen, ob Eingabe im Format HH:mm gültig ist
+        If DateTime.TryParseExact(txtTimeDeleteLogs.Text, "HH:mm", Nothing, Globalization.DateTimeStyles.None, dt) Then
+            ' Neuen Wert in Settings speichern
+            My.Settings.vDeleteLogsTime = dt
+            My.Settings.Save()
+
+            ' Labels aktualisieren
+            lblLogDeleteTime.Text = $"Logs werden automatisch gelöscht um: {dt:HH:mm} Uhr."
+            frmStart.Instance().ToolStripStatusLabel_LogDeleteTime.Text = lblLogDeleteTime.Text
+
+            ' Timer neu setzen
+            frmStart.Instance().SetupTimerDeleteLogfiles()
+        End If
+    End Sub
+
+    Private Sub txtInstanceName_TextChanged(sender As Object, e As EventArgs) Handles txtInstanceName.TextChanged
+        My.Settings.vInstanceName = txtInstanceName.Text
+        My.Settings.Save()
+        txtInstanceName.Text = My.Settings.vInstanceName
+    End Sub
 End Class

ToolCollection/frmLizenzmanager.Designer.vb

@@ -1,235 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmLizenzmanager
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing AndAlso components IsNot Nothing Then
-            components.Dispose()
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLizenzmanager))
-        Me.txtKey = New System.Windows.Forms.TextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.boxLicenseInfos = New System.Windows.Forms.GroupBox()
-        Me.txtmachine = New System.Windows.Forms.TextBox()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.txtCompany = New System.Windows.Forms.TextBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.lvLicense = New System.Windows.Forms.ListView()
-        Me.clmModulname = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.clmGültigkeit = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.clmType = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.clmAnz = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.btnOK = New System.Windows.Forms.Button()
-        Me.btnAbbrechen = New System.Windows.Forms.Button()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.txtmachineOriginal = New System.Windows.Forms.TextBox()
-        Me.boxLicenseInfos.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'txtKey
-        '
-        Me.txtKey.Location = New System.Drawing.Point(15, 25)
-        Me.txtKey.Multiline = True
-        Me.txtKey.Name = "txtKey"
-        Me.txtKey.Size = New System.Drawing.Size(456, 123)
-        Me.txtKey.TabIndex = 0
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 9)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(87, 13)
-        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "Lizenzschlüssel:"
-        '
-        'boxLicenseInfos
-        '
-        Me.boxLicenseInfos.Controls.Add(Me.txtmachine)
-        Me.boxLicenseInfos.Controls.Add(Me.Label4)
-        Me.boxLicenseInfos.Controls.Add(Me.txtCompany)
-        Me.boxLicenseInfos.Controls.Add(Me.Label3)
-        Me.boxLicenseInfos.Controls.Add(Me.Label2)
-        Me.boxLicenseInfos.Controls.Add(Me.lvLicense)
-        Me.boxLicenseInfos.Location = New System.Drawing.Point(15, 154)
-        Me.boxLicenseInfos.Name = "boxLicenseInfos"
-        Me.boxLicenseInfos.Size = New System.Drawing.Size(456, 349)
-        Me.boxLicenseInfos.TabIndex = 2
-        Me.boxLicenseInfos.TabStop = False
-        Me.boxLicenseInfos.Text = "Lizenzinformationen"
-        '
-        'txtmachine
-        '
-        Me.txtmachine.BackColor = System.Drawing.SystemColors.Window
-        Me.txtmachine.Cursor = System.Windows.Forms.Cursors.Arrow
-        Me.txtmachine.Location = New System.Drawing.Point(15, 81)
-        Me.txtmachine.Name = "txtmachine"
-        Me.txtmachine.ReadOnly = True
-        Me.txtmachine.Size = New System.Drawing.Size(425, 22)
-        Me.txtmachine.TabIndex = 5
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(12, 62)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(130, 13)
-        Me.Label4.TabIndex = 4
-        Me.Label4.Text = "Lizensiert für ""machine"":"
-        '
-        'txtCompany
-        '
-        Me.txtCompany.BackColor = System.Drawing.SystemColors.Window
-        Me.txtCompany.Cursor = System.Windows.Forms.Cursors.Arrow
-        Me.txtCompany.Location = New System.Drawing.Point(15, 40)
-        Me.txtCompany.Name = "txtCompany"
-        Me.txtCompany.ReadOnly = True
-        Me.txtCompany.Size = New System.Drawing.Size(425, 22)
-        Me.txtCompany.TabIndex = 3
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(12, 24)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(100, 13)
-        Me.Label3.TabIndex = 2
-        Me.Label3.Text = "Lizenzeigentümer:"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(12, 106)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(113, 13)
-        Me.Label2.TabIndex = 1
-        Me.Label2.Text = "enthaltene Lizenzen:"
-        '
-        'lvLicense
-        '
-        Me.lvLicense.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.clmModulname, Me.clmGültigkeit, Me.clmType, Me.clmAnz})
-        Me.lvLicense.FullRowSelect = True
-        Me.lvLicense.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
-        Me.lvLicense.HideSelection = False
-        Me.lvLicense.Location = New System.Drawing.Point(15, 122)
-        Me.lvLicense.Name = "lvLicense"
-        Me.lvLicense.Size = New System.Drawing.Size(425, 204)
-        Me.lvLicense.TabIndex = 0
-        Me.lvLicense.UseCompatibleStateImageBehavior = False
-        Me.lvLicense.View = System.Windows.Forms.View.Details
-        '
-        'clmModulname
-        '
-        Me.clmModulname.Text = "Modulname"
-        Me.clmModulname.Width = 150
-        '
-        'clmGültigkeit
-        '
-        Me.clmGültigkeit.Text = "Gültigkeitsdatum"
-        Me.clmGültigkeit.Width = 120
-        '
-        'clmType
-        '
-        Me.clmType.Text = "Type"
-        Me.clmType.Width = 70
-        '
-        'clmAnz
-        '
-        Me.clmAnz.Text = "Profile"
-        '
-        'btnOK
-        '
-        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnOK.Location = New System.Drawing.Point(315, 577)
-        Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(75, 23)
-        Me.btnOK.TabIndex = 3
-        Me.btnOK.Text = "OK"
-        Me.btnOK.UseVisualStyleBackColor = True
-        '
-        'btnAbbrechen
-        '
-        Me.btnAbbrechen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnAbbrechen.Location = New System.Drawing.Point(396, 577)
-        Me.btnAbbrechen.Name = "btnAbbrechen"
-        Me.btnAbbrechen.Size = New System.Drawing.Size(75, 23)
-        Me.btnAbbrechen.TabIndex = 4
-        Me.btnAbbrechen.Text = "Abbrechen"
-        Me.btnAbbrechen.UseVisualStyleBackColor = True
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(12, 511)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(94, 13)
-        Me.Label5.TabIndex = 5
-        Me.Label5.Text = """machine-Name"":"
-        '
-        'txtmachineOriginal
-        '
-        Me.txtmachineOriginal.Location = New System.Drawing.Point(15, 527)
-        Me.txtmachineOriginal.Name = "txtmachineOriginal"
-        Me.txtmachineOriginal.ReadOnly = True
-        Me.txtmachineOriginal.Size = New System.Drawing.Size(285, 22)
-        Me.txtmachineOriginal.TabIndex = 6
-        '
-        'frmLizenzmanager
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(487, 605)
-        Me.Controls.Add(Me.txtmachineOriginal)
-        Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.btnAbbrechen)
-        Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.boxLicenseInfos)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.txtKey)
-        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "frmLizenzmanager"
-        Me.ShowInTaskbar = False
-        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
-        Me.Text = "Lizenzmanager"
-        Me.boxLicenseInfos.ResumeLayout(False)
-        Me.boxLicenseInfos.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents txtKey As System.Windows.Forms.TextBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents boxLicenseInfos As System.Windows.Forms.GroupBox
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents lvLicense As System.Windows.Forms.ListView
-    Friend WithEvents txtCompany As System.Windows.Forms.TextBox
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents clmModulname As System.Windows.Forms.ColumnHeader
-    Friend WithEvents clmGültigkeit As System.Windows.Forms.ColumnHeader
-    Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents btnAbbrechen As System.Windows.Forms.Button
-    Friend WithEvents txtmachine As System.Windows.Forms.TextBox
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents clmType As System.Windows.Forms.ColumnHeader
-    Friend WithEvents clmAnz As System.Windows.Forms.ColumnHeader
-    Friend WithEvents Label5 As System.Windows.Forms.Label
-    Friend WithEvents txtmachineOriginal As System.Windows.Forms.TextBox
-End Class

ToolCollection/frmLizenzmanager.resx

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA////AFu8aACc2acANoo6AH7IhQBLoFEAjdGWAG3EdgBPtVkAQJRFAFysYgBmtW0AUqdZAHTL
-        fgCV1Z4Ahc2NAGTBcQBVuWAAXrRlADuPQABFmUoAedCDAHbDfABivWsAVqtdAHnLhwB6xoEAmNiiAE+k
-        VQCCyokAcMd6AIrPkgBywHoASJxNAFi7ZABpwXIAYrhqAGa9bwA5jD0AUrddAFuxYwCQ0pkAacN3AD6S
-        QgB2zoEAXr1qAEKWRwByyXwAYL9tAJPUnACLz5UASZ5PAIPMiwB8x4MAWq9hAF27ZgBiwG8AiM+QAIDK
-        hwCW16EAU6laAFG2WwB4zYIAV61eAFO4XwBau2YAb8Z4AF+1ZwBlwnMAmdikAHzJhQBlv28AZsBxAGfC
-        cwA6jj8APJBBAI/RmABMoVIAeM+CAHXNgABWumEAc8p9AF2tYwBdvGkAX75sAGO5awBlvG4Am9mmAD2R
-        QgCT1Z0AQZZGAI3SlwCM0JUASJ1OAIrPlACLz5MAhs2OAITMjACDy4oAgcqIAFi6YwBxyXsAZbVsAGXB
-        cgA5jT0APpJDAJnYowCY16IAl9iiAJfXoQCLz5QAiM+RAIPKiQCAyogAVrlhAH7IhABZu2QAds6AAHvG
-        gQBzy30AXb1pAG3EdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZDR0GIgAAahQnBAAAAAAAN2FicU4AAC8bF2kAAAAAABNwcxBn
-        TjRTNndMAAAAAAAlMyAkYWJjZDh0CgAAAAAAVyUhYCNRQT4JOwsKWUsAAAAAVgdUQmUSKBhkBXQsAAAA
-        ACYqMS4CdVFINR5yWwAAH3pHMmg5VXlCOgxOXhUAAHhrbhorRRFKSW89AAAAAAB2WEZsPA8yTV1fQAAA
-        AAAAFi0OZkNuWlclRCkAAAAAAAAAAAAwbVwAAAAAAAAAAAAAAAAAPwMcCAAAAAAAAAAAAAAAAE9QUgAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AACDDwAAgw8AAIAPAACADwAAgAEAAOABAADgAQAAgAEAAIAP
-        AACADwAAgA8AAPj/AAD4fwAA+P8AAP//AAA=
-</value>
-  </data>
-</root>

ToolCollection/frmLizenzmanager.vb

@@ -1,101 +0,0 @@
-Public Class frmLizenzmanager
-
-    Private licenseKey_old As String
-    Private licenseManager As ClassLicenseManager = Nothing
-
-    Private Sub frmLizenzmanager_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
-        Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
-        Me.txtKey.Text = My.Settings.licensekey
-        Me.licenseKey_old = Me.txtKey.Text
-        Me.txtmachineOriginal.Text = My.Computer.Name
-        Me.CheckLicenseKey()
-    End Sub
-
-
-    Private Sub CheckLicenseKey()
-        Me.txtCompany.Text = ""
-        Me.txtmachine.Text = ""
-        Me.lvLicense.Items.Clear()
-
-        If Not Me.txtKey.Text = "" Then
-            If Me.txtKey.Text = "DD MaxLicense" Or Me.txtKey.Text.ToUpper = "DDALLIN" Then
-                Me.txtCompany.Text = "Digital Data"
-                Me.txtmachine.Text = "None"
-            Else
-                Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(Me.txtKey.Text)
-                Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-                Me.licenseManager.LoadLicenses()
-
-                Dim i As Integer = 0
-
-                If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
-                    Me.txtCompany.Text = Me.licenseManager.Licenses.Company
-                    Me.txtmachine.Text = Me.licenseManager.Licenses.machine
-                    Me.lvLicense.Items.Clear()
-                    For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                        Dim expires As String = license.Expires.Date
-                        Dim type As String = license.Type
-                        Dim anzProf As String = license.Anz_Profile
-                        If anzProf = 99 Then
-                            anzProf = "Unlimited"
-                        End If
-
-                        'Date.TryParse(expires, license.Expires)
-                        If Not expires = "" Then
-                            Me.lvLicense.Items.Add(license.Modulename)
-                            ' MsgBox(license.Modulename)
-                            Dim test = Me.lvLicense.Items.Item(i)
-                            Me.lvLicense.Items(i).SubItems.Add(expires)
-                            lvLicense.Items(i).SubItems.Add(type)
-                            lvLicense.Items(i).SubItems.Add(anzProf)
-                            i += 1
-                        End If
-                    Next
-                End If
-            End If
-
-
-
-        End If
-    End Sub
-
-
-    Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
-        If Not Me.licenseKey_old = Me.txtKey.Text Then
-            Dim result As MsgBoxResult = MsgBox("Sind sie sicher, dass der Lizenzschlüssel geändert werden soll?", MsgBoxStyle.YesNo, "Lizenzschlüssel wurde geändert")
-            If result = MsgBoxResult.Yes Then
-                My.Settings.licensekey = Me.txtKey.Text
-                My.Settings.Save()
-            End If
-        End If
-
-
-        If Not My.Settings.licensekey = "" Then
-            ' alle vorhandenen Module laden
-            frmStart.LoadAllModules()
-        End If
-
-        Me.Close()
-    End Sub
-
-
-    Private Sub btnAbbrechen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAbbrechen.Click
-        Me.txtKey.Text = ""
-        Me.txtCompany.Text = ""
-        Me.lvLicense.Items.Clear()
-
-        frmStart.ClearGroupBoxes()
-
-        If Not My.Settings.licensekey = "" Then
-            ' alle vorhandenen Module laden
-            frmStart.LoadAllModules()
-        End If
-
-        Me.Close()
-    End Sub
-
-
-    Private Sub txtKey_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtKey.TextChanged
-        Me.CheckLicenseKey()
-    End Sub
-End Class

ToolCollection/frmLogin_DI.Designer.vb

@@ -1,95 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmLogin_DI
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.txtPW = New System.Windows.Forms.TextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.btnAbbruch = New System.Windows.Forms.Button()
-        Me.btnok = New System.Windows.Forms.Button()
-        Me.SuspendLayout()
-        '
-        'txtPW
-        '
-        Me.txtPW.Location = New System.Drawing.Point(12, 23)
-        Me.txtPW.Name = "txtPW"
-        Me.txtPW.Size = New System.Drawing.Size(248, 22)
-        Me.txtPW.TabIndex = 7
-        Me.txtPW.UseSystemPasswordChar = True
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(9, 7)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(56, 13)
-        Me.Label1.TabIndex = 6
-        Me.Label1.Text = "Passwort:"
-        '
-        'btnAbbruch
-        '
-        Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnAbbruch.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnAbbruch.Location = New System.Drawing.Point(105, 56)
-        Me.btnAbbruch.Name = "btnAbbruch"
-        Me.btnAbbruch.Size = New System.Drawing.Size(75, 23)
-        Me.btnAbbruch.TabIndex = 5
-        Me.btnAbbruch.Text = "Abbruch"
-        Me.btnAbbruch.UseVisualStyleBackColor = True
-        '
-        'btnok
-        '
-        Me.btnok.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnok.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnok.Location = New System.Drawing.Point(186, 56)
-        Me.btnok.Name = "btnok"
-        Me.btnok.Size = New System.Drawing.Size(75, 23)
-        Me.btnok.TabIndex = 4
-        Me.btnok.Text = "Weiter"
-        Me.btnok.UseVisualStyleBackColor = True
-        '
-        'frmLogin_DI
-        '
-        Me.AcceptButton = Me.btnok
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.btnok
-        Me.ClientSize = New System.Drawing.Size(285, 91)
-        Me.Controls.Add(Me.txtPW)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.btnAbbruch)
-        Me.Controls.Add(Me.btnok)
-        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-        Me.Name = "frmLogin_DI"
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Passwort eingeben"
-        Me.TopMost = True
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents txtPW As System.Windows.Forms.TextBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents btnAbbruch As System.Windows.Forms.Button
-    Friend WithEvents btnok As System.Windows.Forms.Button
-End Class

ToolCollection/frmLogin_DI.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ToolCollection/frmLogin_DI.vb

@@ -1,33 +0,0 @@
-Public Class frmLogin_DI
-    Private Sub btnok_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnok.Click
-        If Me.txtPW.Text <> "" Then
-            If Me.txtPW.Text = My.Settings.vPW_admin Then
-                Me.Hide()
-                frmDIProfilHinzufuegen.Show()
-                Cursor = Cursors.Default
-            Else
-                MsgBox("Das eingegebene Passwort stimmt nicht überein!", MsgBoxStyle.Critical, "Falsche Eingabe:")
-                Me.txtPW.Text = ""
-                Me.txtPW.Focus()
-            End If
-        End If
-    End Sub
-    Private Sub frmLogin_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        Me.txtPW.Text = ""
-    End Sub
-
-    Private Sub btnAbbruch_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAbbruch.Click
-        Me.Close()
-    End Sub
-
-    Private Sub txtPW_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.GotFocus
-        Me.txtPW.BackColor = Color.Lime
-    End Sub
-
-    Private Sub txtPW_LostFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.LostFocus
-        Me.txtPW.BackColor = Color.White
-    End Sub
-    Private Sub frmLogin_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
-        Me.txtPW.Focus()
-    End Sub
-End Class

ToolCollection/frmLogin_NI.Designer.vb

@@ -1,94 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmLogin_NI
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.btnok = New System.Windows.Forms.Button()
-        Me.btnAbbruch = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.txtPW = New System.Windows.Forms.TextBox()
-        Me.SuspendLayout()
-        '
-        'btnok
-        '
-        Me.btnok.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnok.Location = New System.Drawing.Point(188, 74)
-        Me.btnok.Name = "btnok"
-        Me.btnok.Size = New System.Drawing.Size(75, 23)
-        Me.btnok.TabIndex = 0
-        Me.btnok.Text = "Weiter"
-        Me.btnok.UseVisualStyleBackColor = True
-        '
-        'btnAbbruch
-        '
-        Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnAbbruch.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnAbbruch.Location = New System.Drawing.Point(107, 74)
-        Me.btnAbbruch.Name = "btnAbbruch"
-        Me.btnAbbruch.Size = New System.Drawing.Size(75, 23)
-        Me.btnAbbruch.TabIndex = 1
-        Me.btnAbbruch.Text = "Abbruch"
-        Me.btnAbbruch.UseVisualStyleBackColor = True
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 9)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(56, 13)
-        Me.Label1.TabIndex = 2
-        Me.Label1.Text = "Passwort:"
-        '
-        'txtPW
-        '
-        Me.txtPW.Location = New System.Drawing.Point(15, 25)
-        Me.txtPW.Name = "txtPW"
-        Me.txtPW.Size = New System.Drawing.Size(248, 22)
-        Me.txtPW.TabIndex = 3
-        Me.txtPW.UseSystemPasswordChar = True
-        '
-        'frmLogin
-        '
-        Me.AcceptButton = Me.btnok
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.btnAbbruch
-        Me.ClientSize = New System.Drawing.Size(285, 109)
-        Me.Controls.Add(Me.txtPW)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.btnAbbruch)
-        Me.Controls.Add(Me.btnok)
-        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-        Me.Name = "frmLogin"
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Passwort notwendig:"
-        Me.TopMost = True
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents btnok As System.Windows.Forms.Button
-    Friend WithEvents btnAbbruch As System.Windows.Forms.Button
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents txtPW As System.Windows.Forms.TextBox
-End Class

ToolCollection/frmLogin_NI.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ToolCollection/frmLogin_NI.vb

@@ -1,34 +0,0 @@
-Public Class frmLogin_NI
-
-    Private Sub btnok_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnok.Click
-        If Me.txtPW.Text <> "" Then
-            If Me.txtPW.Text = My.Settings.vPW_admin Then
-                Me.Hide()
-                frmNIProfilhinzufuegen.ShowDialog()
-                Cursor = Cursors.Default
-            Else
-                MsgBox("Das eingegebene Passwort stimmt nicht überein!", MsgBoxStyle.Critical, "Falsche Eingabe:")
-                Me.txtPW.Text = ""
-                Me.txtPW.Focus()
-            End If
-        End If
-    End Sub
-    Private Sub frmLogin_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        Me.txtPW.Text = ""
-    End Sub
-
-    Private Sub btnAbbruch_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAbbruch.Click
-        Me.Close()
-    End Sub
-
-    Private Sub txtPW_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.GotFocus
-        Me.txtPW.BackColor = Color.Lime
-    End Sub
-
-    Private Sub txtPW_LostFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.LostFocus
-        Me.txtPW.BackColor = Color.White
-    End Sub
-    Private Sub frmLogin_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
-        Me.txtPW.Focus()
-    End Sub
-End Class

ToolCollection/frmNIHauptseite.Designer.vb

@@ -49,6 +49,14 @@ Partial Class frmNIHauptseite
         Me.Label4 = New System.Windows.Forms.Label()
         Me.numIntervall = New System.Windows.Forms.NumericUpDown()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.pnlFooter = New System.Windows.Forms.Panel()
+        Me.btnEdit = New System.Windows.Forms.Button()
+        Me.btnStartProfile = New System.Windows.Forms.Button()
+        Me.gridProfileOverview = New DevExpress.XtraGrid.GridControl()
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.RepositoryItemCheckEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit()
+        Me.RepositoryItemGridLookUpEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
+        Me.RepositoryItemGridLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.timRun = New System.Windows.Forms.Timer(Me.components)
         Me.DS_More = New ToolCollection.DS_More()
         Me.VWMO_RE_DOKUMENTARTZUORDNUNGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -61,12 +69,20 @@ Partial Class frmNIHauptseite
         Me.TBTC_MOVE_RENAMEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBTC_MOVE_RENAMETableAdapter = New ToolCollection.MyDatasetTableAdapters.TBTC_MOVE_RENAMETableAdapter()
         Me.TableAdapterManager1 = New ToolCollection.MyDatasetTableAdapters.TableAdapterManager()
+        Me.TimerAutostart = New System.Windows.Forms.Timer(Me.components)
         Me.tcmain.SuspendLayout()
         Me.tpMain.SuspendLayout()
         Me.StatusStrip1.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlInfos.SuspendLayout()
         CType(Me.numIntervall, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.TabPage2.SuspendLayout()
+        Me.pnlFooter.SuspendLayout()
+        CType(Me.gridProfileOverview, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemCheckEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemGridLookUpEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemGridLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DS_More, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VWMO_RE_DOKUMENTARTZUORDNUNGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBMO_RE_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -82,7 +98,7 @@ Partial Class frmNIHauptseite
         Me.tcmain.Location = New System.Drawing.Point(0, 0)
         Me.tcmain.Name = "tcmain"
         Me.tcmain.SelectedIndex = 0
-        Me.tcmain.Size = New System.Drawing.Size(774, 547)
+        Me.tcmain.Size = New System.Drawing.Size(777, 547)
         Me.tcmain.TabIndex = 46
         '
         'tpMain
@@ -106,7 +122,7 @@ Partial Class frmNIHauptseite
         Me.tpMain.Location = New System.Drawing.Point(4, 22)
         Me.tpMain.Name = "tpMain"
         Me.tpMain.Padding = New System.Windows.Forms.Padding(3)
-        Me.tpMain.Size = New System.Drawing.Size(766, 521)
+        Me.tpMain.Size = New System.Drawing.Size(769, 521)
         Me.tpMain.TabIndex = 0
         Me.tpMain.Text = "Hauptseite"
         Me.tpMain.UseVisualStyleBackColor = True
@@ -128,7 +144,7 @@ Partial Class frmNIHauptseite
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblStatus})
         Me.StatusStrip1.Location = New System.Drawing.Point(3, 496)
         Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(760, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(763, 22)
         Me.StatusStrip1.TabIndex = 45
         Me.StatusStrip1.Text = "StatusStrip1"
         '
@@ -240,7 +256,7 @@ Partial Class frmNIHauptseite
         Me.Label8.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label8.Location = New System.Drawing.Point(14, 30)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(83, 13)
+        Me.Label8.Size = New System.Drawing.Size(84, 13)
         Me.Label8.TabIndex = 30
         Me.Label8.Text = "In Bearbeitung"
         '
@@ -334,14 +350,99 @@ Partial Class frmNIHauptseite
         '
         'TabPage2
         '
+        Me.TabPage2.Controls.Add(Me.pnlFooter)
+        Me.TabPage2.Controls.Add(Me.gridProfileOverview)
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(766, 521)
+        Me.TabPage2.Size = New System.Drawing.Size(769, 521)
         Me.TabPage2.TabIndex = 1
-        Me.TabPage2.Text = "Konfigurationen"
+        Me.TabPage2.Text = "Profilübersicht"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'pnlFooter
+        '
+        Me.pnlFooter.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.pnlFooter.Controls.Add(Me.btnEdit)
+        Me.pnlFooter.Controls.Add(Me.btnStartProfile)
+        Me.pnlFooter.Location = New System.Drawing.Point(3, 480)
+        Me.pnlFooter.Name = "pnlFooter"
+        Me.pnlFooter.Size = New System.Drawing.Size(763, 38)
+        Me.pnlFooter.TabIndex = 3
+        '
+        'btnEdit
+        '
+        Me.btnEdit.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnEdit.Image = Global.ToolCollection.My.Resources.Resources.cog_edit
+        Me.btnEdit.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnEdit.Location = New System.Drawing.Point(527, 9)
+        Me.btnEdit.Name = "btnEdit"
+        Me.btnEdit.Size = New System.Drawing.Size(120, 23)
+        Me.btnEdit.TabIndex = 2
+        Me.btnEdit.Text = "Profil Bearbeiten"
+        Me.btnEdit.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnEdit.UseVisualStyleBackColor = True
+        '
+        'btnStartProfile
+        '
+        Me.btnStartProfile.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnStartProfile.Image = Global.ToolCollection.My.Resources.Resources.arrow_right
+        Me.btnStartProfile.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnStartProfile.Location = New System.Drawing.Point(653, 9)
+        Me.btnStartProfile.Name = "btnStartProfile"
+        Me.btnStartProfile.Size = New System.Drawing.Size(100, 23)
+        Me.btnStartProfile.TabIndex = 1
+        Me.btnStartProfile.Text = "Profil Starten"
+        Me.btnStartProfile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnStartProfile.UseVisualStyleBackColor = True
+        '
+        'gridProfileOverview
+        '
+        Me.gridProfileOverview.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.gridProfileOverview.Location = New System.Drawing.Point(3, 3)
+        Me.gridProfileOverview.MainView = Me.GridView1
+        Me.gridProfileOverview.Name = "gridProfileOverview"
+        Me.gridProfileOverview.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemCheckEdit1, Me.RepositoryItemGridLookUpEdit1})
+        Me.gridProfileOverview.Size = New System.Drawing.Size(763, 471)
+        Me.gridProfileOverview.TabIndex = 0
+        Me.gridProfileOverview.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'GridView1
+        '
+        Me.GridView1.GridControl = Me.gridProfileOverview
+        Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.Editable = False
+        Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView1.OptionsView.ColumnAutoWidth = False
+        Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridView1.OptionsView.ShowAutoFilterRow = True
+        Me.GridView1.OptionsView.ShowGroupPanel = False
+        '
+        'RepositoryItemCheckEdit1
+        '
+        Me.RepositoryItemCheckEdit1.AutoHeight = False
+        Me.RepositoryItemCheckEdit1.Name = "RepositoryItemCheckEdit1"
+        '
+        'RepositoryItemGridLookUpEdit1
+        '
+        Me.RepositoryItemGridLookUpEdit1.AutoHeight = False
+        Me.RepositoryItemGridLookUpEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.RepositoryItemGridLookUpEdit1.Name = "RepositoryItemGridLookUpEdit1"
+        Me.RepositoryItemGridLookUpEdit1.PopupView = Me.RepositoryItemGridLookUpEdit1View
+        '
+        'RepositoryItemGridLookUpEdit1View
+        '
+        Me.RepositoryItemGridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
+        Me.RepositoryItemGridLookUpEdit1View.Name = "RepositoryItemGridLookUpEdit1View"
+        Me.RepositoryItemGridLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.RepositoryItemGridLookUpEdit1View.OptionsView.ShowGroupPanel = False
+        '
         'timRun
         '
         Me.timRun.Interval = 60
@@ -404,11 +505,14 @@ Partial Class frmNIHauptseite
         Me.TableAdapterManager1.TBTC_MOVE_RENAMETableAdapter = Me.TBTC_MOVE_RENAMETableAdapter
         Me.TableAdapterManager1.UpdateOrder = ToolCollection.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
+        'TimerAutostart
+        '
+        '
         'frmNIHauptseite
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(774, 547)
+        Me.ClientSize = New System.Drawing.Size(777, 547)
         Me.Controls.Add(Me.tcmain)
         Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmNIHauptseite_Loc", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -426,6 +530,13 @@ Partial Class frmNIHauptseite
         Me.pnlInfos.ResumeLayout(False)
         Me.pnlInfos.PerformLayout()
         CType(Me.numIntervall, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPage2.ResumeLayout(False)
+        Me.pnlFooter.ResumeLayout(False)
+        CType(Me.gridProfileOverview, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemCheckEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemGridLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemGridLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DS_More, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VWMO_RE_DOKUMENTARTZUORDNUNGBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBMO_RE_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -472,4 +583,13 @@ Partial Class frmNIHauptseite
     Friend WithEvents TBTC_MOVE_RENAMEBindingSource As BindingSource
     Friend WithEvents TBTC_MOVE_RENAMETableAdapter As MyDatasetTableAdapters.TBTC_MOVE_RENAMETableAdapter
     Friend WithEvents TableAdapterManager1 As MyDatasetTableAdapters.TableAdapterManager
+    Friend WithEvents gridProfileOverview As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents RepositoryItemCheckEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit
+    Friend WithEvents RepositoryItemGridLookUpEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit
+    Friend WithEvents RepositoryItemGridLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents btnEdit As Button
+    Friend WithEvents btnStartProfile As Button
+    Friend WithEvents pnlFooter As Panel
+    Friend WithEvents TimerAutostart As Timer
 End Class

ToolCollection/frmNIHauptseite.resx

@@ -159,8 +159,11 @@
   <metadata name="TableAdapterManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>984, 56</value>
   </metadata>
+  <metadata name="TimerAutostart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1161, 56</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>297</value>
+    <value>132</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

ToolCollection/frmNIHauptseite.vb

@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder
 Imports System.IO
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
@@ -12,8 +13,7 @@ Public Class frmNIHauptseite
     '####Variablen für Nachindexierung
     Private _windreamNI As ClassNIWindream
     Private _clsWorkfile As clsNI_WorkFile
-    'Private _clsMoRe As ClassMO_RE
-    'Private _windreamNI As ClassNIWindream = Me.ParentClass.Windream
+
     Private bwProfil As New BackgroundWorker
     Private bwDatei As New BackgroundWorker
     Private bwsearch As New BackgroundWorker
@@ -41,7 +41,6 @@ Public Class frmNIHauptseite
     Public debug As Boolean = True
     Private Shared _Instance As frmNIHauptseite = Nothing
     Private _validModules()
-    Private licenseManager As ClassLicenseManager = Nothing
     Public Shared _windream As ClassWindream_allgemein
     Private Const ConstWMEntityDocument = 1 ''WINDREAMLib.WMEntity.WMEntityDocument
     Public Shared Function Instance() As frmNIHauptseite
@@ -67,7 +66,9 @@ Public Class frmNIHauptseite
 
         ' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
         If _windreamNI.Init() = False Then
-            EMAIL_DD.Send_EMail("Die Windream-Klasse konnte nicht initialisiert werden. Windream-Client unvollständig gestartert.", "windreamNI.Init()")
+            _Logger.Warn("Die Windream-Klasse konnte nicht initialisiert werden. Windream-Client unvollständig gestartert.")
+            Exit Sub
+
         End If
         'ClassMoveRenameLogger.Init("", "MoveRename_", True)
 
@@ -111,9 +112,9 @@ Public Class frmNIHauptseite
             _MyLogger.Debug = False
         End If
 
-        If My.Settings.NI_RUNNING = True Then
+        If My.Settings.vNIRunning = True Then
 
-            _Logger.Info("Nachindexierungslauf wird wieder gestartet - My.Settings.NI_RUNNING = True")
+            _Logger.Info("Nachindexierungslauf wird wieder gestartet - My.Settings.vNIRunning = True")
             Start_NachindexierungThreads()
         Else
             _Logger.Info("Nachindexierung Hauptformular wurde geladen - Nachindexierungslauf wird NICHT gestartet.")
@@ -340,8 +341,6 @@ Public Class frmNIHauptseite
                         _Logger.Warn("Windream Suche für Profil: " & profil.Profilname & " konnte nicht ausgeführt werden! Die Datei " & Me.aktivesProfil.WindreamSuche & " existiert nicht!")
                         ' wenn die gesuchte File eine Suche ist: per MAil informierne und Indexierung abbrechen
 
-                        EMAIL_DD.Send_EMail("Fehler bei Nachindexierung: <br> >> Profil: " & Me.aktivesProfil.Profilname & "<br> >> Die windream-Suche : " & Me.aktivesProfil.WindreamSuche & " konnte nicht gefunden werden!" &
-                                            "<br> >> Mögliche Fehlerursache: Das W-Laufwerk ist nicht verfügbar!", "WMissing")
                         Abbruch_NI("Windream-Suche konnte nicht gefunden werden!", True, False)
                         clsHelper.Add_Application_log("Nachindexierung wurde abgebrochen, da eine Windream-Suche (" & Me.aktivesProfil.WindreamSuche & ") nicht gefunden werden konnte")
 
@@ -479,23 +478,22 @@ Public Class frmNIHauptseite
                                                             bwProfil.ReportProgress(oDTResults.Rows.Count)
                                                             _Logger.Debug($">> Working on [{oDTResults.Rows.Count}] documents via SQL...")
                                                             If Not IsNothing(_windreamNI) Then
+                                                                Dim oColumnIndex As Integer
+                                                                Try
+                                                                    Dim oCheckInt As Integer
+                                                                    Dim oCheckStr As String
+                                                                    If Integer.TryParse(oDTResults.Rows(0).Item(1).ToString, oCheckInt) Then
 
+                                                                        oColumnIndex = 0
+                                                                    Else
+                                                                        oColumnIndex = 1
+                                                                    End If
+                                                                    _Logger.Debug($">> WM fullFilePath is obviously located in ColumnIndex: {oColumnIndex}")
+                                                                Catch ex As Exception
+
+                                                                End Try
                                                                 Dim i As Integer = 0
                                                                 For Each oROW As DataRow In oDTResults.Rows
-                                                                    Dim oColumnIndex As Integer
-                                                                    Try
-                                                                        Dim oCheckInt As Integer
-                                                                        Dim oCheckStr As String
-                                                                        If Integer.TryParse(oROW.Item(1), oCheckInt) Then
-                                                                            ' childAge successfully parsed as Integer
-                                                                            oColumnIndex = 0
-                                                                        Else
-                                                                            oColumnIndex = 1
-                                                                        End If
-
-                                                                    Catch ex As Exception
-
-                                                                    End Try
                                                                     Dim oFilenameWM = oROW.Item(oColumnIndex).ToString
                                                                     oFilenameWM = oFilenameWM.Replace("W:", "")
                                                                     oFilenameWM = oFilenameWM.Replace("\\windream\objects", "")
@@ -692,7 +690,6 @@ Public Class frmNIHauptseite
                 IsWorking_Hour = True
             End If
             If _windreamNI.Init() = False Then
-                EMAIL_DD.Send_EMail("Die Windream-Klasse konnte nicht initialisiert werden. Windream-Client unvollständig gestartert.", "_windreamNI.Init(693)")
                 clsHelper.Add_Application_log("Die Windream-Klasse konnte nicht initialisiert werden. Windream-Client unvollständig gestartert?")
 
                 Exit Sub
@@ -797,8 +794,6 @@ Public Class frmNIHauptseite
         Catch ex As Exception
             errormsg = " FEHLER bei Check_Desk_Index (GetVariableValue für Index '" & aktivesProfil.Desk_windreamIndex & "'): " & ex.Message
             _Logger.Warn(errormsg)
-            EMAIL_DD.Send_EMail("Beim Indexieren der Datei " & dokument.aName.ToString & " ist ein Fehler aufgetreten Check_Desk_Index (GetVariableValue): " & ex.Message, "Check_Desk_Index")
-
             ' wenn ein Fehler aufgetreten ist, muss das Flag gesetzt werden
             Return True
 
@@ -1039,8 +1034,6 @@ Public Class frmNIHauptseite
                                     result &= vbNewLine & "   - Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "'"
                                     oUnexpectedError = True
                                     fehlermsg &= vbNewLine & "Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "' - Fehler: " & ex.Message
-                                    EMAIL_DD.Send_EMail(fehlermsg, "GettingWMIndexInfo")
-
                                 End Try
 
                                 ' wenn beim Auslesen des Wertes für den aktuellen windream-Index kein Fehler auftrat
@@ -1151,7 +1144,8 @@ Public Class frmNIHauptseite
                                             'MessageBox.Show("Select: " & vbNewLine & selectArray(i))
                                             ' die SQL-Abfrage durchführen (liefert den Wert der in den windream-Index geschrieben werden soll)
                                             If Me.aktivesProfil.DbArt = "Oracle" Then
-                                                oResultNachindexierung = database.GetValueFromOracleDb(aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor)
+                                                _Logger.Warn("ORACLE SQL-Command nicht integriert!")
+                                                oResultNachindexierung = ""
                                             ElseIf Me.aktivesProfil.DbArt = "MS-SQL" Then
                                                 _Logger.Debug($"Executing MSSQL ...")
                                                 oResultNachindexierung = database.GetValueFromMssqlDb(pMyWMDoc.aName, aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, aktivesProfil.InitialCatalog, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor)
@@ -1523,40 +1517,6 @@ Public Class frmNIHauptseite
                                         _Logger.Debug("...process has exited: ")
                                         _sw.Stop()
 
-                                        'Dim myProcess As New Process
-                                        'Dim oProcessID
-                                        'myProcess.StartInfo.FileName = oVBScriptFile
-
-                                        'Dim startInfo As New ProcessStartInfo(oVBScriptFile)
-                                        'startInfo.CreateNoWindow = True
-                                        'myProcess.StartInfo.Arguments = oParamArg
-                                        '_Logger.Debug("Argument For myProcess [" & myProcess.StartInfo.Arguments & "]")
-                                        'myProcess.Start()
-                                        'oProcessID = myProcess.Id
-                                        '_Logger.Debug("Script executed!")
-                                        'If IsNumeric(oProcessID) Then
-                                        '    _Logger.Debug("got an PROCID: " & oProcessID.ToString)
-
-
-                                        '    Dim oMyProcess1 As Process
-                                        '    oMyProcess1 = Process.GetProcessById(oProcessID)
-
-                                        '    Dim _sw1 As Stopwatch = New Stopwatch()
-                                        '    _sw1.Start()
-
-                                        '    Do While oMyProcess1.HasExited = False
-
-                                        '        If _sw1.Elapsed.TotalSeconds = 30 Then
-                                        '            _Logger.Debug("Still waiting (30 sec) for ending of process-id: " & oProcessID.ToString)
-                                        '        ElseIf _sw1.Elapsed.TotalMinutes = 1 Then
-                                        '            _Logger.Debug("Still waiting (60 sec) for ending of process-id: " & oProcessID.ToString & " - Exit now", True)
-                                        '            Exit Do
-                                        '        End If
-                                        '    Loop
-                                        '    _Logger.Debug("...process has exited: ")
-                                        '    _sw1.Stop()
-                                        'End If
-
 
 
                                     Else
@@ -1565,39 +1525,7 @@ Public Class frmNIHauptseite
 
 
 
-                                    'task.WaitForExit()
-                                    ' MsgBox(so.ReadToEnd)
-                                    'myProcess.StartInfo.Arguments = oParamArg
-                                    '_Logger.Debug("Argument For myProcess [" & myProcess.StartInfo.Arguments & "]")
-                                    'myProcess.Start()
 
-                                    ''Process.Start(startInfo)
-
-                                    'oProcessID = myProcess.Id
-                                    '_Logger.Debug("Script executed!")
-
-                                    'If IsNumeric(oProcessID) Then
-                                    '    _Logger.Debug("got an PROCID: " & oProcessID.ToString)
-
-
-                                    '    Dim oMyProcess As Process
-                                    '    oMyProcess = Process.GetProcessById(oProcessID)
-
-                                    '    Dim _sw As Stopwatch = New Stopwatch()
-                                    '    _sw.Start()
-
-                                    '    Do While oMyProcess.HasExited = False
-
-                                    '        If _sw.Elapsed.TotalSeconds = 30 Then
-                                    '            _Logger.Debug("Still waiting (30 sec) for ending of process-id: " & oProcessID.ToString)
-                                    '        ElseIf _sw.Elapsed.TotalMinutes = 1 Then
-                                    '            _Logger.Debug("Still waiting (60 sec) for ending of process-id: " & oProcessID.ToString & " - Exit now", True)
-                                    '            Exit Do
-                                    '        End If
-                                    '    Loop
-                                    '    _Logger.Debug("...process has exited: ")
-                                    '    _sw.Stop()
-                                    'End If
 
                                 Catch ex As Exception
                                     _Logger.Warn("Unexpected error in running script: " & ex.Message)
@@ -1637,12 +1565,10 @@ Public Class frmNIHauptseite
                                         'Wenn Speicherort gespeichert werden soll wird Platzhalter ersetzt!
                                         Sqlcommand = Sqlcommand.Replace("vSpeicherort", "'" & My.Settings.vWLaufwerk & ":" & Me.aktivesDokument.aPath & "'")
                                         _Logger.Debug("SQL-Command: " & Sqlcommand)
-                                        'MsgBox(Me.aktivesDokument.aPath & vbNewLine & vbNewLine & Me.aktivesDokument.aName)
+
                                     Next
                                     If Me.aktivesProfil.DbArt = "Oracle" Then
-                                        If database.ExecuteonOracleDb(aktivesProfil.Profilname, Sqlcommand, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password) = 1 Then
-                                            _Logger.Debug("ORACLE SQL-Command erfolgreich ausgeführt!")
-                                        End If
+                                        _Logger.Warn("ORACLE SQL-Command nicht integriert!")
                                     ElseIf Me.aktivesProfil.DbArt = "MS-SQL" Then
                                         _Logger.Debug("MSSQL-Command will be executed now.....")
                                         _Logger.Debug("Sqlcommand: " & Sqlcommand)
@@ -1752,7 +1678,6 @@ Public Class frmNIHauptseite
                 If unvollstaendig = False And Me.aktivesProfil.Ni_Art.ToLower <> "fulltext" Then
                     _Logger.Warn("Fehler bei IndexiereVerarbeiteDokument für die Datei: " & pMyWMDoc.aName.ToString)
                     _Logger.Warn("Fehlermeldung: " & fehlermsg)
-                    EMAIL_DD.Send_EMail("Fehler in IndexiereVerarbeiteDokument für die Datei: " & pMyWMDoc.aName.ToString & "<br> Profilname: " & aktivesProfil.Profilname & " <br> Fehlermeldung: " & fehlermsg, "IndexiereVerarbeiteDokument1760")
 
                 End If
             End If
@@ -1765,22 +1690,9 @@ Public Class frmNIHauptseite
             End If
 
             'Move and Rename ausführen
-            If LICENSE_MoveRename = True And Not oUnexpectedError And unvollstaendig = False Then
-                Dim swMoveandrename As New ClassStopwatch("MoveandRename")
+            If Not oUnexpectedError And unvollstaendig = False Then
+
                 oUnexpectedError = FNMoveRename(pMyWMDoc)
-
-                Dim msg1 = swMoveandrename.Done
-                If msg1 <> "" Then
-                    Stopwatch1 += vbNewLine & $"{msg1}"
-
-                End If
-            Else
-                If LICENSE_MoveRename = True And oUnexpectedError = True Or unvollstaendig = True Then
-                    _Logger.Info("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
-                    _Logger.Debug("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
-                End If
-
-
             End If
 
             'Indexierung gegen die Indizes des Ordners
@@ -1830,7 +1742,6 @@ Public Class frmNIHauptseite
                 Dim oMyDocumentName = pMyWMDoc.aName
                 Dim err As Boolean = CrFolderForIndex(docpath, oMyDocumentName)
                 If err = True Then
-                    EMAIL_DD.Send_EMail("Fehler bei Create Folder for Index bei der Datei: '" & pMyWMDoc.aName.ToString & "'<br> Fehler: Die Datei wurde indexiert aber der Ordner konnte nicht erstellt werden!", "CrFolderForIndex")
 
                 End If
             Else
@@ -1868,109 +1779,181 @@ Public Class frmNIHauptseite
         Catch ex As Exception
             _Logger.Error(ex)
             _Logger.Warn($"oResultNachindexierung so far: {oResultNachindexierung.ToString}")
-            EMAIL_DD.Send_EMail("Schwerwiegender Fehler bei IndexiereVerarbeiteDokument - <br> Profil: " & aktivesProfil.Profilname & "<br> Datei: " & pMyWMDoc.aName.ToString & "<br> Fehler: " & ex.Message, "IndexiereVerarbeiteDokument1874")
         End Try
     End Sub
     Private Function FolderForIndex(oDynamicFolder As String, myWMDocument As WMObject) As String
         Try
-            '######
-            Dim oPRegex As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
-            ' einen Regulären Ausdruck laden
-            Dim regularExpression As Regex = New Regex(oPRegex)
-            ' die Vorkommen im Folder-String auslesen
-            Dim oElements As MatchCollection = regularExpression.Matches(oDynamicFolder)
-            '####
-            ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen
-            For Each oMatchElement As Match In oElements
-                _Logger.Debug("Elementname in oDynamicFolder: '" & oMatchElement.ToString & "'")
-                Select Case oMatchElement.Value.Substring(2, 1)
-                                 'Manueller Indexwert
-                    Case "m"
-                        Dim oWMIndexname = oMatchElement.Value.Substring(3, oMatchElement.Value.Length - 4)
-                        _Logger.Debug("getting metavalue from '" & oWMIndexname & "'...")
-                        Dim oWMIndexValue As String = myWMDocument.GetVariableValue(oWMIndexname)
-                        _Logger.Debug("oWMIndexValue: '" & oWMIndexValue & "'", False)
-                        If Not oWMIndexValue = String.Empty Then
-                            If IsDate(oWMIndexValue) Then
-                                oWMIndexValue = CDate(oWMIndexValue).ToString("yyyyMMdd")
-                            End If
-                            ' oWMIndexValue = oWMIndexValue.Replace("\", "")
-                            oDynamicFolder = oDynamicFolder.Replace(oMatchElement.ToString, oWMIndexValue)
-                            _Logger.Debug(" FolderPattern: '" & oDynamicFolder & "'", False)
-                        Else
-                            _Logger.Warn($"[{myWMDocument.aName}] - Attention in 'FolderForIndex': the Index-Value [{oWMIndexname}] is empty! No Dynamic folder will be used!", True)
-                            Return ""
-                        End If
-                    Case "v"
-                        Dim oFolderTemp As String
-                        Dim oMonth As String = My.Computer.Clock.LocalTime.Month
-                        If oMonth.Length = 1 Then
-                            oMonth = "0" & oMonth
-                        End If
-                        Dim oDay As String = My.Computer.Clock.LocalTime.Day
-                        If oDay.Length = 1 Then
-                            oDay = "0" & oDay
-                        End If
-                        Dim oType = oMatchElement.Value.Substring(3, oMatchElement.Value.Length - 4)
-                        If oType.StartsWith("_") Then
-                            oType = oType.Replace("_", "")
-                        End If
-                        Select Case oType
-                            Case "YYYY/MM/DD"
-                                oFolderTemp = My.Computer.Clock.LocalTime.Year & "\" & oMonth & "\" & oDay
-                            Case "YYYY/MM"
-                                oFolderTemp = My.Computer.Clock.LocalTime.Year & "\" & oMonth
-                            Case "YYYY"
-                                oFolderTemp = My.Computer.Clock.LocalTime.Year
-                            Case "YYYY-MM"
-                                oFolderTemp = My.Computer.Clock.LocalTime.Year & "-" & oMonth
-                            Case "MM"
-                                oFolderTemp = oMonth
-                            Case "DD"
-                                oFolderTemp = oDay
-                        End Select
-                        oDynamicFolder = oDynamicFolder.Replace(oMatchElement.ToString, oFolderTemp)
-                        _Logger.Debug("FolderPatter after V-element: '" & oDynamicFolder & "'", False)
-                    Case Else
-                        _Logger.Info("Attention in DynamicFolderConvention an invalid element has been found: Elementname: " & oMatchElement.Value.ToUpper)
-                        Return ""
-
-                End Select
-            Next
-            _Logger.Debug("Checking oDynamicFolder on illegal PathChars: " & oDynamicFolder, False)
-            Dim invalidPathChars() As Char = Path.GetInvalidPathChars()
-            Dim oPathSplit As String() = oDynamicFolder.Split("\")
-            For Each oFolder In oPathSplit
-                If oFolder = "" Then
-                    Continue For
-                End If
-                Dim rgPattern = My.Settings.REGEX_INVALID_PATH  '----Invalid Characters
-                Dim objRegEx As New Regex(rgPattern)
-                Dim oClearFolder = objRegEx.Replace(oFolder, "")
-                If oFolder <> oClearFolder Then
-                    oDynamicFolder = oDynamicFolder.Replace(oFolder, oClearFolder)
-                End If
-
-            Next
-
-            If Directory.Exists(oDynamicFolder) = False Then
-                Try
-                    Directory.CreateDirectory(oDynamicFolder)
-                    _Logger.Debug("Folder '" & oDynamicFolder & "' has been created...", False)
-                Catch ex As Exception
-                    _Logger.Error(ex)
-                    Return ""
-                End Try
-
+            _Logger.Debug("Dynamic folder before cleaning: " & oDynamicFolder)
+            ' 1. Platzhalter durch tatsächliche Werte ersetzen
+            Dim resolvedFolder As String = ResolveFolderPlaceholders(oDynamicFolder, myWMDocument)
+            If String.IsNullOrEmpty(resolvedFolder) Then
+                Return String.Empty
             End If
 
+            ' 2. Laufwerksbuchstaben separieren
+            Dim driveLetter As String = String.Empty
+            Dim pathWithoutDrive As String = resolvedFolder
+
+            If resolvedFolder.Length >= 2 AndAlso resolvedFolder.Chars(1) = ":"c Then
+                driveLetter = resolvedFolder.Substring(0, 2) ' z.B. "W:"
+                pathWithoutDrive = resolvedFolder.Substring(2) ' Rest des Pfads
+            End If
+
+            ' 3. Ungültige Zeichen aus jedem Ordnernamen entfernen
+            pathWithoutDrive = CleanPathSegments(pathWithoutDrive)
+
+            ' 4. Vollständigen Pfad zusammensetzen
+            Dim cleanedFolder As String = driveLetter & pathWithoutDrive
+            _Logger.Debug("Dynamic folder after cleaning: " & cleanedFolder)
+
+            ' 5. Ordner erstellen falls nicht vorhanden
+            If Not Directory.Exists(cleanedFolder) Then
+                Directory.CreateDirectory(cleanedFolder)
+                _Logger.Debug($"Folder '{cleanedFolder}' has been created...")
+            End If
+
+            Return cleanedFolder
 
-            Return oDynamicFolder
         Catch ex As Exception
             _Logger.Error(ex)
-            Return ""
+            Return String.Empty
         End Try
     End Function
+
+    ''' <summary>
+    ''' Ersetzt Platzhalter ([%m...], [%v...]) durch tatsächliche Werte
+    ''' </summary>
+    Private Function ResolveFolderPlaceholders(folderPattern As String, wmDoc As WMObject) As String
+        Dim oPRegex As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+        Dim regularExpression As New Regex(oPRegex)
+        Dim oElements As MatchCollection = regularExpression.Matches(folderPattern)
+
+        Dim result As String = folderPattern
+
+        For Each oMatchElement As Match In oElements
+            Dim replacement As String = ResolveSinglePlaceholder(oMatchElement.Value, wmDoc)
+
+            If String.IsNullOrEmpty(replacement) Then
+                _Logger.Warn($"[{wmDoc.aName}] - Attention: Placeholder '{oMatchElement.Value}' could not be resolved!")
+                Return String.Empty
+            End If
+
+            result = result.Replace(oMatchElement.Value, replacement)
+            _Logger.Debug($"Replaced '{oMatchElement.Value}' with '{replacement}'")
+        Next
+
+        Return result
+    End Function
+
+    ''' <summary>
+    ''' Löst einen einzelnen Platzhalter auf
+    ''' </summary>
+    Private Function ResolveSinglePlaceholder(placeholder As String, wmDoc As WMObject) As String
+        ' Präfix ermitteln (z.B. "m" oder "v")
+        Dim prefix As String = placeholder.Substring(2, 1).ToLower()
+        Dim content As String = placeholder.Substring(3, placeholder.Length - 4)
+
+        Select Case prefix
+            Case "m" ' Metadaten-Index
+                Return ResolveMetadataPlaceholder(content, wmDoc)
+
+            Case "v" ' Variable (Datum)
+                Return ResolveDatePlaceholder(content)
+
+            Case Else
+                _Logger.Info($"Invalid placeholder type: {placeholder}")
+                Return String.Empty
+        End Select
+    End Function
+
+    ''' <summary>
+    ''' Löst Metadaten-Platzhalter auf (z.B. [%mKundennummer])
+    ''' </summary>
+    Private Function ResolveMetadataPlaceholder(indexName As String, wmDoc As WMObject) As String
+        Try
+            _Logger.Debug($"Getting metavalue from '{indexName}'...")
+            Dim indexValue As String = wmDoc.GetVariableValue(indexName)?.ToString()
+
+            If String.IsNullOrEmpty(indexValue) Then
+                Return String.Empty
+            End If
+
+            ' Datum formatieren falls nötig
+            If IsDate(indexValue) Then
+                indexValue = CDate(indexValue).ToString("yyyyMMdd")
+            End If
+
+            _Logger.Debug($"Index value: '{indexValue}'")
+            Return indexValue
+
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return String.Empty
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Löst Datums-Platzhalter auf (z.B. [%vYYYY/MM/DD])
+    ''' </summary>
+    Private Function ResolveDatePlaceholder(datePattern As String) As String
+        ' Unterstrich am Anfang entfernen falls vorhanden
+        Dim pattern As String = If(datePattern.StartsWith("_"), datePattern.Substring(1), datePattern)
+
+        Dim currentDate As DateTime = My.Computer.Clock.LocalTime
+        Dim month As String = currentDate.Month.ToString("00")
+        Dim day As String = currentDate.Day.ToString("00")
+        Dim year As String = currentDate.Year.ToString()
+
+        Select Case pattern.ToUpper()
+            Case "YYYY/MM/DD"
+                Return $"{year}\{month}\{day}"
+            Case "YYYY/MM"
+                Return $"{year}\{month}"
+            Case "YYYY"
+                Return year
+            Case "YYYY-MM"
+                Return $"{year}-{month}"
+            Case "MM"
+                Return month
+            Case "DD"
+                Return day
+            Case Else
+                _Logger.Warn($"Unknown date pattern: {pattern}")
+                Return String.Empty
+        End Select
+    End Function
+
+    ''' <summary>
+    ''' Entfernt ungültige Zeichen aus Pfadsegmenten
+    ''' </summary>
+    Private Function CleanPathSegments(path As String) As String
+        If String.IsNullOrEmpty(path) Then
+            Return String.Empty
+        End If
+
+        Dim rgPattern As String = My.Settings.REGEX_INVALID_PATH
+        Dim objRegEx As New Regex(rgPattern)
+        Dim pathSegments As String() = path.Split("\"c)
+        Dim cleanedSegments As New List(Of String)
+
+        For Each segment As String In pathSegments
+            If String.IsNullOrEmpty(segment) Then
+                Continue For
+            End If
+
+            Dim cleanedSegment As String = objRegEx.Replace(segment, String.Empty)
+
+            If segment <> cleanedSegment Then
+                _Logger.Debug($"Cleaned segment from '{segment}' to '{cleanedSegment}'")
+            End If
+
+            cleanedSegments.Add(cleanedSegment)
+        Next
+
+        Return String.Join("\", cleanedSegments)
+    End Function
+
+
     Private Function FNMoveRename(myWMDocument As WMObject) As Boolean
         Try
             Dim oReturnString As String
@@ -1997,8 +1980,21 @@ Public Class frmNIHauptseite
                     Return True
                 End If
 
-                'schonmal den gesamten Pfad laden
-                Dim oNamenkonvention As String = oTargetpath & "\" & oDT_TBTC_MOVE_RENAME.Rows(0).Item("NAMECONVENTION") & oExtension
+                'schonmal den gesamten Pfad laden - OHNE Extension zuerst
+                Dim oNamenkonvention As String = oTargetpath & "\" & oDT_TBTC_MOVE_RENAME.Rows(0).Item("NAMECONVENTION")
+
+                ' Prüfen ob NAMECONVENTION bereits eine Extension enthält
+                Dim oNameConventionHasExtension As Boolean = False
+                If Not String.IsNullOrEmpty(Path.GetExtension(oNamenkonvention)) Then
+                    oNameConventionHasExtension = True
+                    _Logger.Debug("NAMECONVENTION enthält bereits eine Dateiendung")
+                End If
+
+                ' Extension nur hinzufügen wenn noch nicht vorhanden
+                If Not oNameConventionHasExtension Then
+                    oNamenkonvention = oNamenkonvention & oExtension
+                End If
+
                 ' einen Regulären Ausdruck laden
                 Dim oRegularExpression As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(oPRegex)
                 ' die Vorkommen im SQL-String auslesen
@@ -2010,7 +2006,7 @@ Public Class frmNIHauptseite
                 ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
                 For Each oElement As System.Text.RegularExpressions.Match In oMatchelements
                     Select Case oElement.Value.Substring(2, 1)
-                    'Manueller Indexwert
+                'Manueller Indexwert
                         Case "m"
 
                             Dim oWMIndexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
@@ -2071,11 +2067,8 @@ Public Class frmNIHauptseite
                                 Case "DDMMYYYY"
                                     oDatetemp = oDay & oMonth & My.Computer.Clock.LocalTime.Year
                                 Case "OFilename"
+                                    ' Original Dateiname OHNE Extension verwenden
                                     oNamenkonvention = oNamenkonvention.Replace(oElement.Value, System.IO.Path.GetFileNameWithoutExtension(oActWMPath))
-                                'Case "Username".ToUpper
-                                '    oNamenkonvention = oNamenkonvention.Replace(oElement.Value, Environment.UserName)
-                                'Case "Usercode".ToUpper
-                                '    oNamenkonvention = oNamenkonvention.Replace(oElement.Value, USER_SHORT_NAME)
                                 Case ""
                             End Select
                             If oDatetemp <> "" Then
@@ -2090,16 +2083,21 @@ Public Class frmNIHauptseite
                                 Dim oNeuerName As String = oNamenkonvention.Replace(oElement.Value, "")
                                 oStammname = oNeuerName.Replace("~", "")
                                 oNeuerName = oNeuerName.Replace("~", "")
-                                'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "")
+
+                                ' Extension für Überprüfung extrahieren
+                                Dim oCheckExtension As String = Path.GetExtension(oNeuerName)
+                                Dim oNeuerNameOhneExt As String = Path.GetFileNameWithoutExtension(oNeuerName)
+                                Dim oStammnameOhneExt As String = Path.GetFileNameWithoutExtension(oStammname)
+
                                 'Überprüfen ob File existiert
-                                If File.Exists(oNeuerName & oExtension) = False Then
+                                If File.Exists(oNeuerName) = False Then
                                     oNewFileName = oNeuerName
                                     oNamenkonvention = oNewFileName
                                 Else
-                                    Do While File.Exists(oNeuerName & oExtension)
+                                    Do While File.Exists(oNeuerNameOhneExt & oCheckExtension)
                                         oVersion = oVersion + 1
-                                        oNeuerName = oStammname & "~" & oVersion
-                                        oNewFileName = oNeuerName
+                                        oNeuerNameOhneExt = oStammnameOhneExt & "~" & oVersion
+                                        oNewFileName = oNeuerNameOhneExt & oCheckExtension
                                     Loop
                                     oNamenkonvention = oNewFileName
                                 End If
@@ -2119,12 +2117,12 @@ Public Class frmNIHauptseite
                 Else
                     oReturnString = oActWMPath
                 End If
-
-
-
-
             End If
-            Dim oOldFilename = oReturnString.Substring(oReturnString.LastIndexOf("\") + 1)
+
+            ' Extension aus oReturnString für weitere Verarbeitung extrahieren
+            Dim oFinalExtension As String = Path.GetExtension(oReturnString)
+            Dim oOldFilename = Path.GetFileName(oReturnString)
+
             _Logger.Debug($"oOldFilename: {oOldFilename}")
             Dim oCleanFileName As String = String.Join("", oOldFilename.Split(Path.GetInvalidFileNameChars()))
             If oCleanFileName <> oOldFilename Then
@@ -2139,8 +2137,8 @@ Public Class frmNIHauptseite
                 oReturnString = oReturnString.Replace(oOriginalPath, oCleanPathName)
             End If
 
-            Dim oPathFile As String = oReturnString.Replace(oExtension, "")
-            Dim oNewPathFilename = oPathFile + oExtension
+            Dim oPathFile As String = oReturnString.Replace(oFinalExtension, "")
+            Dim oNewPathFilename = oPathFile + oFinalExtension
             'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "")
             If oVERSIONOFF = True Then
 
@@ -2158,14 +2156,21 @@ Public Class frmNIHauptseite
                 Do While File.Exists(oNewPathFilename)
 
                     oNewVersion = oNewVersion + 1
-                    oNewPathFilename = oPathFile & "~" & oNewVersion & oExtension
+                    oNewPathFilename = oPathFile & "~" & oNewVersion & oFinalExtension
 
                 Loop
                 If oNewPathFilename <> oReturnString Then
                     oReturnString = oNewPathFilename
                 End If
             End If
-            If _windreamNI.NEW_MOVE_FILE(oReturnString, oActWMPath, "MO_RE", myWMDocument.aName) = True Then
+            Dim oFilename = myWMDocument.aName
+            If myWMDocument.aLocked Then
+                _Logger.Debug("Document still is locked...now unlocking...")
+                myWMDocument.unlock()
+            End If
+
+            myWMDocument = Nothing
+            If _windreamNI.NEW_MOVE_FILE(oReturnString, oActWMPath, "MO_RE", oFilename) = True Then
                 Return False
             Else
                 Return True
@@ -2549,8 +2554,6 @@ Public Class frmNIHauptseite
                 _Logger.Error(ex)
 
             End If
-            EMAIL_DD.Send_EMail("Schwerwiegender Fehler bei SetErrorMeldung - <br> Profil: " & aktivesProfil.Profilname & "<br> Datei: " & dokument.aName.ToString & "<br> Fehler: " & ex.Message, "SetErrorMeldung")
-
         End Try
     End Sub
     Private Function IsNotEmpty(ByVal aValue As Object)
@@ -2635,7 +2638,8 @@ Public Class frmNIHauptseite
             _Logger.Debug("Check_DeskIndexValue - Select Scalar: " & _vsql)
 
             If aktivesProfil.DbArt = "Oracle" Then
-                Dim ergebnis As Integer = database.CheckIndex_oracle(_vsql, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password)
+                Dim ergebnis As Integer = 0
+                _Logger.Warn("ORACLE SQL-Command nicht integriert!")
                 If ergebnis = 1 Then
                     Return 1
                 Else
@@ -2746,7 +2750,7 @@ Public Class frmNIHauptseite
         bwDatei.WorkerReportsProgress = True
         bwDatei.WorkerSupportsCancellation = True
 
-        My.Settings.NI_RUNNING = True
+        My.Settings.vNIRunning = True
         My.Settings.Save()
         ' den Indexierungsvorgang direkt (zum ersten Mal) durchführen
         Me.Profile_Durchlaufen()
@@ -2788,7 +2792,7 @@ Public Class frmNIHauptseite
             If keeprunning = False Then
                 _Logger.Debug("keeprunning = False - Zurücksetzen")
                 'Abbruch der Nachindexierung
-                My.Settings.NI_RUNNING = False
+                My.Settings.vNIRunning = False
                 Me.numIntervall.Enabled = True
                 Me.pnlInfos.Visible = False
                 Me.tslblStatus.Visible = False

ToolCollection/frmNIProfileigenschaften.Designer.vb

@@ -148,6 +148,7 @@ Partial Class frmNIProfileigenschaften
         Me.Label16 = New System.Windows.Forms.Label()
         Me.txtObjekttyp = New System.Windows.Forms.TextBox()
         Me.btnopenSuche = New System.Windows.Forms.Button()
+        Me.pnlProfileigenschaften = New System.Windows.Forms.Panel()
         Me.StatusStrip1.SuspendLayout()
         Me.gbxDatenbank.SuspendLayout()
         Me.gbxDatei.SuspendLayout()
@@ -165,6 +166,7 @@ Partial Class frmNIProfileigenschaften
         Me.GroupBox5.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
         Me.TabPage4.SuspendLayout()
+        Me.pnlProfileigenschaften.SuspendLayout()
         Me.SuspendLayout()
         '
         'StatusStrip1
@@ -176,7 +178,7 @@ Partial Class frmNIProfileigenschaften
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode
         Me.StatusStrip1.ShowItemToolTips = True
-        Me.StatusStrip1.Size = New System.Drawing.Size(920, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(984, 22)
         Me.StatusStrip1.SizingGrip = False
         Me.StatusStrip1.TabIndex = 23
         Me.StatusStrip1.Text = "StatusStrip1"
@@ -524,7 +526,7 @@ Partial Class frmNIProfileigenschaften
         Me.lblDateiendung.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblDateiendung.Location = New System.Drawing.Point(130, 25)
         Me.lblDateiendung.Name = "lblDateiendung"
-        Me.lblDateiendung.Size = New System.Drawing.Size(114, 13)
+        Me.lblDateiendung.Size = New System.Drawing.Size(113, 13)
         Me.lblDateiendung.TabIndex = 3
         Me.lblDateiendung.Text = "Dateiendungen/Typ*"
         '
@@ -555,13 +557,15 @@ Partial Class frmNIProfileigenschaften
         '
         'btnVerknüpfungen
         '
-        Me.btnVerknüpfungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnVerknüpfungen.Location = New System.Drawing.Point(754, 36)
+        Me.btnVerknüpfungen.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.btnVerknüpfungen.Image = Global.ToolCollection.My.Resources.Resources.link
+        Me.btnVerknüpfungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnVerknüpfungen.Location = New System.Drawing.Point(791, 30)
         Me.btnVerknüpfungen.Name = "btnVerknüpfungen"
-        Me.btnVerknüpfungen.Size = New System.Drawing.Size(150, 23)
+        Me.btnVerknüpfungen.Size = New System.Drawing.Size(169, 28)
         Me.btnVerknüpfungen.TabIndex = 49
-        Me.btnVerknüpfungen.Text = "Verknüpfungen verwalten ..."
+        Me.btnVerknüpfungen.Text = "Verknüpfungen verwalten"
+        Me.btnVerknüpfungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnVerknüpfungen.UseVisualStyleBackColor = True
         Me.btnVerknüpfungen.Visible = False
         '
@@ -569,7 +573,7 @@ Partial Class frmNIProfileigenschaften
         '
         Me.txtWindreamsuche.BackColor = System.Drawing.SystemColors.Info
         Me.txtWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtWindreamsuche.Location = New System.Drawing.Point(18, 126)
+        Me.txtWindreamsuche.Location = New System.Drawing.Point(7, 118)
         Me.txtWindreamsuche.Name = "txtWindreamsuche"
         Me.txtWindreamsuche.Size = New System.Drawing.Size(451, 22)
         Me.txtWindreamsuche.TabIndex = 6
@@ -577,7 +581,7 @@ Partial Class frmNIProfileigenschaften
         'btnWindreamsuche
         '
         Me.btnWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnWindreamsuche.Location = New System.Drawing.Point(475, 125)
+        Me.btnWindreamsuche.Location = New System.Drawing.Point(464, 117)
         Me.btnWindreamsuche.Name = "btnWindreamsuche"
         Me.btnWindreamsuche.Size = New System.Drawing.Size(24, 21)
         Me.btnWindreamsuche.TabIndex = 3
@@ -587,7 +591,7 @@ Partial Class frmNIProfileigenschaften
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(15, 63)
+        Me.Label2.Location = New System.Drawing.Point(4, 55)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(61, 13)
         Me.Label2.TabIndex = 37
@@ -596,7 +600,7 @@ Partial Class frmNIProfileigenschaften
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(15, 22)
+        Me.Label1.Location = New System.Drawing.Point(4, 14)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(70, 13)
         Me.Label1.TabIndex = 36
@@ -604,7 +608,7 @@ Partial Class frmNIProfileigenschaften
         '
         'txtProfilname
         '
-        Me.txtProfilname.Location = New System.Drawing.Point(18, 38)
+        Me.txtProfilname.Location = New System.Drawing.Point(7, 30)
         Me.txtProfilname.Name = "txtProfilname"
         Me.txtProfilname.Size = New System.Drawing.Size(396, 22)
         Me.txtProfilname.TabIndex = 35
@@ -613,7 +617,7 @@ Partial Class frmNIProfileigenschaften
         '
         Me.chkbxAktiv.AutoSize = True
         Me.chkbxAktiv.BackColor = System.Drawing.Color.Transparent
-        Me.chkbxAktiv.Location = New System.Drawing.Point(429, 40)
+        Me.chkbxAktiv.Location = New System.Drawing.Point(418, 32)
         Me.chkbxAktiv.Name = "chkbxAktiv"
         Me.chkbxAktiv.Size = New System.Drawing.Size(119, 17)
         Me.chkbxAktiv.TabIndex = 52
@@ -631,7 +635,7 @@ Partial Class frmNIProfileigenschaften
         Me.GroupBox1.Size = New System.Drawing.Size(624, 83)
         Me.GroupBox1.TabIndex = 70
         Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Indexname - Nachindexierung fehlerhaft:"
+        Me.GroupBox1.Text = "Indexname - Nachindexierung/Nachbearbeitung fehlerhaft:"
         '
         'Label6
         '
@@ -671,7 +675,7 @@ Partial Class frmNIProfileigenschaften
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(426, 63)
+        Me.Label7.Location = New System.Drawing.Point(415, 55)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(98, 13)
         Me.Label7.TabIndex = 73
@@ -681,7 +685,7 @@ Partial Class frmNIProfileigenschaften
         '
         Me.txtlastRun.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtlastRun.Enabled = False
-        Me.txtlastRun.Location = New System.Drawing.Point(429, 79)
+        Me.txtlastRun.Location = New System.Drawing.Point(418, 71)
         Me.txtlastRun.Name = "txtlastRun"
         Me.txtlastRun.Size = New System.Drawing.Size(160, 22)
         Me.txtlastRun.TabIndex = 74
@@ -697,7 +701,7 @@ Partial Class frmNIProfileigenschaften
         Me.GroupBox2.Size = New System.Drawing.Size(624, 83)
         Me.GroupBox2.TabIndex = 75
         Me.GroupBox2.TabStop = False
-        Me.GroupBox2.Text = "Dauerhafte Kennzeichnung - Fehler bei Indexierung:"
+        Me.GroupBox2.Text = "Dauerhafte Kennzeichnung - Fehler bei Nachindexierung/Nachbearbeitung:"
         '
         'Label8
         '
@@ -730,10 +734,11 @@ Partial Class frmNIProfileigenschaften
         '
         'lblSave
         '
+        Me.lblSave.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.lblSave.AutoSize = True
         Me.lblSave.BackColor = System.Drawing.Color.Yellow
         Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblSave.Location = New System.Drawing.Point(643, 79)
+        Me.lblSave.Location = New System.Drawing.Point(699, 76)
         Me.lblSave.Name = "lblSave"
         Me.lblSave.Size = New System.Drawing.Size(261, 17)
         Me.lblSave.TabIndex = 76
@@ -765,10 +770,10 @@ Partial Class frmNIProfileigenschaften
         Me.TabControl1.Controls.Add(Me.TabPage2)
         Me.TabControl1.Controls.Add(Me.TabPage3)
         Me.TabControl1.Controls.Add(Me.TabPage4)
-        Me.TabControl1.Location = New System.Drawing.Point(18, 159)
+        Me.TabControl1.Location = New System.Drawing.Point(3, 222)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(890, 442)
+        Me.TabControl1.Size = New System.Drawing.Size(978, 491)
         Me.TabControl1.TabIndex = 78
         '
         'TabPage1
@@ -781,7 +786,7 @@ Partial Class frmNIProfileigenschaften
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(882, 416)
+        Me.TabPage1.Size = New System.Drawing.Size(970, 465)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Typ und Quelle"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -802,7 +807,7 @@ Partial Class frmNIProfileigenschaften
         Me.grbxLDAP.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.grbxLDAP.Location = New System.Drawing.Point(407, 210)
         Me.grbxLDAP.Name = "grbxLDAP"
-        Me.grbxLDAP.Size = New System.Drawing.Size(413, 176)
+        Me.grbxLDAP.Size = New System.Drawing.Size(501, 225)
         Me.grbxLDAP.TabIndex = 79
         Me.grbxLDAP.TabStop = False
         Me.grbxLDAP.Text = "Indexierung gegen Active Directory:"
@@ -904,7 +909,7 @@ Partial Class frmNIProfileigenschaften
         Me.grbxVolltext.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.grbxVolltext.Location = New System.Drawing.Point(568, 18)
         Me.grbxVolltext.Name = "grbxVolltext"
-        Me.grbxVolltext.Size = New System.Drawing.Size(293, 162)
+        Me.grbxVolltext.Size = New System.Drawing.Size(385, 211)
         Me.grbxVolltext.TabIndex = 78
         Me.grbxVolltext.TabStop = False
         Me.grbxVolltext.Text = "Indexierung gegen den Volltext"
@@ -957,7 +962,7 @@ Partial Class frmNIProfileigenschaften
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(882, 416)
+        Me.TabPage2.Size = New System.Drawing.Size(970, 465)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Kennzeichnung und Active Directory"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -971,7 +976,7 @@ Partial Class frmNIProfileigenschaften
         Me.grbxNB_AD.Size = New System.Drawing.Size(624, 50)
         Me.grbxNB_AD.TabIndex = 77
         Me.grbxNB_AD.TabStop = False
-        Me.grbxNB_AD.Text = "Indexierung AD (Rechte anpassen)"
+        Me.grbxNB_AD.Text = "Indexierung AD (Rechteverwaltung)"
         '
         'chkbxAD
         '
@@ -993,7 +998,7 @@ Partial Class frmNIProfileigenschaften
         Me.TabPage3.Location = New System.Drawing.Point(4, 22)
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(882, 416)
+        Me.TabPage3.Size = New System.Drawing.Size(970, 465)
         Me.TabPage3.TabIndex = 2
         Me.TabPage3.Text = "Nachbearbeitungsfunktionen 1 (Verschieben, umbenennen)"
         Me.TabPage3.UseVisualStyleBackColor = True
@@ -1002,7 +1007,6 @@ Partial Class frmNIProfileigenschaften
         '
         Me.grpbxMORE.Controls.Add(Me.btnMoveRename)
         Me.grpbxMORE.Controls.Add(Me.Label21)
-        Me.grpbxMORE.Enabled = False
         Me.grpbxMORE.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.grpbxMORE.Location = New System.Drawing.Point(6, 104)
         Me.grpbxMORE.Name = "grpbxMORE"
@@ -1251,7 +1255,7 @@ Partial Class frmNIProfileigenschaften
         Me.Label4.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label4.Location = New System.Drawing.Point(6, 18)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(639, 15)
+        Me.Label4.Size = New System.Drawing.Size(638, 15)
         Me.Label4.TabIndex = 71
         Me.Label4.Text = "Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreiche" &
     "r Indexierung verschoben werden soll."
@@ -1280,7 +1284,7 @@ Partial Class frmNIProfileigenschaften
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)
         Me.TabPage4.Name = "TabPage4"
         Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage4.Size = New System.Drawing.Size(882, 416)
+        Me.TabPage4.Size = New System.Drawing.Size(970, 465)
         Me.TabPage4.TabIndex = 3
         Me.TabPage4.Text = "Nachbearbeitungsfunktionen 2 (Ordnerindizes etc)"
         Me.TabPage4.UseVisualStyleBackColor = True
@@ -1290,7 +1294,7 @@ Partial Class frmNIProfileigenschaften
         Me.Label24.AutoSize = True
         Me.Label24.Location = New System.Drawing.Point(461, 56)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(121, 13)
+        Me.Label24.Size = New System.Drawing.Size(122, 13)
         Me.Label24.TabIndex = 63
         Me.Label24.Text = "Beispiel Ordnerebene:"
         '
@@ -1401,7 +1405,7 @@ Partial Class frmNIProfileigenschaften
         '
         Me.Label16.AutoSize = True
         Me.Label16.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label16.Location = New System.Drawing.Point(15, 110)
+        Me.Label16.Location = New System.Drawing.Point(4, 102)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(174, 13)
         Me.Label16.TabIndex = 79
@@ -1409,7 +1413,7 @@ Partial Class frmNIProfileigenschaften
         '
         'txtObjekttyp
         '
-        Me.txtObjekttyp.Location = New System.Drawing.Point(18, 79)
+        Me.txtObjekttyp.Location = New System.Drawing.Point(7, 71)
         Me.txtObjekttyp.Name = "txtObjekttyp"
         Me.txtObjekttyp.ReadOnly = True
         Me.txtObjekttyp.Size = New System.Drawing.Size(396, 22)
@@ -1421,7 +1425,7 @@ Partial Class frmNIProfileigenschaften
         Me.btnopenSuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnopenSuche.Image = Global.ToolCollection.My.Resources.Resources.plugin
         Me.btnopenSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnopenSuche.Location = New System.Drawing.Point(505, 117)
+        Me.btnopenSuche.Location = New System.Drawing.Point(494, 109)
         Me.btnopenSuche.Name = "btnopenSuche"
         Me.btnopenSuche.Padding = New System.Windows.Forms.Padding(0, 0, 2, 2)
         Me.btnopenSuche.Size = New System.Drawing.Size(68, 36)
@@ -1430,30 +1434,40 @@ Partial Class frmNIProfileigenschaften
         Me.btnopenSuche.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnopenSuche.UseVisualStyleBackColor = True
         '
+        'pnlProfileigenschaften
+        '
+        Me.pnlProfileigenschaften.Controls.Add(Me.TabControl1)
+        Me.pnlProfileigenschaften.Controls.Add(Me.txtObjekttyp)
+        Me.pnlProfileigenschaften.Controls.Add(Me.lblSave)
+        Me.pnlProfileigenschaften.Controls.Add(Me.btnopenSuche)
+        Me.pnlProfileigenschaften.Controls.Add(Me.btnVerknüpfungen)
+        Me.pnlProfileigenschaften.Controls.Add(Me.Label16)
+        Me.pnlProfileigenschaften.Controls.Add(Me.txtProfilname)
+        Me.pnlProfileigenschaften.Controls.Add(Me.btnWindreamsuche)
+        Me.pnlProfileigenschaften.Controls.Add(Me.Label2)
+        Me.pnlProfileigenschaften.Controls.Add(Me.txtWindreamsuche)
+        Me.pnlProfileigenschaften.Controls.Add(Me.Label1)
+        Me.pnlProfileigenschaften.Controls.Add(Me.txtlastRun)
+        Me.pnlProfileigenschaften.Controls.Add(Me.chkbxAktiv)
+        Me.pnlProfileigenschaften.Controls.Add(Me.Label7)
+        Me.pnlProfileigenschaften.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlProfileigenschaften.Location = New System.Drawing.Point(0, 22)
+        Me.pnlProfileigenschaften.Name = "pnlProfileigenschaften"
+        Me.pnlProfileigenschaften.Size = New System.Drawing.Size(984, 716)
+        Me.pnlProfileigenschaften.TabIndex = 81
+        '
         'frmNIProfileigenschaften
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(920, 603)
-        Me.Controls.Add(Me.txtObjekttyp)
-        Me.Controls.Add(Me.btnopenSuche)
-        Me.Controls.Add(Me.Label16)
-        Me.Controls.Add(Me.btnWindreamsuche)
-        Me.Controls.Add(Me.txtWindreamsuche)
-        Me.Controls.Add(Me.TabControl1)
-        Me.Controls.Add(Me.lblSave)
-        Me.Controls.Add(Me.txtlastRun)
-        Me.Controls.Add(Me.Label7)
-        Me.Controls.Add(Me.chkbxAktiv)
+        Me.ClientSize = New System.Drawing.Size(984, 738)
+        Me.Controls.Add(Me.pnlProfileigenschaften)
         Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(Me.btnVerknüpfungen)
-        Me.Controls.Add(Me.txtProfilname)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.Label2)
         Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmNIProfileigenschaften", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Location = Global.ToolCollection.My.MySettings.Default.frmNIProfileigenschaften
+        Me.MinimumSize = New System.Drawing.Size(1000, 750)
         Me.Name = "frmNIProfileigenschaften"
         Me.Text = "Profileigenschaften Nachindexierung"
         Me.StatusStrip1.ResumeLayout(False)
@@ -1488,6 +1502,8 @@ Partial Class frmNIProfileigenschaften
         Me.GroupBox3.PerformLayout()
         Me.TabPage4.ResumeLayout(False)
         Me.TabPage4.PerformLayout()
+        Me.pnlProfileigenschaften.ResumeLayout(False)
+        Me.pnlProfileigenschaften.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1607,4 +1623,5 @@ Partial Class frmNIProfileigenschaften
     Friend WithEvents Label20 As System.Windows.Forms.Label
     Friend WithEvents Label25 As System.Windows.Forms.Label
     Friend WithEvents btnMoveRename As Button
+    Friend WithEvents pnlProfileigenschaften As Panel
 End Class

ToolCollection/frmNIProfileigenschaften.resx

@@ -130,17 +130,17 @@
   <data name="btnMdbLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
-        C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
-        cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
-        dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
-        dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
-        J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
-        0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
-        QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
-        gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
-        fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
-        AAAAAElFTkSuQmCC
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
+        OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
+        Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
+        M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
+        Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
+        NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
+        UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
+        GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
+        uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
+        o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -161,7 +161,7 @@ einen Startindex erhält, der nicht in der Datenbank existiert. Diese Kennzeichn
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
-        CQAAAk1TRnQBSQFMAgEBAgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

ToolCollection/frmNIProfileigenschaften.vb

@@ -15,8 +15,9 @@ Public Class frmNIProfileigenschaften
     ' verhindert (wenn True) das _selectedProfile auf Nothing gesetzt wird, wenn das Panel auf visible = True gesetzt wird
     Private _flagIgnoreVisibilityChanged As Boolean = False
     Private Shared _Instance As frmNIProfileigenschaften = Nothing
-    Private licenseManager As ClassLicenseManager = Nothing
+    Private passwordCrypto As ClassPasswordCrypto = Nothing
     Private INDEX_LIST As New List(Of String)
+    Private selectedProfile As ClassNIProfil
     Public Shared Function Instance() As frmNIProfileigenschaften
         If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then
             _Instance = New frmNIProfileigenschaften
@@ -38,14 +39,7 @@ Public Class frmNIProfileigenschaften
         _windream = New ClassWindream_allgemein(_MyLogger)
         ' alle Profile in die Toolbar-Combobox eintragen
         Me.LoadProfilesInCombobox()
-        Try
-            Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
-            Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
-            Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-            Me.licenseManager.LoadLicenses()
-        Catch ex As Exception
-            MsgBox("Fehler beim Laden der Lizenzen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
+
     End Sub
     Public Sub ReDimEx(ByRef MyArray As Object, ByVal iDimX As Integer, ByVal iDimY As Integer)
 
@@ -141,6 +135,7 @@ Public Class frmNIProfileigenschaften
                         ' die Profile neu in die Combobox der Toolbar laden (für den Fall das Profilname geändert wurde)
                         Me.LoadProfilesInCombobox()
 
+                        Me.pnlProfileigenschaften.Visible = False
                         ' die Profileigenschaften auf diesem Panel ausblenden
                         ' den Speichern-Button deaktivieren 
                         Me.btnSpeichern.Enabled = False
@@ -157,6 +152,7 @@ Public Class frmNIProfileigenschaften
                     ' wenn ein Profil selektiert ist: den originalen Profilnamen setzen
                     If Me._selectedProfile IsNot Nothing Then Me._selectedProfile.SetBackToOriginal()
 
+                    Me.pnlProfileigenschaften.Visible = False
                     ' den Speichern-Button deaktivieren 
                     Me.btnSpeichern.Enabled = False
                     ' den Löschen-Button deaktivieren 
@@ -173,6 +169,8 @@ Public Class frmNIProfileigenschaften
                 Return "keineAenderung"
                 ' wenn ein Profil selektiert ist: den originalen Profilnamen setzen
                 If Me._selectedProfile IsNot Nothing Then Me._selectedProfile.SetBackToOriginal()
+
+                Me.pnlProfileigenschaften.Visible = False
                 ' den Speichern-Button deaktivieren 
                 Me.btnSpeichern.Enabled = False
                 ' den Löschen-Button deaktivieren 
@@ -248,6 +246,7 @@ Public Class frmNIProfileigenschaften
             Me._selectedProfile = ClassNIProfile.getProfilByName(name)
             ' wenn das selektierte Profil gefunden wurde
             If Me._selectedProfile IsNot Nothing Then
+                Me.pnlProfileigenschaften.Visible = True
                 Me.lblSave.Visible = False
                 ' die Steuerelemente für die Profilinformationen mit den Daten füllen
                 Me.txtProfilname.Text = Me._selectedProfile.Profilname
@@ -436,8 +435,8 @@ Public Class frmNIProfileigenschaften
                         If _selectedProfile.Password <> "" And _selectedProfile.UserId <> "" Then
                             Me.chkbxUserIdent.Checked = False
                             Me.txtLDAP_User.Text = _selectedProfile.UserId
-                            licenseManager = New ClassLicenseManager("#DigitalData9731258!#")
-                            Dim PWDecode As String = licenseManager.DecodeLicenseKey(_selectedProfile.Password)
+                            passwordCrypto = New ClassPasswordCrypto("#DigitalData9731258!#")
+                            Dim PWDecode As String = passwordCrypto.DecodePassword(_selectedProfile.Password)
                             Me.txtLDAP_PW.Text = PWDecode
                         Else
                             Me.chkbxUserIdent.Checked = True
@@ -501,6 +500,7 @@ Public Class frmNIProfileigenschaften
                 ' Das Profil auf gespeichert setzen, da ja keine Änderungen am Profil selbst gemacht wurden. Das Profil
                 ' hat jedoch zu diesem Zeitpunkt den Status HasChanges(), da der Inhalt der Steuerelemente verändert wurde.
                 Me._selectedProfile.setSaved()
+                Me._selectedProfile._links.setLinksSaved()
                 btnVerknüpfungen.Visible = True
             Else
                 btnVerknüpfungen.Visible = False
@@ -515,7 +515,7 @@ Public Class frmNIProfileigenschaften
 
 
     Private Sub cmbProfilauswahl_DropDownItemClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ToolStripItemClickedEventArgs) Handles cmbProfilauswahl.DropDownItemClicked
-        ' wenn bereits ein Profil ausgewählt wurde
+
         If Me._selectedProfile IsNot Nothing Then
             Me.cmbIndexValidierung.SelectedIndex = -1
             If _selectedProfile.HasChanges Then
@@ -540,24 +540,8 @@ Public Class frmNIProfileigenschaften
     End Sub
 
     Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click
-        Try
-            For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                Select Case license.Modulename.ToUpper
-                    Case "NACHINDEXIERUNG"
-                        If Prof_Anzahl + 1 > license.Anz_Profile Then
-                            MsgBox("Die Maximalanzahl der lizensierten Nachindexierungs-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
-                            Exit Sub
-                        End If
-                End Select
-
-            Next
-        Catch ex As Exception
-            If My.Settings.licensekey <> "DD MaxLicense" Then
-                MsgBox("Error Adding Profile due to license issue!", MsgBoxStyle.Critical)
-            End If
-        End Try
-
-        frmLogin_NI.ShowDialog()
+        'frmLogin_NI.ShowDialog()
+        frmNIProfilhinzufuegen.ShowDialog()
         ' wenn das Formular geschlossen wurde, werden die Profile neu in die Combobox geladen
         Me.LoadProfilesInCombobox()
     End Sub
@@ -660,20 +644,24 @@ Public Class frmNIProfileigenschaften
             If result = MsgBoxResult.Yes Then
                 ' das Profil löschen
                 If ClassNIProfile.DeleteProfil(Me._selectedProfile.OriginalProfilname) Then
+
+                    Me.pnlProfileigenschaften.Visible = False
                     ' den Speichern-Button deaktivieren 
                     Me.btnSpeichern.Enabled = False
                     ' den Löschen-Button deaktivieren 
                     Me.btnLöschen.Enabled = False
                     ' kein Profil als selektiert wählen
                     Me._selectedProfile = Nothing
+
+                    Me.lblProfil.Text = "Kein Profil gewählt"
                     ' die Profile neu in die Combobox laden
                     Me.LoadProfilesInCombobox()
                     'Das erste Profil laden
-                    Try
-                        Lade_Profil(Me.cmbProfilauswahl.DropDownItems(0).ToString)
-                    Catch ex As Exception
+                    'Try
+                    '    Lade_Profil(Me.cmbProfilauswahl.DropDownItems(0).ToString)
+                    'Catch ex As Exception
 
-                    End Try
+                    'End Try
 
                 End If
             End If
@@ -830,11 +818,15 @@ Public Class frmNIProfileigenschaften
     End Sub
 
     Private Sub btnVerknüpfungen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnVerknüpfungen.Click
+
+        ClassNIProfile.aktivesProfil = Me._selectedProfile
+        ClassNIProfile.aktivesProfilAusProfileigenschaften = True
         Cursor = Cursors.WaitCursor
         Dim frm As New frmNIVerknuepfungen
         frm = frmNIVerknuepfungen.Instance
         frm.MdiParent = frmStart
         frm.Show()
+        frm.BringToFront()
         Cursor = Cursors.Default
     End Sub
 
@@ -1022,24 +1014,8 @@ Public Class frmNIProfileigenschaften
                         My.Settings.Save()
                     Case "Oracle"
                         Try
-                            Dim conn As New OracleConnectionStringBuilder
-                            If chkOR_ohne_TNS.Checked Then
-                                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & txtDataSource1.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                    txtDataSource2.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";"
-                            Else
-                                conn.DataSource = txtDataSource2.Text
-                                conn.UserID = txtUserId.Text
-                                conn.Password = txtPassword.Text
-                                conn.PersistSecurityInfo = True
-                                conn.ConnectionTimeout = 120
-                                connstr = conn.ConnectionString
-                            End If
+                            _Logger.Warn("ORACLE SQL-Command nicht integriert!")
 
-                            Dim connection As New OracleConnection(connstr)
-                            connection.Open()
-
-                            MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, "Erfolg:")
-                            My.Settings.Save()
 
                         Catch ex As Exception
                             MsgBox(ex.Message & vbNewLine & vbNewLine & connstr, MsgBoxStyle.Critical, "Fehler bei Verbindungsaufbau Oracle:")
@@ -1110,10 +1086,10 @@ Public Class frmNIProfileigenschaften
     End Sub
 
     Private Sub frmNIProfileigenschaften_Load(sender As Object, e As EventArgs) Handles Me.Load
-        If LICENSE_MoveRename = True Then
-            grpbxMORE.Enabled = True
+        If Me._selectedProfile Is Nothing Then
+            Me.pnlProfileigenschaften.Visible = False
         Else
-            grpbxMORE.Enabled = False
+            Lade_Profil(Me._selectedProfile.Profilname)
         End If
     End Sub
 
@@ -1166,8 +1142,8 @@ Public Class frmNIProfileigenschaften
 
     Private Sub txtLDAP_PW_TextChanged(sender As Object, e As EventArgs) Handles txtLDAP_PW.TextChanged
         If Me._selectedProfile IsNot Nothing Then
-            licenseManager = New ClassLicenseManager("#DigitalData9731258!#")
-            Dim encodePW As String = licenseManager.EncodeLicenseKey(txtLDAP_PW.Text, "#DigitalData9731258!#")
+            passwordCrypto = New ClassPasswordCrypto("#DigitalData9731258!#")
+            Dim encodePW As String = passwordCrypto.EncodePassword(txtLDAP_PW.Text, "#DigitalData9731258!#")
             Me._selectedProfile.Password = encodePW
             If Not Me._selectedProfile.Password = Me._selectedProfile.OriginalPassword Then
                 Me.btnSpeichern.Enabled = True

ToolCollection/frmNIProfilhinzufuegen.vb

@@ -4,7 +4,7 @@ Public Class frmNIProfilhinzufuegen
     Private _oDokumentTypen As WINDREAMLib.WMObjects
     Public Shared _windream As ClassWindream_allgemein
     Private Shared _Instance As frmNIProfilhinzufuegen = Nothing
-    Private licenseManager As ClassLicenseManager = Nothing
+    Private passwordCrypto As ClassPasswordCrypto = Nothing
 
 
     Public Shared Function Instance() As frmNIProfilhinzufuegen
@@ -34,7 +34,6 @@ Public Class frmNIProfilhinzufuegen
         ' Standardbuttons festlegen
         Me.AcceptButton = Me.btnOK
         Me.CancelButton = Me.btnAbbrechen
-        frmLogin_NI.Close()
     End Sub
     Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
 
@@ -139,8 +138,8 @@ Public Class frmNIProfilhinzufuegen
             ' Nachindexierung über AD
             If Me.txtProfilname.Text <> "" And Me.cmbObjektTypen.SelectedIndex <> -1 And Me.txtWindreamSuche.Text <> "" Then
                 If chkbxUserIdent.Checked = False And txtLDAP_Domaene.Text <> "" And txtLDAP_PW.Text <> "" And txtLDAP_User.Text <> "" Then
-                    Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#")
-                    Dim key As String = licenseManager.EncodeLicenseKey(txtLDAP_PW.Text, "#DigitalData9731258!#")
+                    Me.passwordCrypto = New ClassPasswordCrypto("#DigitalData9731258!#")
+                    Dim key As String = passwordCrypto.EncodePassword(txtLDAP_PW.Text, "#DigitalData9731258!#")
                     ' das Profil hinzufügen -  AD MIT AUTH
                     ClassNIProfile.Add(Me.txtProfilname.Text, Me.cmbObjektTypen.SelectedItem, Me.txtWindreamSuche.Text, "activedirectory", "", "", txtLDAP_Domaene.Text, txtLDAP_User.Text, key, "", Me.cmbIndexValidierung.Text, "", 0, Me.chkbxGetOrdnerRechte.Checked, Me.cmbOrdnertyp.Text)
                     ' und das Formular schließen
@@ -338,25 +337,7 @@ Public Class frmNIProfilhinzufuegen
                         My.Settings.Save()
                         Dim connstr As String
                         Try
-                            Dim conn As New OracleConnectionStringBuilder
 
-                            If chkOR_ohne_TNS.Checked Then
-                                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & txtDataSource.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
-                                    txtInitialCatalog.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";"
-                            Else
-                                conn.DataSource = txtInitialCatalog.Text
-                                conn.UserID = txtUserId.Text
-                                conn.Password = txtPassword.Text
-                                conn.PersistSecurityInfo = True
-                                conn.ConnectionTimeout = 120
-                                connstr = conn.ConnectionString
-                            End If
-
-                            Dim connection As New OracleConnection(connstr)
-                            connection.Open()
-
-                            MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, "Erfolg:")
-                            My.Settings.Save()
 
                         Catch ex As Exception
                             MsgBox(ex.Message & vbNewLine & vbNewLine & connstr, MsgBoxStyle.Critical, "Fehler bei Verbindungsaufbau Oracle:")

ToolCollection/frmNIVerknuepfungen.Designer.vb

@@ -58,7 +58,6 @@ Partial Class frmNIVerknuepfungen
         Me.Label9 = New System.Windows.Forms.Label()
         Me.gbUpdate = New System.Windows.Forms.GroupBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.Button5 = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblsaveSQLAnweisung = New System.Windows.Forms.Label()
         Me.cmbWindreamIndexeSQL = New System.Windows.Forms.ComboBox()
@@ -73,7 +72,6 @@ Partial Class frmNIVerknuepfungen
         Me.btnAddNI_Objekt = New System.Windows.Forms.Button()
         Me.Label40 = New System.Windows.Forms.Label()
         Me.cmbNI_Objekte = New System.Windows.Forms.ComboBox()
-        Me.btnsave_select = New System.Windows.Forms.Button()
         Me.btnSpalteEinfügen = New System.Windows.Forms.Button()
         Me.btnWindreamIndexEinfügen = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -169,6 +167,10 @@ Partial Class frmNIVerknuepfungen
         Me.rbvkt_add = New System.Windows.Forms.RadioButton()
         Me.rbvkt_overwrite = New System.Windows.Forms.RadioButton()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+        Me.pnlFooter = New System.Windows.Forms.Panel()
+        Me.btnSaveAllAndClose = New System.Windows.Forms.Button()
+        Me.btnCancelAllAndClose = New System.Windows.Forms.Button()
+        Me.btnSaveAll = New System.Windows.Forms.Button()
         Me.StatusStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -191,6 +193,7 @@ Partial Class frmNIVerknuepfungen
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
         Me.SplitContainer1.SuspendLayout()
+        Me.pnlFooter.SuspendLayout()
         Me.SuspendLayout()
         '
         'txtfinalSkriptUpdate
@@ -205,7 +208,8 @@ Partial Class frmNIVerknuepfungen
         Me.txtfinalSkriptUpdate.Multiline = True
         Me.txtfinalSkriptUpdate.Name = "txtfinalSkriptUpdate"
         Me.txtfinalSkriptUpdate.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.txtfinalSkriptUpdate.Size = New System.Drawing.Size(963, 138)
+        Me.txtfinalSkriptUpdate.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtfinalSkriptUpdate.Size = New System.Drawing.Size(868, 166)
         Me.txtfinalSkriptUpdate.TabIndex = 29
         '
         'cmbDatenbankSpalten
@@ -215,7 +219,7 @@ Partial Class frmNIVerknuepfungen
         Me.cmbDatenbankSpalten.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cmbDatenbankSpalten.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.cmbDatenbankSpalten.FormattingEnabled = True
-        Me.cmbDatenbankSpalten.Location = New System.Drawing.Point(996, 119)
+        Me.cmbDatenbankSpalten.Location = New System.Drawing.Point(996, 122)
         Me.cmbDatenbankSpalten.Name = "cmbDatenbankSpalten"
         Me.cmbDatenbankSpalten.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.cmbDatenbankSpalten.Size = New System.Drawing.Size(191, 21)
@@ -228,7 +232,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label8.AutoSize = True
         Me.Label8.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.Label8.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label8.Location = New System.Drawing.Point(880, 122)
+        Me.Label8.Location = New System.Drawing.Point(884, 125)
         Me.Label8.Name = "Label8"
         Me.Label8.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.Label8.Size = New System.Drawing.Size(105, 13)
@@ -357,10 +361,10 @@ Partial Class frmNIVerknuepfungen
         Me.btnZurücksetzen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnZurücksetzen.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.btnZurücksetzen.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnZurücksetzen.Location = New System.Drawing.Point(996, 32)
+        Me.btnZurücksetzen.Location = New System.Drawing.Point(997, 32)
         Me.btnZurücksetzen.Name = "btnZurücksetzen"
         Me.btnZurücksetzen.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.btnZurücksetzen.Size = New System.Drawing.Size(89, 21)
+        Me.btnZurücksetzen.Size = New System.Drawing.Size(110, 24)
         Me.btnZurücksetzen.TabIndex = 33
         Me.btnZurücksetzen.Text = "Zurücksetzen"
         Me.btnZurücksetzen.UseVisualStyleBackColor = True
@@ -376,7 +380,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label6.AutoSize = True
         Me.Label6.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.Label6.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label6.Location = New System.Drawing.Point(879, 149)
+        Me.Label6.Location = New System.Drawing.Point(884, 152)
         Me.Label6.Name = "Label6"
         Me.Label6.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.Label6.Size = New System.Drawing.Size(99, 13)
@@ -400,7 +404,7 @@ Partial Class frmNIVerknuepfungen
         Me.cmbWindreamIndexe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cmbWindreamIndexe.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.cmbWindreamIndexe.FormattingEnabled = True
-        Me.cmbWindreamIndexe.Location = New System.Drawing.Point(996, 146)
+        Me.cmbWindreamIndexe.Location = New System.Drawing.Point(996, 149)
         Me.cmbWindreamIndexe.Name = "cmbWindreamIndexe"
         Me.cmbWindreamIndexe.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.cmbWindreamIndexe.Size = New System.Drawing.Size(191, 21)
@@ -412,7 +416,7 @@ Partial Class frmNIVerknuepfungen
         Me.GroupBox1.Controls.Add(Me.Button3)
         Me.GroupBox1.Controls.Add(Me.Button1)
         Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox1.Location = New System.Drawing.Point(975, 47)
+        Me.GroupBox1.Location = New System.Drawing.Point(890, 47)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(147, 83)
         Me.GroupBox1.TabIndex = 50
@@ -467,7 +471,7 @@ Partial Class frmNIVerknuepfungen
         Me.btnStandardSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.btnStandardSQL.Location = New System.Drawing.Point(880, 32)
         Me.btnStandardSQL.Name = "btnStandardSQL"
-        Me.btnStandardSQL.Size = New System.Drawing.Size(110, 21)
+        Me.btnStandardSQL.Size = New System.Drawing.Size(110, 24)
         Me.btnStandardSQL.TabIndex = 42
         Me.btnStandardSQL.Text = "SQL Grundgerüst"
         Me.btnStandardSQL.UseVisualStyleBackColor = True
@@ -477,14 +481,12 @@ Partial Class frmNIVerknuepfungen
         Me.btnWindreamIndexEinfügenSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnWindreamIndexEinfügenSQL.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnWindreamIndexEinfügenSQL.Image = Global.ToolCollection.My.Resources.Resources.add
-        Me.btnWindreamIndexEinfügenSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnWindreamIndexEinfügenSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnWindreamIndexEinfügenSQL.Location = New System.Drawing.Point(1161, 149)
+        Me.btnWindreamIndexEinfügenSQL.Location = New System.Drawing.Point(1194, 149)
         Me.btnWindreamIndexEinfügenSQL.Name = "btnWindreamIndexEinfügenSQL"
         Me.btnWindreamIndexEinfügenSQL.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.btnWindreamIndexEinfügenSQL.Size = New System.Drawing.Size(69, 21)
+        Me.btnWindreamIndexEinfügenSQL.Size = New System.Drawing.Size(33, 22)
         Me.btnWindreamIndexEinfügenSQL.TabIndex = 47
-        Me.btnWindreamIndexEinfügenSQL.Text = "Add"
         Me.btnWindreamIndexEinfügenSQL.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnWindreamIndexEinfügenSQL.UseVisualStyleBackColor = True
         '
@@ -501,27 +503,27 @@ Partial Class frmNIVerknuepfungen
         'btnEindIndex
         '
         Me.btnEindIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnEindIndex.Font = New System.Drawing.Font("Segoe UI", 8.25!)
+        Me.btnEindIndex.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnEindIndex.ForeColor = System.Drawing.Color.OrangeRed
         Me.btnEindIndex.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnEindIndex.Location = New System.Drawing.Point(880, 59)
+        Me.btnEindIndex.Location = New System.Drawing.Point(880, 85)
         Me.btnEindIndex.Name = "btnEindIndex"
         Me.btnEindIndex.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.btnEindIndex.Size = New System.Drawing.Size(89, 21)
+        Me.btnEindIndex.Size = New System.Drawing.Size(110, 24)
         Me.btnEindIndex.TabIndex = 49
-        Me.btnEindIndex.Text = "Eind. Index"
+        Me.btnEindIndex.Text = "Eindeutiger Index"
         Me.btnEindIndex.UseVisualStyleBackColor = True
         '
         'Panel1
         '
         Me.Panel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Panel1.BackColor = System.Drawing.Color.Lime
+        Me.Panel1.BackColor = System.Drawing.Color.GreenYellow
         Me.Panel1.Controls.Add(Me.lblSQLTest)
         Me.Panel1.Controls.Add(Me.txtTestwert)
         Me.Panel1.Controls.Add(Me.btnTestSQL)
-        Me.Panel1.Location = New System.Drawing.Point(996, 59)
+        Me.Panel1.Location = New System.Drawing.Point(996, 62)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(200, 52)
+        Me.Panel1.Size = New System.Drawing.Size(228, 52)
         Me.Panel1.TabIndex = 48
         '
         'lblSQLTest
@@ -540,7 +542,7 @@ Partial Class frmNIVerknuepfungen
         Me.txtTestwert.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.txtTestwert.Location = New System.Drawing.Point(3, 24)
         Me.txtTestwert.Name = "txtTestwert"
-        Me.txtTestwert.Size = New System.Drawing.Size(93, 22)
+        Me.txtTestwert.Size = New System.Drawing.Size(100, 22)
         Me.txtTestwert.TabIndex = 45
         '
         'btnTestSQL
@@ -549,12 +551,11 @@ Partial Class frmNIVerknuepfungen
         Me.btnTestSQL.Image = Global.ToolCollection.My.Resources.Resources.ico2469
         Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnTestSQL.Location = New System.Drawing.Point(99, 24)
+        Me.btnTestSQL.Location = New System.Drawing.Point(109, 23)
         Me.btnTestSQL.Name = "btnTestSQL"
-        Me.btnTestSQL.Size = New System.Drawing.Size(92, 24)
+        Me.btnTestSQL.Size = New System.Drawing.Size(114, 24)
         Me.btnTestSQL.TabIndex = 44
         Me.btnTestSQL.Text = "SQL testen"
-        Me.btnTestSQL.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnTestSQL.UseVisualStyleBackColor = True
         '
         'Label9
@@ -563,18 +564,17 @@ Partial Class frmNIVerknuepfungen
         Me.Label9.AutoSize = True
         Me.Label9.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label9.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label9.Location = New System.Drawing.Point(977, 133)
+        Me.Label9.Location = New System.Drawing.Point(887, 154)
         Me.Label9.Name = "Label9"
         Me.Label9.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.Label9.Size = New System.Drawing.Size(92, 13)
+        Me.Label9.Size = New System.Drawing.Size(94, 13)
         Me.Label9.TabIndex = 46
-        Me.Label9.Text = "windream Index:"
+        Me.Label9.Text = "Windream Index:"
         Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'gbUpdate
         '
         Me.gbUpdate.Controls.Add(Me.Label2)
-        Me.gbUpdate.Controls.Add(Me.Button5)
         Me.gbUpdate.Controls.Add(Me.Label1)
         Me.gbUpdate.Controls.Add(Me.lblsaveSQLAnweisung)
         Me.gbUpdate.Controls.Add(Me.GroupBox1)
@@ -586,7 +586,7 @@ Partial Class frmNIVerknuepfungen
         Me.gbUpdate.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.gbUpdate.Location = New System.Drawing.Point(3, 3)
         Me.gbUpdate.Name = "gbUpdate"
-        Me.gbUpdate.Size = New System.Drawing.Size(1251, 190)
+        Me.gbUpdate.Size = New System.Drawing.Size(1251, 218)
         Me.gbUpdate.TabIndex = 39
         Me.gbUpdate.TabStop = False
         Me.gbUpdate.Text = "SQL-Befehl oder Skript (ausgeführt nach jedem Dateidurchlauf)"
@@ -600,21 +600,6 @@ Partial Class frmNIVerknuepfungen
         Me.Label2.TabIndex = 55
         Me.Label2.Text = "EXECUTEVB  PathToMyVBScriptfile.vbs Argument#Argument2#Argument3"
         '
-        'Button5
-        '
-        Me.Button5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button5.Font = New System.Drawing.Font("Segoe UI", 8.25!)
-        Me.Button5.Image = Global.ToolCollection.My.Resources.Resources.save
-        Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button5.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Button5.Location = New System.Drawing.Point(1141, 97)
-        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(89, 23)
-        Me.Button5.TabIndex = 54
-        Me.Button5.Text = "Speichern"
-        Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button5.UseVisualStyleBackColor = True
-        '
         'Label1
         '
         Me.Label1.AutoSize = True
@@ -631,7 +616,7 @@ Partial Class frmNIVerknuepfungen
         Me.lblsaveSQLAnweisung.AutoSize = True
         Me.lblsaveSQLAnweisung.BackColor = System.Drawing.Color.Yellow
         Me.lblsaveSQLAnweisung.Font = New System.Drawing.Font("Segoe UI Semibold", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblsaveSQLAnweisung.Location = New System.Drawing.Point(980, 173)
+        Me.lblsaveSQLAnweisung.Location = New System.Drawing.Point(887, 185)
         Me.lblsaveSQLAnweisung.Name = "lblsaveSQLAnweisung"
         Me.lblsaveSQLAnweisung.Size = New System.Drawing.Size(38, 13)
         Me.lblsaveSQLAnweisung.TabIndex = 51
@@ -644,10 +629,10 @@ Partial Class frmNIVerknuepfungen
         Me.cmbWindreamIndexeSQL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cmbWindreamIndexeSQL.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cmbWindreamIndexeSQL.FormattingEnabled = True
-        Me.cmbWindreamIndexeSQL.Location = New System.Drawing.Point(980, 149)
+        Me.cmbWindreamIndexeSQL.Location = New System.Drawing.Point(997, 149)
         Me.cmbWindreamIndexeSQL.Name = "cmbWindreamIndexeSQL"
         Me.cmbWindreamIndexeSQL.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.cmbWindreamIndexeSQL.Size = New System.Drawing.Size(164, 21)
+        Me.cmbWindreamIndexeSQL.Size = New System.Drawing.Size(191, 21)
         Me.cmbWindreamIndexeSQL.TabIndex = 45
         '
         'lblDescr_Verknüpfungen
@@ -711,7 +696,7 @@ Partial Class frmNIVerknuepfungen
         Me.rbTables.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.rbTables.Location = New System.Drawing.Point(132, 8)
         Me.rbTables.Name = "rbTables"
-        Me.rbTables.Size = New System.Drawing.Size(68, 17)
+        Me.rbTables.Size = New System.Drawing.Size(67, 17)
         Me.rbTables.TabIndex = 29
         Me.rbTables.Text = "Tabellen"
         Me.rbTables.UseVisualStyleBackColor = True
@@ -736,7 +721,6 @@ Partial Class frmNIVerknuepfungen
         Me.grbFilterDB.Controls.Add(Me.cmbNI_Objekte)
         Me.grbFilterDB.Controls.Add(Me.btnEindIndex)
         Me.grbFilterDB.Controls.Add(Me.Panel1)
-        Me.grbFilterDB.Controls.Add(Me.btnsave_select)
         Me.grbFilterDB.Controls.Add(Me.btnStandardSQL)
         Me.grbFilterDB.Controls.Add(Me.btnSpalteEinfügen)
         Me.grbFilterDB.Controls.Add(Me.cmbDatenbankSpalten)
@@ -753,7 +737,7 @@ Partial Class frmNIVerknuepfungen
         Me.grbFilterDB.Location = New System.Drawing.Point(10, 304)
         Me.grbFilterDB.Name = "grbFilterDB"
         Me.grbFilterDB.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.grbFilterDB.Size = New System.Drawing.Size(1243, 214)
+        Me.grbFilterDB.Size = New System.Drawing.Size(1243, 228)
         Me.grbFilterDB.TabIndex = 23
         Me.grbFilterDB.TabStop = False
         Me.grbFilterDB.Text = "  Einschränkung der Datenbankansicht zum Auslesen des windream-Indexes  "
@@ -765,7 +749,7 @@ Partial Class frmNIVerknuepfungen
         Me.btnAddNI_Objekt.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.btnAddNI_Objekt.Image = Global.ToolCollection.My.Resources.Resources.add
         Me.btnAddNI_Objekt.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnAddNI_Objekt.Location = New System.Drawing.Point(1193, 175)
+        Me.btnAddNI_Objekt.Location = New System.Drawing.Point(1193, 177)
         Me.btnAddNI_Objekt.Name = "btnAddNI_Objekt"
         Me.btnAddNI_Objekt.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.btnAddNI_Objekt.Size = New System.Drawing.Size(33, 22)
@@ -778,7 +762,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label40.AutoSize = True
         Me.Label40.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.Label40.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label40.Location = New System.Drawing.Point(877, 175)
+        Me.Label40.Location = New System.Drawing.Point(884, 180)
         Me.Label40.Name = "Label40"
         Me.Label40.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.Label40.Size = New System.Drawing.Size(97, 13)
@@ -793,35 +777,19 @@ Partial Class frmNIVerknuepfungen
         Me.cmbNI_Objekte.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.cmbNI_Objekte.FormattingEnabled = True
         Me.cmbNI_Objekte.Items.AddRange(New Object() {"Dokument - Dateiname.Endung", "Dokument - Dateiname", "Dokument - Pfad", "Dokument - Pfad\Dateiname.Endung", "Datum - heute"})
-        Me.cmbNI_Objekte.Location = New System.Drawing.Point(996, 174)
+        Me.cmbNI_Objekte.Location = New System.Drawing.Point(996, 177)
         Me.cmbNI_Objekte.Name = "cmbNI_Objekte"
         Me.cmbNI_Objekte.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.cmbNI_Objekte.Size = New System.Drawing.Size(191, 21)
         Me.cmbNI_Objekte.TabIndex = 50
         '
-        'btnsave_select
-        '
-        Me.btnsave_select.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnsave_select.Enabled = False
-        Me.btnsave_select.Font = New System.Drawing.Font("Segoe UI", 8.25!)
-        Me.btnsave_select.Image = Global.ToolCollection.My.Resources.Resources.save
-        Me.btnsave_select.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnsave_select.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnsave_select.Location = New System.Drawing.Point(1091, 32)
-        Me.btnsave_select.Name = "btnsave_select"
-        Me.btnsave_select.Size = New System.Drawing.Size(89, 23)
-        Me.btnsave_select.TabIndex = 47
-        Me.btnsave_select.Text = "Speichern"
-        Me.btnsave_select.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnsave_select.UseVisualStyleBackColor = True
-        '
         'btnSpalteEinfügen
         '
         Me.btnSpalteEinfügen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnSpalteEinfügen.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.btnSpalteEinfügen.Image = Global.ToolCollection.My.Resources.Resources.add
         Me.btnSpalteEinfügen.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnSpalteEinfügen.Location = New System.Drawing.Point(1193, 118)
+        Me.btnSpalteEinfügen.Location = New System.Drawing.Point(1193, 121)
         Me.btnSpalteEinfügen.Name = "btnSpalteEinfügen"
         Me.btnSpalteEinfügen.Size = New System.Drawing.Size(33, 22)
         Me.btnSpalteEinfügen.TabIndex = 36
@@ -834,7 +802,7 @@ Partial Class frmNIVerknuepfungen
         Me.btnWindreamIndexEinfügen.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.btnWindreamIndexEinfügen.Image = Global.ToolCollection.My.Resources.Resources.add
         Me.btnWindreamIndexEinfügen.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnWindreamIndexEinfügen.Location = New System.Drawing.Point(1193, 146)
+        Me.btnWindreamIndexEinfügen.Location = New System.Drawing.Point(1193, 149)
         Me.btnWindreamIndexEinfügen.Name = "btnWindreamIndexEinfügen"
         Me.btnWindreamIndexEinfügen.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.btnWindreamIndexEinfügen.Size = New System.Drawing.Size(33, 22)
@@ -868,7 +836,7 @@ Partial Class frmNIVerknuepfungen
         Me.txtSelectAnweisung.Name = "txtSelectAnweisung"
         Me.txtSelectAnweisung.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.txtSelectAnweisung.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.txtSelectAnweisung.Size = New System.Drawing.Size(865, 175)
+        Me.txtSelectAnweisung.Size = New System.Drawing.Size(865, 189)
         Me.txtSelectAnweisung.TabIndex = 28
         '
         'Label5
@@ -935,11 +903,11 @@ Partial Class frmNIVerknuepfungen
         Me.tabctrlbottom.Controls.Add(Me.TabPage6)
         Me.tabctrlbottom.Controls.Add(Me.TabPage1)
         Me.tabctrlbottom.Controls.Add(Me.TabPage2)
-        Me.tabctrlbottom.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.tabctrlbottom.Dock = System.Windows.Forms.DockStyle.Top
         Me.tabctrlbottom.Location = New System.Drawing.Point(0, 0)
         Me.tabctrlbottom.Name = "tabctrlbottom"
         Me.tabctrlbottom.SelectedIndex = 0
-        Me.tabctrlbottom.Size = New System.Drawing.Size(1265, 222)
+        Me.tabctrlbottom.Size = New System.Drawing.Size(1265, 250)
         Me.tabctrlbottom.TabIndex = 41
         Me.tabctrlbottom.Visible = False
         '
@@ -957,7 +925,7 @@ Partial Class frmNIVerknuepfungen
         Me.TabPage6.Location = New System.Drawing.Point(4, 22)
         Me.TabPage6.Name = "TabPage6"
         Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage6.Size = New System.Drawing.Size(1257, 196)
+        Me.TabPage6.Size = New System.Drawing.Size(1257, 224)
         Me.TabPage6.TabIndex = 3
         Me.TabPage6.Text = "Überprüfung deskriptiver Index"
         Me.TabPage6.UseVisualStyleBackColor = True
@@ -965,9 +933,9 @@ Partial Class frmNIVerknuepfungen
         'btnzuruecksetzen_checksql
         '
         Me.btnzuruecksetzen_checksql.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnzuruecksetzen_checksql.Location = New System.Drawing.Point(1008, 23)
+        Me.btnzuruecksetzen_checksql.Location = New System.Drawing.Point(1003, 21)
         Me.btnzuruecksetzen_checksql.Name = "btnzuruecksetzen_checksql"
-        Me.btnzuruecksetzen_checksql.Size = New System.Drawing.Size(84, 23)
+        Me.btnzuruecksetzen_checksql.Size = New System.Drawing.Size(110, 24)
         Me.btnzuruecksetzen_checksql.TabIndex = 51
         Me.btnzuruecksetzen_checksql.Text = "Zurücksetzen"
         Me.btnzuruecksetzen_checksql.UseVisualStyleBackColor = True
@@ -975,9 +943,9 @@ Partial Class frmNIVerknuepfungen
         'txtGrundgeruest_check
         '
         Me.txtGrundgeruest_check.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtGrundgeruest_check.Location = New System.Drawing.Point(897, 21)
+        Me.txtGrundgeruest_check.Location = New System.Drawing.Point(886, 21)
         Me.txtGrundgeruest_check.Name = "txtGrundgeruest_check"
-        Me.txtGrundgeruest_check.Size = New System.Drawing.Size(105, 21)
+        Me.txtGrundgeruest_check.Size = New System.Drawing.Size(110, 24)
         Me.txtGrundgeruest_check.TabIndex = 50
         Me.txtGrundgeruest_check.Text = "SQL Grundgerüst"
         Me.txtGrundgeruest_check.UseVisualStyleBackColor = True
@@ -985,13 +953,13 @@ Partial Class frmNIVerknuepfungen
         'Panel2
         '
         Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Panel2.BackColor = System.Drawing.Color.Lime
+        Me.Panel2.BackColor = System.Drawing.Color.GreenYellow
         Me.Panel2.Controls.Add(Me.lblIndextestSQL)
         Me.Panel2.Controls.Add(Me.txtTestwert_checkindex)
         Me.Panel2.Controls.Add(Me.btntest_checkIndexsql)
-        Me.Panel2.Location = New System.Drawing.Point(897, 115)
+        Me.Panel2.Location = New System.Drawing.Point(1003, 51)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(205, 52)
+        Me.Panel2.Size = New System.Drawing.Size(227, 52)
         Me.Panel2.TabIndex = 49
         '
         'lblIndextestSQL
@@ -1010,7 +978,7 @@ Partial Class frmNIVerknuepfungen
         Me.txtTestwert_checkindex.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.txtTestwert_checkindex.Location = New System.Drawing.Point(3, 24)
         Me.txtTestwert_checkindex.Name = "txtTestwert_checkindex"
-        Me.txtTestwert_checkindex.Size = New System.Drawing.Size(93, 22)
+        Me.txtTestwert_checkindex.Size = New System.Drawing.Size(100, 22)
         Me.txtTestwert_checkindex.TabIndex = 45
         '
         'btntest_checkIndexsql
@@ -1019,12 +987,11 @@ Partial Class frmNIVerknuepfungen
         Me.btntest_checkIndexsql.Image = Global.ToolCollection.My.Resources.Resources.ico2469
         Me.btntest_checkIndexsql.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btntest_checkIndexsql.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btntest_checkIndexsql.Location = New System.Drawing.Point(99, 24)
+        Me.btntest_checkIndexsql.Location = New System.Drawing.Point(109, 23)
         Me.btntest_checkIndexsql.Name = "btntest_checkIndexsql"
-        Me.btntest_checkIndexsql.Size = New System.Drawing.Size(93, 24)
+        Me.btntest_checkIndexsql.Size = New System.Drawing.Size(113, 24)
         Me.btntest_checkIndexsql.TabIndex = 44
         Me.btntest_checkIndexsql.Text = "SQL testen"
-        Me.btntest_checkIndexsql.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btntest_checkIndexsql.UseVisualStyleBackColor = True
         '
         'Label29
@@ -1032,7 +999,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.Label29.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label29.Location = New System.Drawing.Point(8, 3)
+        Me.Label29.Location = New System.Drawing.Point(8, 5)
         Me.Label29.Name = "Label29"
         Me.Label29.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.Label29.Size = New System.Drawing.Size(374, 13)
@@ -1044,12 +1011,12 @@ Partial Class frmNIVerknuepfungen
         '
         Me.btnSpalteIndexSQLeinfuegen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnSpalteIndexSQLeinfuegen.Font = New System.Drawing.Font("Segoe UI", 8.25!)
+        Me.btnSpalteIndexSQLeinfuegen.Image = Global.ToolCollection.My.Resources.Resources.add
         Me.btnSpalteIndexSQLeinfuegen.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnSpalteIndexSQLeinfuegen.Location = New System.Drawing.Point(1064, 76)
+        Me.btnSpalteIndexSQLeinfuegen.Location = New System.Drawing.Point(1199, 110)
         Me.btnSpalteIndexSQLeinfuegen.Name = "btnSpalteIndexSQLeinfuegen"
-        Me.btnSpalteIndexSQLeinfuegen.Size = New System.Drawing.Size(97, 22)
+        Me.btnSpalteIndexSQLeinfuegen.Size = New System.Drawing.Size(33, 22)
         Me.btnSpalteIndexSQLeinfuegen.TabIndex = 42
-        Me.btnSpalteIndexSQLeinfuegen.Text = "Spalte einfügen"
         Me.btnSpalteIndexSQLeinfuegen.UseVisualStyleBackColor = True
         '
         'txtCheckIndexSQL
@@ -1060,11 +1027,12 @@ Partial Class frmNIVerknuepfungen
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtCheckIndexSQL.BackColor = System.Drawing.Color.LemonChiffon
         Me.txtCheckIndexSQL.Font = New System.Drawing.Font("Segoe UI", 8.25!)
-        Me.txtCheckIndexSQL.Location = New System.Drawing.Point(9, 22)
+        Me.txtCheckIndexSQL.Location = New System.Drawing.Point(9, 21)
         Me.txtCheckIndexSQL.Multiline = True
         Me.txtCheckIndexSQL.Name = "txtCheckIndexSQL"
         Me.txtCheckIndexSQL.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.txtCheckIndexSQL.Size = New System.Drawing.Size(874, 245)
+        Me.txtCheckIndexSQL.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtCheckIndexSQL.Size = New System.Drawing.Size(868, 190)
         Me.txtCheckIndexSQL.TabIndex = 30
         '
         'cmbSpalten_indexSQL
@@ -1074,24 +1042,25 @@ Partial Class frmNIVerknuepfungen
         Me.cmbSpalten_indexSQL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cmbSpalten_indexSQL.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.cmbSpalten_indexSQL.FormattingEnabled = True
-        Me.cmbSpalten_indexSQL.Location = New System.Drawing.Point(897, 76)
+        Me.cmbSpalten_indexSQL.Location = New System.Drawing.Point(1002, 111)
         Me.cmbSpalten_indexSQL.Name = "cmbSpalten_indexSQL"
         Me.cmbSpalten_indexSQL.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.cmbSpalten_indexSQL.Size = New System.Drawing.Size(163, 21)
+        Me.cmbSpalten_indexSQL.Size = New System.Drawing.Size(191, 21)
         Me.cmbSpalten_indexSQL.Sorted = True
         Me.cmbSpalten_indexSQL.TabIndex = 41
         '
         'btnIndexSQL_einfuegen
         '
         Me.btnIndexSQL_einfuegen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnIndexSQL_einfuegen.Font = New System.Drawing.Font("Segoe UI", 8.25!)
+        Me.btnIndexSQL_einfuegen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnIndexSQL_einfuegen.ForeColor = System.Drawing.Color.OrangeRed
         Me.btnIndexSQL_einfuegen.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnIndexSQL_einfuegen.Location = New System.Drawing.Point(1167, 59)
+        Me.btnIndexSQL_einfuegen.Location = New System.Drawing.Point(886, 74)
         Me.btnIndexSQL_einfuegen.Name = "btnIndexSQL_einfuegen"
         Me.btnIndexSQL_einfuegen.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.btnIndexSQL_einfuegen.Size = New System.Drawing.Size(74, 38)
+        Me.btnIndexSQL_einfuegen.Size = New System.Drawing.Size(110, 24)
         Me.btnIndexSQL_einfuegen.TabIndex = 39
-        Me.btnIndexSQL_einfuegen.Text = "Eind. Index einfügen"
+        Me.btnIndexSQL_einfuegen.Text = "Eindeutiger Index"
         Me.btnIndexSQL_einfuegen.UseVisualStyleBackColor = True
         '
         'Label30
@@ -1100,7 +1069,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label30.AutoSize = True
         Me.Label30.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.Label30.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label30.Location = New System.Drawing.Point(897, 59)
+        Me.Label30.Location = New System.Drawing.Point(890, 114)
         Me.Label30.Name = "Label30"
         Me.Label30.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.Label30.Size = New System.Drawing.Size(105, 13)
@@ -1113,7 +1082,7 @@ Partial Class frmNIVerknuepfungen
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(1257, 196)
+        Me.TabPage1.Size = New System.Drawing.Size(1257, 224)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "SQL oder Skript-Befehl"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -1124,7 +1093,7 @@ Partial Class frmNIVerknuepfungen
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(1257, 196)
+        Me.TabPage2.Size = New System.Drawing.Size(1257, 224)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Zusatzoptionen"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -1150,7 +1119,7 @@ Partial Class frmNIVerknuepfungen
         Me.Label12.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label12.Location = New System.Drawing.Point(5, 17)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(646, 13)
+        Me.Label12.Size = New System.Drawing.Size(647, 13)
         Me.Label12.TabIndex = 38
         Me.Label12.Text = "Wenn ein SQL-Ergebnis geliefert wurde wird dieses Dokument als fertig indexiert m" &
     "arkiert! Voraussetzung Indextyp: Boolean"
@@ -1289,7 +1258,7 @@ Partial Class frmNIVerknuepfungen
         Me.pnlfulltext.Enabled = False
         Me.pnlfulltext.Location = New System.Drawing.Point(503, 291)
         Me.pnlfulltext.Name = "pnlfulltext"
-        Me.pnlfulltext.Size = New System.Drawing.Size(313, 220)
+        Me.pnlfulltext.Size = New System.Drawing.Size(313, 234)
         Me.pnlfulltext.TabIndex = 47
         Me.pnlfulltext.Visible = False
         '
@@ -1353,7 +1322,7 @@ Partial Class frmNIVerknuepfungen
         Me.rbFT_single.AutoSize = True
         Me.rbFT_single.Location = New System.Drawing.Point(6, 21)
         Me.rbFT_single.Name = "rbFT_single"
-        Me.rbFT_single.Size = New System.Drawing.Size(201, 17)
+        Me.rbFT_single.Size = New System.Drawing.Size(202, 17)
         Me.rbFT_single.TabIndex = 3
         Me.rbFT_single.Text = "Nur Bestimmte Position auswerten"
         Me.rbFT_single.UseVisualStyleBackColor = True
@@ -1472,7 +1441,7 @@ Partial Class frmNIVerknuepfungen
         Me.RichTextBox_RegEx.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.RichTextBox_RegEx.Location = New System.Drawing.Point(10, 88)
         Me.RichTextBox_RegEx.Name = "RichTextBox_RegEx"
-        Me.RichTextBox_RegEx.Size = New System.Drawing.Size(60, 122)
+        Me.RichTextBox_RegEx.Size = New System.Drawing.Size(60, 136)
         Me.RichTextBox_RegEx.TabIndex = 24
         Me.RichTextBox_RegEx.Text = ""
         '
@@ -1492,9 +1461,10 @@ Partial Class frmNIVerknuepfungen
         Me.Label27.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label27.Location = New System.Drawing.Point(7, 14)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(120, 13)
+        Me.Label27.Size = New System.Drawing.Size(761, 13)
         Me.Label27.TabIndex = 22
-        Me.Label27.Text = "2. Regular Expression:"
+        Me.Label27.Text = "2. Regular Expression: ACHTUNG: REGEX DARF NUR AUS EINER MATCHING GROUP BESTEHEN," &
+    " DA ES SONST FEHLER BEIM INDEXIEREN VERURSACHT!"
         '
         'GroupBox4
         '
@@ -1774,6 +1744,7 @@ Partial Class frmNIVerknuepfungen
         '
         'btnUnlink
         '
+        Me.btnUnlink.Enabled = False
         Me.btnUnlink.Image = Global.ToolCollection.My.Resources.Resources.link_break
         Me.btnUnlink.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.btnUnlink.Location = New System.Drawing.Point(409, 202)
@@ -1794,9 +1765,10 @@ Partial Class frmNIVerknuepfungen
         '
         'btnLink
         '
+        Me.btnLink.Enabled = False
         Me.btnLink.Image = Global.ToolCollection.My.Resources.Resources.link
         Me.btnLink.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnLink.Location = New System.Drawing.Point(407, 167)
+        Me.btnLink.Location = New System.Drawing.Point(409, 167)
         Me.btnLink.Name = "btnLink"
         Me.btnLink.Size = New System.Drawing.Size(28, 29)
         Me.btnLink.TabIndex = 15
@@ -1848,7 +1820,7 @@ Partial Class frmNIVerknuepfungen
         Me.pnlZielQuelle.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlZielQuelle.Location = New System.Drawing.Point(0, 0)
         Me.pnlZielQuelle.Name = "pnlZielQuelle"
-        Me.pnlZielQuelle.Size = New System.Drawing.Size(1265, 521)
+        Me.pnlZielQuelle.Size = New System.Drawing.Size(1265, 532)
         Me.pnlZielQuelle.TabIndex = 50
         '
         'rbFunctionsTb
@@ -1857,7 +1829,7 @@ Partial Class frmNIVerknuepfungen
         Me.rbFunctionsTb.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.rbFunctionsTb.Location = New System.Drawing.Point(322, 8)
         Me.rbFunctionsTb.Name = "rbFunctionsTb"
-        Me.rbFunctionsTb.Size = New System.Drawing.Size(112, 17)
+        Me.rbFunctionsTb.Size = New System.Drawing.Size(111, 17)
         Me.rbFunctionsTb.TabIndex = 81
         Me.rbFunctionsTb.Text = "Functions (Table)"
         Me.rbFunctionsTb.UseVisualStyleBackColor = True
@@ -1931,16 +1903,69 @@ Partial Class frmNIVerknuepfungen
         '
         'SplitContainer1.Panel2
         '
+        Me.SplitContainer1.Panel2.Controls.Add(Me.pnlFooter)
         Me.SplitContainer1.Panel2.Controls.Add(Me.tabctrlbottom)
-        Me.SplitContainer1.Size = New System.Drawing.Size(1265, 747)
-        Me.SplitContainer1.SplitterDistance = 521
+        Me.SplitContainer1.Size = New System.Drawing.Size(1265, 830)
+        Me.SplitContainer1.SplitterDistance = 532
         Me.SplitContainer1.TabIndex = 51
         '
+        'pnlFooter
+        '
+        Me.pnlFooter.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.pnlFooter.BackColor = System.Drawing.Color.Transparent
+        Me.pnlFooter.Controls.Add(Me.btnSaveAllAndClose)
+        Me.pnlFooter.Controls.Add(Me.btnCancelAllAndClose)
+        Me.pnlFooter.Controls.Add(Me.btnSaveAll)
+        Me.pnlFooter.Location = New System.Drawing.Point(0, 250)
+        Me.pnlFooter.Name = "pnlFooter"
+        Me.pnlFooter.Size = New System.Drawing.Size(1265, 44)
+        Me.pnlFooter.TabIndex = 53
+        '
+        'btnSaveAllAndClose
+        '
+        Me.btnSaveAllAndClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSaveAllAndClose.BackColor = System.Drawing.SystemColors.ControlLightLight
+        Me.btnSaveAllAndClose.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnSaveAllAndClose.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnSaveAllAndClose.Location = New System.Drawing.Point(883, 6)
+        Me.btnSaveAllAndClose.Name = "btnSaveAllAndClose"
+        Me.btnSaveAllAndClose.Size = New System.Drawing.Size(120, 30)
+        Me.btnSaveAllAndClose.TabIndex = 2
+        Me.btnSaveAllAndClose.Text = "Ok"
+        Me.btnSaveAllAndClose.UseVisualStyleBackColor = False
+        '
+        'btnCancelAllAndClose
+        '
+        Me.btnCancelAllAndClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCancelAllAndClose.BackColor = System.Drawing.SystemColors.ControlLightLight
+        Me.btnCancelAllAndClose.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancelAllAndClose.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCancelAllAndClose.Location = New System.Drawing.Point(1009, 6)
+        Me.btnCancelAllAndClose.Name = "btnCancelAllAndClose"
+        Me.btnCancelAllAndClose.Size = New System.Drawing.Size(120, 30)
+        Me.btnCancelAllAndClose.TabIndex = 1
+        Me.btnCancelAllAndClose.Text = "Abbrechen"
+        Me.btnCancelAllAndClose.UseVisualStyleBackColor = False
+        '
+        'btnSaveAll
+        '
+        Me.btnSaveAll.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSaveAll.BackColor = System.Drawing.SystemColors.ControlLightLight
+        Me.btnSaveAll.Enabled = False
+        Me.btnSaveAll.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnSaveAll.Location = New System.Drawing.Point(1135, 6)
+        Me.btnSaveAll.Name = "btnSaveAll"
+        Me.btnSaveAll.Size = New System.Drawing.Size(120, 30)
+        Me.btnSaveAll.TabIndex = 0
+        Me.btnSaveAll.Text = "Übernehmen"
+        Me.btnSaveAll.UseVisualStyleBackColor = False
+        '
         'frmNIVerknuepfungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1265, 769)
+        Me.ClientSize = New System.Drawing.Size(1265, 852)
         Me.Controls.Add(Me.SplitContainer1)
         Me.Controls.Add(Me.StatusStrip1)
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1982,6 +2007,7 @@ Partial Class frmNIVerknuepfungen
         Me.SplitContainer1.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.ResumeLayout(False)
+        Me.pnlFooter.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -2009,7 +2035,6 @@ Partial Class frmNIVerknuepfungen
     Friend WithEvents btnTestSQL As System.Windows.Forms.Button
     Friend WithEvents btnlvw_down As System.Windows.Forms.Button
     Friend WithEvents btnlvw_up As System.Windows.Forms.Button
-    Friend WithEvents btnsave_select As System.Windows.Forms.Button
     Friend WithEvents btnWindreamIndexEinfügenSQL As System.Windows.Forms.Button
     Friend WithEvents btnaddUniqueIndex As System.Windows.Forms.Button
     Friend WithEvents lbxQuelle1 As System.Windows.Forms.ListBox
@@ -2128,8 +2153,11 @@ Partial Class frmNIVerknuepfungen
     Friend WithEvents Button1 As Button
     Friend WithEvents lblsaveSQLAnweisung As Label
     Friend WithEvents Label1 As Label
-    Friend WithEvents Button5 As Button
     Friend WithEvents rbFunctionsTb As RadioButton
     Friend WithEvents rbFunctionsSc As RadioButton
     Friend WithEvents Label2 As Label
+    Friend WithEvents pnlFooter As Panel
+    Friend WithEvents btnSaveAll As Button
+    Friend WithEvents btnCancelAllAndClose As Button
+    Friend WithEvents btnSaveAllAndClose As Button
 End Class

ToolCollection/frmNIVerknuepfungen.resx

@@ -130,7 +130,7 @@
     <value>606, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>28</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

ToolCollection/frmNI_SQLTest.Designer.vb

@@ -183,10 +183,9 @@ Partial Class frmNI_SQLTest
         Me.Controls.Add(Me.ListBox1)
         Me.Controls.Add(Me.txtSQL_String)
         Me.Controls.Add(Me.BindingNavigator1)
-        Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmNI_SQL_Loc", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Location = Global.ToolCollection.My.MySettings.Default.frmNI_SQL_Loc
+
         Me.Name = "frmNI_SQLTest"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Test-Ergebnis der Nachindexierungverknüpfung"

ToolCollection/frmNI_SQLTest.vb

@@ -47,7 +47,7 @@ Public Class frmNI_SQLTest
     Public Sub Aktualisieren()
         'Try
         If vDB_Art.ToString = "Oracle" Then
-            GetDataFromOracle()
+
         ElseIf vDB_Art.ToString = "MS-SQL" Then
             Dim typ As Data.SqlDbType
             If IsNumeric(txtStartwert.Text) Then
@@ -67,96 +67,7 @@ Public Class frmNI_SQLTest
 
 
     End Sub
-    Sub GetDataFromOracle()
-        Try
-            ' OracleConnection = Nothing
 
-            ' ConnectionString aufbauen (aus Settings auslesen)
-            Dim conn As New OracleConnectionStringBuilder
-            Dim connstr As String
-            If vdatasource <> "" And vInitialCatalog <> "" Then
-                connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & vdatasource & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
-                                vInitialCatalog & ")));User Id=" & vUserID & ";Password=" & vPassword & ";"
-            Else
-                conn.DataSource = vdatasource
-                conn.UserID = vUserID
-                conn.Password = vPassword
-                conn.PersistSecurityInfo = True
-                conn.ConnectionTimeout = 120
-                connstr = conn.ConnectionString
-            End If
-
-            Dim Oracle_Connection As New OracleConnection(connstr)
-
-
-            '   Dim ConnectionString As OracleConnectionStringBuilder = Nothing
-            Dim Command As OracleCommand = Nothing
-            Dim DataAdapter As OracleDataAdapter = Nothing
-
-            ' ConnectionString aufbauen (aus Settings auslesen)
-            'ConnectionString = New OracleConnectionStringBuilder()
-            'ConnectionString.DataSource = vdatasource
-            'ConnectionString.UserID = vUserID
-            'ConnectionString.Password = vPassword
-
-
-            ' Verbindung zur Datenbank aufbauen
-            Try
-                ' Connection = New OracleConnection(ConnectionString.ConnectionString)
-                Oracle_Connection.Open()
-            Catch ex As Exception
-                MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Verbindung zur Datenbank aufbauen:")
-                ' DB-Connection schliessen
-                Oracle_Connection.Close()
-            End Try
-            ' SQL-Abfrage definieren
-
-
-
-            'Command.Parameters.Add(":Startwert", OracleDbType.Int32)
-            'Command.Parameters(":Startwert").Value = Me.txtStartwert.Text
-            Me.txtSQL_String.Text = vSQL.Replace(frmNIVerknuepfungen.vReplace, Me.txtStartwert.Text)
-            vSQL = txtSQL_String.Text
-            Command = New OracleCommand(vSQL, Oracle_Connection) 'OracleCommand(vSQL, Connection)
-            'Catch ex As Exception
-            '    MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Oracle SQL-Abfrage definieren:")
-            '     DB-Connection schliessen
-            '    Me.CloseOracleDb(Connection)
-            'End Try
-            If Command IsNot Nothing Then
-
-                'Try
-                ' Datenadapter laden
-                DataAdapter = New OracleDataAdapter(Command) 'OracleDataAdapter(Command)
-                MyDataset.Tables("TBErgebnis").Clear()
-                ' DataSet erzeugen
-                Dim DataSet = New DataSet()
-                ListBox1.Items.Clear()
-                ' DataSet mit Daten füllen
-                DataAdapter.Fill(DataSet)
-                For Each Row As DataRow In DataSet.Tables(0).Rows
-                    ListBox1.Items.Add(Row.Item(0))
-                Next
-                Me.BindingSource1.ResumeBinding()
-                ' DB-Connection schliessen
-                Oracle_Connection.Close()
-                '    Catch ex As Exception
-                '    MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Daten auslesen:")
-                '    ' DB-Connection schliessen
-                '    Me.CloseOracleDb(Connection)
-                'End Try
-
-            Else
-                ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte
-                MsgBox(vSQL, MsgBoxStyle.Critical, "Oracle SQL-Anweisung ist ungültig. Command-Objekt konnte nicht erstellt werden:")
-            End If
-
-
-        Catch ex As Exception
-            'an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Ein unbekannter Fehler in GetDataFromOracle:")
-        End Try
-    End Sub
     Sub GetDataFromMSSQL(ByVal _typ As Data.SqlDbType)
         Try
             Dim Connection As SqlConnection = Nothing

ToolCollection/frmStart.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmStart
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmStart
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart))
@@ -28,6 +28,8 @@ Partial Class frmStart
         Me.Status_Machine = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
         Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStripStatusLabel_LogDeleteTime = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStripStatusLabel_ConnectionString = New System.Windows.Forms.ToolStripStatusLabel()
         Me.menHauptmenü = New System.Windows.Forms.MenuStrip()
         Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ÜbersichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -35,19 +37,17 @@ Partial Class frmStart
         Me.ZeigeLogFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ÖffneLogverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ModuleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.LizenzverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.PasswortverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CriticalEmailTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ÜberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
-        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.PanelMain = New System.Windows.Forms.Panel()
+        Me.groupboxNachbearbeitungAD = New System.Windows.Forms.GroupBox()
         Me.btnNachbearbeitungAD = New System.Windows.Forms.Button()
         Me.grbxMoRe = New System.Windows.Forms.GroupBox()
         Me.btnOpen_MoReProfile = New System.Windows.Forms.Button()
-        Me.GroupBoxIntegration = New System.Windows.Forms.GroupBox()
-        Me.Button3 = New System.Windows.Forms.Button()
         Me.GBNachindexierung = New System.Windows.Forms.GroupBox()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.btnNIProfile = New System.Windows.Forms.Button()
@@ -61,11 +61,12 @@ Partial Class frmStart
         Me.EinblendenAusblendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.TimerNIRestart = New System.Windows.Forms.Timer(Me.components)
         Me.TimerErrorLog = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerDeleteLogfiles = New System.Windows.Forms.Timer(Me.components)
         Me.StatusStrip1.SuspendLayout()
         Me.menHauptmenü.SuspendLayout()
-        Me.Panel1.SuspendLayout()
+        Me.PanelMain.SuspendLayout()
+        Me.groupboxNachbearbeitungAD.SuspendLayout()
         Me.grbxMoRe.SuspendLayout()
-        Me.GroupBoxIntegration.SuspendLayout()
         Me.GBNachindexierung.SuspendLayout()
         Me.grbDI.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
@@ -73,8 +74,8 @@ Partial Class frmStart
         '
         'StatusStrip1
         '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 708)
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion, Me.ToolStripStatusLabel_LogDeleteTime, Me.ToolStripStatusLabel_ConnectionString})
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 613)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode
         Me.StatusStrip1.ShowItemToolTips = True
@@ -116,6 +117,24 @@ Partial Class frmStart
         Me.tslblVersion.Text = "ToolStripStatusLabel1"
         Me.tslblVersion.ToolTipText = "Aktueller Benutzer"
         '
+        'ToolStripStatusLabel_LogDeleteTime
+        '
+        Me.ToolStripStatusLabel_LogDeleteTime.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+        Me.ToolStripStatusLabel_LogDeleteTime.Name = "ToolStripStatusLabel_LogDeleteTime"
+        Me.ToolStripStatusLabel_LogDeleteTime.Size = New System.Drawing.Size(270, 20)
+        Me.ToolStripStatusLabel_LogDeleteTime.Text = "Zeitpunkt der automatischen Löschung von Logs"
+        '
+        'ToolStripStatusLabel_ConnectionString
+        '
+        Me.ToolStripStatusLabel_ConnectionString.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+        Me.ToolStripStatusLabel_ConnectionString.Name = "ToolStripStatusLabel_ConnectionString"
+        Me.ToolStripStatusLabel_ConnectionString.Size = New System.Drawing.Size(129, 20)
+        Me.ToolStripStatusLabel_ConnectionString.Text = "Datenbankverbindung"
+        '
         'menHauptmenü
         '
         Me.menHauptmenü.BackColor = System.Drawing.SystemColors.Control
@@ -162,34 +181,27 @@ Partial Class frmStart
         '
         'ModuleToolStripMenuItem
         '
-        Me.ModuleToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LizenzverwaltungToolStripMenuItem, Me.PasswortverwaltungToolStripMenuItem, Me.GrundeinstellungenToolStripMenuItem, Me.CriticalEmailTestToolStripMenuItem})
+        Me.ModuleToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PasswortverwaltungToolStripMenuItem, Me.GrundeinstellungenToolStripMenuItem, Me.CriticalEmailTestToolStripMenuItem})
         Me.ModuleToolStripMenuItem.Name = "ModuleToolStripMenuItem"
         Me.ModuleToolStripMenuItem.Size = New System.Drawing.Size(75, 20)
         Me.ModuleToolStripMenuItem.Text = "Bearbeiten"
         '
-        'LizenzverwaltungToolStripMenuItem
-        '
-        Me.LizenzverwaltungToolStripMenuItem.Name = "LizenzverwaltungToolStripMenuItem"
-        Me.LizenzverwaltungToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10
-        Me.LizenzverwaltungToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
-        Me.LizenzverwaltungToolStripMenuItem.Text = "Lizenzverwaltung"
-        '
         'PasswortverwaltungToolStripMenuItem
         '
         Me.PasswortverwaltungToolStripMenuItem.Name = "PasswortverwaltungToolStripMenuItem"
-        Me.PasswortverwaltungToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.PasswortverwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.PasswortverwaltungToolStripMenuItem.Text = "Passwortverwaltung"
         '
         'GrundeinstellungenToolStripMenuItem
         '
         Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem"
-        Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.GrundeinstellungenToolStripMenuItem.Text = "Grundeinstellungen"
         '
         'CriticalEmailTestToolStripMenuItem
         '
         Me.CriticalEmailTestToolStripMenuItem.Name = "CriticalEmailTestToolStripMenuItem"
-        Me.CriticalEmailTestToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
+        Me.CriticalEmailTestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.CriticalEmailTestToolStripMenuItem.Text = "Critical Email - Test"
         '
         'HilfeToolStripMenuItem
@@ -222,39 +234,49 @@ Partial Class frmStart
         Me.ImageList1.Images.SetKeyName(7, "ico6700.ico")
         Me.ImageList1.Images.SetKeyName(8, "ico7215.ico")
         '
-        'Panel1
+        'PanelMain
         '
-        Me.Panel1.Controls.Add(Me.btnNachbearbeitungAD)
-        Me.Panel1.Controls.Add(Me.grbxMoRe)
-        Me.Panel1.Controls.Add(Me.GroupBoxIntegration)
-        Me.Panel1.Controls.Add(Me.GBNachindexierung)
-        Me.Panel1.Controls.Add(Me.grbDI)
-        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.Panel1.Location = New System.Drawing.Point(0, 24)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(163, 684)
-        Me.Panel1.TabIndex = 10
+        Me.PanelMain.Controls.Add(Me.groupboxNachbearbeitungAD)
+        Me.PanelMain.Controls.Add(Me.grbxMoRe)
+        Me.PanelMain.Controls.Add(Me.GBNachindexierung)
+        Me.PanelMain.Controls.Add(Me.grbDI)
+        Me.PanelMain.Dock = System.Windows.Forms.DockStyle.Left
+        Me.PanelMain.Location = New System.Drawing.Point(0, 24)
+        Me.PanelMain.Name = "PanelMain"
+        Me.PanelMain.Size = New System.Drawing.Size(163, 589)
+        Me.PanelMain.TabIndex = 10
+        '
+        'groupboxNachbearbeitungAD
+        '
+        Me.groupboxNachbearbeitungAD.Controls.Add(Me.btnNachbearbeitungAD)
+        Me.groupboxNachbearbeitungAD.Dock = System.Windows.Forms.DockStyle.Top
+        Me.groupboxNachbearbeitungAD.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.groupboxNachbearbeitungAD.Location = New System.Drawing.Point(0, 395)
+        Me.groupboxNachbearbeitungAD.Name = "groupboxNachbearbeitungAD"
+        Me.groupboxNachbearbeitungAD.Size = New System.Drawing.Size(163, 72)
+        Me.groupboxNachbearbeitungAD.TabIndex = 5
+        Me.groupboxNachbearbeitungAD.TabStop = False
+        Me.groupboxNachbearbeitungAD.Text = "Nachbearbeitung"
         '
         'btnNachbearbeitungAD
         '
-        Me.btnNachbearbeitungAD.Dock = System.Windows.Forms.DockStyle.Top
         Me.btnNachbearbeitungAD.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnNachbearbeitungAD.Image = Global.ToolCollection.My.Resources.Resources.Untitled__142_
         Me.btnNachbearbeitungAD.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNachbearbeitungAD.Location = New System.Drawing.Point(0, 464)
+        Me.btnNachbearbeitungAD.Location = New System.Drawing.Point(6, 21)
         Me.btnNachbearbeitungAD.Name = "btnNachbearbeitungAD"
-        Me.btnNachbearbeitungAD.Size = New System.Drawing.Size(163, 42)
+        Me.btnNachbearbeitungAD.Size = New System.Drawing.Size(153, 42)
         Me.btnNachbearbeitungAD.TabIndex = 4
-        Me.btnNachbearbeitungAD.Text = "ActiveDirectory" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Nachbearbeitung"
+        Me.btnNachbearbeitungAD.Text = "Rechteverwaltung"
         Me.btnNachbearbeitungAD.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnNachbearbeitungAD.UseVisualStyleBackColor = True
-        Me.btnNachbearbeitungAD.Visible = False
         '
         'grbxMoRe
         '
         Me.grbxMoRe.Controls.Add(Me.btnOpen_MoReProfile)
         Me.grbxMoRe.Dock = System.Windows.Forms.DockStyle.Top
-        Me.grbxMoRe.Location = New System.Drawing.Point(0, 394)
+        Me.grbxMoRe.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.grbxMoRe.Location = New System.Drawing.Point(0, 325)
         Me.grbxMoRe.Name = "grbxMoRe"
         Me.grbxMoRe.Size = New System.Drawing.Size(163, 70)
         Me.grbxMoRe.TabIndex = 4
@@ -267,7 +289,7 @@ Partial Class frmStart
         Me.btnOpen_MoReProfile.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnOpen_MoReProfile.Image = Global.ToolCollection.My.Resources.Resources.Untitled__49_
         Me.btnOpen_MoReProfile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnOpen_MoReProfile.Location = New System.Drawing.Point(3, 21)
+        Me.btnOpen_MoReProfile.Location = New System.Drawing.Point(6, 21)
         Me.btnOpen_MoReProfile.Name = "btnOpen_MoReProfile"
         Me.btnOpen_MoReProfile.Size = New System.Drawing.Size(153, 41)
         Me.btnOpen_MoReProfile.TabIndex = 4
@@ -275,31 +297,6 @@ Partial Class frmStart
         Me.btnOpen_MoReProfile.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnOpen_MoReProfile.UseVisualStyleBackColor = True
         '
-        'GroupBoxIntegration
-        '
-        Me.GroupBoxIntegration.Controls.Add(Me.Button3)
-        Me.GroupBoxIntegration.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GroupBoxIntegration.Location = New System.Drawing.Point(0, 325)
-        Me.GroupBoxIntegration.Name = "GroupBoxIntegration"
-        Me.GroupBoxIntegration.Size = New System.Drawing.Size(163, 69)
-        Me.GroupBoxIntegration.TabIndex = 3
-        Me.GroupBoxIntegration.TabStop = False
-        Me.GroupBoxIntegration.Text = "DD Integration"
-        Me.GroupBoxIntegration.Visible = False
-        '
-        'Button3
-        '
-        Me.Button3.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Button3.Image = Global.ToolCollection.My.Resources.Resources.Untitled__640_
-        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button3.Location = New System.Drawing.Point(4, 21)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(153, 41)
-        Me.Button3.TabIndex = 2
-        Me.Button3.Text = "Profilkonfiguration"
-        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button3.UseVisualStyleBackColor = True
-        '
         'GBNachindexierung
         '
         Me.GBNachindexierung.Controls.Add(Me.Button1)
@@ -313,7 +310,6 @@ Partial Class frmStart
         Me.GBNachindexierung.TabIndex = 1
         Me.GBNachindexierung.TabStop = False
         Me.GBNachindexierung.Text = "Nachindexierung"
-        Me.GBNachindexierung.Visible = False
         '
         'Button1
         '
@@ -367,7 +363,6 @@ Partial Class frmStart
         Me.grbDI.TabIndex = 0
         Me.grbDI.TabStop = False
         Me.grbDI.Text = "Dateiimporter"
-        Me.grbDI.Visible = False
         '
         'btnRegelverwaltung
         '
@@ -413,7 +408,6 @@ Partial Class frmStart
         Me.niToolcollection.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info
         Me.niToolcollection.ContextMenuStrip = Me.ContextMenuStrip1
         Me.niToolcollection.Icon = CType(resources.GetObject("niToolcollection.Icon"), System.Drawing.Icon)
-        Me.niToolcollection.Text = "Tool Collection für windream"
         '
         'ContextMenuStrip1
         '
@@ -436,27 +430,30 @@ Partial Class frmStart
         '
         Me.TimerErrorLog.Interval = 60000
         '
+        'TimerDeleteLogfiles
+        '
+        Me.TimerDeleteLogfiles.Interval = 1000
+        '
         'frmStart
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1237, 733)
+        Me.ClientSize = New System.Drawing.Size(1237, 638)
         Me.ContextMenuStrip = Me.ContextMenuStrip1
-        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.PanelMain)
         Me.Controls.Add(Me.menHauptmenü)
         Me.Controls.Add(Me.StatusStrip1)
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.IsMdiContainer = True
         Me.Name = "frmStart"
-        Me.Text = "Tool Collection für windream"
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
         Me.menHauptmenü.ResumeLayout(False)
         Me.menHauptmenü.PerformLayout()
-        Me.Panel1.ResumeLayout(False)
+        Me.PanelMain.ResumeLayout(False)
+        Me.groupboxNachbearbeitungAD.ResumeLayout(False)
         Me.grbxMoRe.ResumeLayout(False)
-        Me.GroupBoxIntegration.ResumeLayout(False)
         Me.GBNachindexierung.ResumeLayout(False)
         Me.grbDI.ResumeLayout(False)
         Me.ContextMenuStrip1.ResumeLayout(False)
@@ -471,11 +468,10 @@ Partial Class frmStart
     Friend WithEvents DateiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents BeendenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ModuleToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents LizenzverwaltungToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents HilfeToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ÜberToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ImageList1 As System.Windows.Forms.ImageList
-    Friend WithEvents Panel1 As System.Windows.Forms.Panel
+    Friend WithEvents PanelMain As System.Windows.Forms.Panel
     Friend WithEvents grbDI As System.Windows.Forms.GroupBox
     Friend WithEvents btnDIMain As System.Windows.Forms.Button
     Friend WithEvents btnDIProfile As System.Windows.Forms.Button
@@ -485,8 +481,6 @@ Partial Class frmStart
     Friend WithEvents btnNIProfile As System.Windows.Forms.Button
     Friend WithEvents btnNIMain As System.Windows.Forms.Button
     Friend WithEvents PasswortverwaltungToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents Button3 As System.Windows.Forms.Button
-    Friend WithEvents GroupBoxIntegration As System.Windows.Forms.GroupBox
     Friend WithEvents btnOpen_MoReProfile As System.Windows.Forms.Button
     Friend WithEvents niToolcollection As System.Windows.Forms.NotifyIcon
     Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
@@ -501,4 +495,8 @@ Partial Class frmStart
     Friend WithEvents CriticalEmailTestToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripStatusLabel2 As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents TimerErrorLog As Timer
+    Friend WithEvents TimerDeleteLogfiles As Timer
+    Friend WithEvents ToolStripStatusLabel_LogDeleteTime As ToolStripStatusLabel
+    Friend WithEvents ToolStripStatusLabel_ConnectionString As ToolStripStatusLabel
+    Friend WithEvents groupboxNachbearbeitungAD As GroupBox
 End Class

ToolCollection/frmStart.resx

@@ -124,28 +124,28 @@
   <data name="Status_Machine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACzUlEQVQ4T32Ta0jTYRSH/xb1rSCkPgiV
-        VJgRRViRlBmZRJYmXS0zAylbmjYoNYlIzUXQcmVqpt285SWz0lBL5mXzMrfpinTz1ryBlWuLCfYhoqe/
-        Tcno8oPD74X3nOfwHs4rTOlcZRMZ/Xe53JtKqOYYHtmPWBNrYm24nsDYZiRXDSRndXDjXhu3MhrwiWxh
-        slQQwmoSUQxKqR4vI2c0nXTDRfJ0tTxtGUCp1FFe3kxuQR23C+rJqjFyvaKLjavDHYBDuRr869zEzqHk
-        W9IoGS6mr68fRUEl6ZVa8vXveDViQ/cdVF/hyWdIe/eVnVviHQCP1EGW5kg42LiKU22bkb65T1PHEAla
-        KzcGIW8Uysegahye2eHhR5D3w27fJAfAXWZidlIxroWLWFm2DJeCAZJfjiDXWEjshpsiJHsEHnyALNFT
-        BuCiCULOPHEAXM+2IpzQIZxvZ4Z8O04pi/G9VUaG+j3Rr+GCES73gKwXkkSP74TTBtgWoHAA3KI0CLue
-        IxyuQ4i4gBAnMC9CQm7tEMHNcFwHke2OogjRw7QQ1DgNsC7GyNwdJcz0zmfWrqvMCfHBSTw/zNPiWwMB
-        dbBPBfvVsFd0/1rYUf3tF2BCK46+YklQFV5HS/E8/IxNwfVcuanDu9DO+grYWAleYpys+UJi0RDnpOW/
-        A6Y0f3kUzi5HcF4QRKDfJfxyPuH5/DvXmsbJKjETF9dKcLCSVQv3/lk8XR57ikm4riY730hFRS+FhW9I
-        TTUglep/xoGAZCZyJtP/lOyOAbvdTnf3J2w2Gz09ZnEbO0lJaUMu16NQNCCJyPs34HGZDqvVytjYGBaL
-        RdxMMypVFy9evKWoSE+G+BdipDn/BpxMVIvd+xgeHsZs7qezs5eGBiMmU5/4nHoyM9X4b435/xwmpixL
-        eEBVlVacQyulpS1iZyXRkjQ2uIf8v3hKE5C/xeS1KEH4ASMFKV0feWVjAAAAAElFTkSuQmCC
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACxklEQVQ4T33Qf0zMcRzH8W+M/9jM+MPm
+        x7BkxixM8yNDM6mYn5FkM3IibiNpzfTTbE5HPw7lRz8uV0m4sytaP+6un3dXp9Gd6871awtdZdeWP8w8
+        7ZzIjzy393+f1+OPjyD86Jy6HlnnHZJt6UQ0HcY35wHLz1tYEWlkx/kGRFdMpGS/5vrdFjJkGjadbGR0
+        KxypTETaLaZipIy8/iyyTBcpMFTzuLGLqioDSmUD+YU13CysJbvSzDXVG9Ysi/QA+/ObCK7xJtkWgdyZ
+        SUlvMXZ7J9JCNVlqPXLjW170DWH4CtrP8OgjZL79zLYNcR7AN72bBXki9tUt5UTLesRt96h/3UOCfpDr
+        3VDQD8phKB+BJy7I/QCSTtgekOQBfFItTE4qZp5iDkvKFjKrsIuU531ImpwkWuFGN+T0wf33kN0HaV1w
+        0QLhZx55gHlnmxGOGRAutDJBsgWvtLkEZJQh073j9EuIN0NyB6TaIKkD4trhlAk2h0g9gHd0E0LQU4QD
+        NQhR8QixAtOiRORX9xDWAEcNcLLVM4pqhSN6CK0bA6yMMTN1awkT/eVMCrrClPBNePnLyS3QE1AJITWw
+        Wwt7dLBLC8HVsLXiyy/A3eJDL5gfWs66Q6X4HXjC2rBaLt8w4K9wsUoFa9SwTg3HKz+RWNTDObHyd2C0
+        GYuimT7rINNnhrIj8BKBeQP4Pf3K1foRskscxMY2ExZWxdLZu/4ej813ZzEJ13TkyM2oVDYUijbS002I
+        xcbvtzckBfebP3c/S71twuVyYbUOMDQ0REeHA6WynbS0FiQSI1KpBlFUwfjAwzIDg4ODDA8P43Q6sdsd
+        aLVvePbsFUVFRmQyDTHivPGB44k6rFY7vb29OBydtLfb0GjMWCx2FIpabt3SEbwxZnzAnfuXUxPuU16u
+        R6VqprS0EZmsitOiTFb7hP9/PJob+deNffMNIwUpXcTyuqIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ToolStripStatusLabel2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAmklEQVQ4T7WPIQ5DIRAF96gcgVtwBCor
-        K7+jsrIOWVlZWfkl3Wl2k+YrlqQvmZAA8xbkb0kpDce25oNEeu+j1hovQUBurY1SyloBk5FzzuvfcGxr
-        Pki7yHgrTyVU4rIa3/WlPCIlXGTy7wt6tACJyaxMDxcguAi3aAHcVQKXpwsIl68qwmYFdjQXhIuKcF4t
-        OKnoLBUcsaNDRD795Ki6zCeHqwAAAABJRU5ErkJggg==
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAlUlEQVQ4T7WQIQ5CMRAF56g9Qm/RIxSJ
+        ROKKROIqkV8ikcglr8kSUgNbwkteKroz2xT+lZSSeee7jxGk9N6t1hqXCBDcWrNSyppAmwXnnOMC5ec/
+        eIDdwTaISRw2GOcN7BqRaFCb31/QowJB2qxT28MCAQ6q56hAvcCow18LFA2fYPQY2e4RcIDR/apgB68u
+        CebOM54n/eSouhlrbUcAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="menHauptmenü.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -159,7 +159,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
-        FAAAAk1TRnQBSQFMAgEBCQEAATABAwEwAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        FAAAAk1TRnQBSQFMAgEBCQEAAZABAwGQAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -643,6 +643,9 @@
   <metadata name="TimerErrorLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>920, 17</value>
   </metadata>
+  <metadata name="TimerDeleteLogfiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1049, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>102</value>
   </metadata>

ToolCollection/frmStart.vb

@@ -1,75 +1,216 @@
-Imports System.Collections.ObjectModel
-Imports System.Reflection
-Imports System.Globalization
-Imports DigitalData.Modules.Logging
-Imports System.IO
+Imports System.IO
+Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
 
 Public Class frmStart
     Private _MyLogger As LogConfig
     Private Shared _Logger As DigitalData.Modules.Logging.Logger
-    Public _validModules()
-    Public _company As String
-    ' Dim timediff As Integer = 0
-    Private licenseManager As ClassLicenseManager = Nothing
-    'Private Sub timUhrzeit_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles timUhrzeit.Tick
-    '    ' der Statusuhr die aktuelle Systemzeit zuweisen
-    '    Me.Status_Clock.Text = CType(My.Computer.Clock.LocalTime, String)
-    '    timediff += 1000
-    '    If timediff >= 86400000 Then
-    '        'LogDateien-löschen
-    '        Delete_LogFiles()
-    '    End If
-    'End Sub
+
+    ' CREATE INSTANCE
+    Private Shared _Instance As frmStart = Nothing
+
+    Public Shared Function Instance() As frmStart
+        If _Instance Is Nothing OrElse _Instance.IsDisposed Then
+            _Instance = New frmStart()
+        End If
+        Return _Instance
+    End Function
+
+    ' DELETE LOGS
     Private Sub Delete_LogFiles()
         Try
-            ' Dim vDate = DateAdd("d", -CInt(My.Settings.logolder_then), Now)
+            Dim directory As New DirectoryInfo(My.Application.Info.DirectoryPath & "\Log")
+            _Logger.Debug($"Dateipfad geholt: {directory}")
+            Dim oIntervall As Integer = 30
+            Integer.TryParse(frmGrundeinstellungen.TextBox4.Text, oIntervall)
+            _Logger.Debug($"Löschalter aus der Config geholt: {oIntervall}")
 
-            Try
-                Dim directory As New IO.DirectoryInfo(My.Application.Info.DirectoryPath & "\Log")
+            For Each file As FileInfo In directory.GetFiles
+                _Logger.Debug($"Durchlaufe alle Dateien: {file.FullName}")
+                Try
+                    Dim oAgeOfFile As Integer = (Now - file.CreationTime).Days
+                    _Logger.Debug($"Alter der aktuellen Datei: {oAgeOfFile}")
+                    If oAgeOfFile >= oIntervall Then
+                        file.Delete()
+                        _Logger.Debug($"Lösche Datei, die älter ist als Löschalter: {file.FullName}")
+                    End If
+                Catch ex As Exception
+                    _Logger.Warn($"Could not delete file {file.Name}: {ex.Message}")
+                End Try
+            Next
 
-                For Each file As IO.FileInfo In directory.GetFiles
-                    If (Now - file.CreationTime).Days > 29 Then file.Delete()
-                Next
-            Catch ex As Exception
-
-            End Try
         Catch ex As Exception
             _Logger.Error(ex.Message)
         End Try
     End Sub
+
+    Public Sub SetupTimerDeleteLogfiles()
+        Try
+            Dim now As DateTime = DateTime.Now
+            Dim startTime As DateTime
+
+            ' Zeit aus den gespeicherten Settings lesen
+            Dim timeString As String = My.Settings.vDeleteLogsTime
+
+            If String.IsNullOrWhiteSpace(timeString) Then
+                timeString = "02:00"
+            End If
+
+            Dim dt As DateTime
+            If DateTime.TryParse(timeString, dt) Then
+                'If timeString Then
+                My.Settings.vDeleteLogsTime = timeString
+                My.Settings.Save()
+                startTime = New DateTime(now.Year, now.Month, now.Day, dt.Hour, dt.Minute, 0)
+                If now > startTime Then startTime = startTime.AddDays(1)
+            Else
+                _Logger.Warn($"Ungültiges Zeitformat '{timeString}', Standard 02:00 wird verwendet.")
+                startTime = New DateTime(now.Year, now.Month, now.Day, 2, 0, 0)
+                If now > startTime Then startTime = startTime.AddDays(1)
+            End If
+
+            Dim interval As TimeSpan = startTime - now
+            Dim intervalMs As Double = interval.TotalMilliseconds
+
+            ' Sicherheitscheck
+            If intervalMs < 1000 Then
+                intervalMs = 1000
+            End If
+            If intervalMs > Integer.MaxValue Then
+                intervalMs = Integer.MaxValue
+            End If
+
+            TimerDeleteLogfiles.Interval = CInt(intervalMs)
+
+            If My.Settings.vAutoDeleteLogs Then
+                TimerDeleteLogfiles.Start()
+                _Logger.Info($"TimerDeleteLogfiles startet in {interval.TotalMinutes:F1} Minuten (Zielzeit: {startTime:HH:mm}).")
+            Else
+                TimerDeleteLogfiles.Stop()
+                _Logger.Info("Automatische Log-Löschung deaktiviert, Timer gestoppt.")
+            End If
+
+        Catch ex As Exception
+            _Logger.Error("Fehler in SetupTimerDeleteLogfiles: " & ex.Message)
+        End Try
+    End Sub
+
+    Private Sub TimerDeleteLogfiles_Tick(sender As Object, e As EventArgs) Handles TimerDeleteLogfiles.Tick
+        Try
+            Delete_LogFiles()
+            ' Nächstes Intervall wieder 24h
+            TimerDeleteLogfiles.Interval = 24 * 60 * 60 * 1000
+        Catch ex As Exception
+            _Logger.Error("Fehler beim automatischen Löschen: " & ex.Message)
+        End Try
+    End Sub
+
     Private Sub FMStart_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass sie " & Application.ProductName & " wirklich schließen wollen?" & vbNewLine & "Alle Vorgänge/Module werden gestoppt und nicht mehr ausgeführt!", MsgBoxStyle.YesNo, "Bestätigung erforderlich:")
         If result = MsgBoxResult.No Then
             e.Cancel = True
+            Return          ' ← wichtig: hier sofort raus, kein Logout
+        End If
+
+        If Not IsNothing(CURRENToWMSession) Then
+            _Logger.Debug("Closing frmStart - Now logging out of windream session...")
+            Try
+                CURRENToWMSession.Logout()
+                _Logger.Debug("windream session logged out successfully.")
+            Catch ex As Exception
+                _Logger.Warn("Error while logging out windream session: " & ex.Message)
+                _Logger.Error(ex)
+            End Try
         End If
     End Sub
+
+    Private Sub CaptionForm()
+        Dim caption As String
+
+        If String.IsNullOrWhiteSpace(My.Settings.vInstanceName) Then
+            caption = Application.CompanyName & " - " & Application.ProductName
+        Else
+            caption = Application.CompanyName & " - " & Application.ProductName & " - " & My.Settings.vInstanceName
+        End If
+
+        ' Fenster-Titel setzen
+        Me.Text = caption
+
+        Dim trayText As String = caption
+
+        If trayText.Length > 63 Then
+            trayText = trayText.Substring(0, 60) & "..."
+        End If
+
+        ' Systray-Tooltip setzen
+        niToolcollection.Text = trayText
+    End Sub
+
     Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+
+        _Instance = Me
+
+        For Each arg As String In My.Application.CommandLineArgs
+            Select Case arg.ToLower()
+                Case "/startfim"
+                    AUTOSTART_FIM = True 'Dateiimport
+                Case "/startfih"
+                    AUTOSTART_FIH = True 'Nachindexierung
+            End Select
+        Next
+
         Try
+            'Delete_LogFiles()
+
             _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName,
-                                       My.Application.Info.ProductName)
+                                           My.Application.Info.ProductName)
             _Logger = _MyLogger.GetLogger()
+            _MyLogger.Debug = Not My.Settings.vLogErrorsonly
 
             CURR_Logger = _Logger
             CURR_LogConfig = _MyLogger
-            Delete_LogFiles()
+
+            SetupTimerDeleteLogfiles()
+
             'Aktueller Benutzer
             Me.tslblVersion.Text = Environment.UserName.ToString
-            Me.Text = Application.CompanyName & "-" & Application.ProductName
+            CaptionForm()
             Me.tslblVersion.Text = "Version: " & My.Application.Info.Version.ToString
             'Aktuelle Machine
             Me.Status_Machine.Text = My.Computer.Name
+            'Zeitpunkt der automatischen Löschung von Logs
+            If My.Settings.vAutoDeleteLogs Then
+                Me.ToolStripStatusLabel_LogDeleteTime.Text = "Logs werden automatisch gelöscht um: " & My.Settings.vDeleteLogsTime.ToShortTimeString & " Uhr."
+            Else
+                Me.ToolStripStatusLabel_LogDeleteTime.Text = "Automatisches Löschen von Logs ist inaktiv."
+            End If
+
+            Dim connectionString As String = My.Settings.DDECMConString
+            connectionString = Regex.Replace(connectionString, "(?i)(password|pwd)\s*=\s*[^;]*", "$1=******")
+            Me.ToolStripStatusLabel_ConnectionString.Text = $"Datenbankverbindung: {connectionString}"
+
             ' timUhrzeit.Start()
             TimerErrorLog.Start()
 
-            If Not My.Settings.licensekey = "" Then
-                ' Lizenz-Manager initialisieren
-                Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
+            If My.Settings.WM_PERS_LOGIN <> String.Empty Then
+                Dim oSPLIT As String()
+                oSPLIT = My.Settings.WM_PERS_LOGIN.Split("#")
+                If oSPLIT.Length > 0 Then
+                    If oSPLIT(0) <> "@Domain" Then
+
+                        WMLOGIN_DOMAIN = oSPLIT(0)
+                        _Logger.Info($"WMLOGIN_DOMAIN: {WMLOGIN_DOMAIN}")
+                        WMLOGIN_USER = oSPLIT(1)
+                        _Logger.Info($"WMLOGIN_USER: {WMLOGIN_USER}")
+                        WMLOGIN_PW = oSPLIT(2)
+                    Else
+                        _Logger.Info($"No dedicated WMUser(1)")
+                    End If
+                End If
+
 
-                ' alle vorhandenen Module laden
-                Me.LoadAllModules()
             End If
-            EMAIL_DD = New ClassEmail(_MyLogger)
 
         Catch ex As Exception
             _Logger.Error(ex)
@@ -152,115 +293,20 @@ Public Class frmStart
         Cursor = Cursors.Default
     End Sub
 
-    Private Sub LizenzverwaltungToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles LizenzverwaltungToolStripMenuItem.Click
-        ' Öffnet den Lizenz-Manager
-        frmLizenzmanager.ShowDialog()
-    End Sub
     Public Sub ClearGroupBoxes()
         Me.grbDI.Visible = False
         Me.GBNachindexierung.Visible = False
-        Me.GroupBoxIntegration.Visible = False
         Me.grbxMoRe.Visible = False
-        LICENSE_MoveRename = False
-        LICENSE_AD = False
     End Sub
-    Public Sub LoadAllModules()
-        Me._validModules = Nothing
-
-        If Not My.Settings.licensekey = "" Then
-            If My.Settings.licensekey = "DD MaxLicense" Or My.Settings.licensekey.ToUpper = "DDALLIN" Or My.Settings.licensekey.ToUpper = "DD_ALL_IN" Or My.Settings.licensekey.ToUpper = "DD_ALLIN" Then
-                Me.grbDI.Visible = True
-                Me.GBNachindexierung.Visible = True
-                Me.GroupBoxIntegration.Visible = True
-
-                btnNachbearbeitungAD.Visible = True
-                LICENSE_AD = True
-                LICENSE_MoveRename = True
-            Else
-                'Me.licenseManager = New ClassLicenseManager = Nothing
-                Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
-
-                Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
-
-                Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-                Me.licenseManager.LoadLicenses()
-
-                If Me.licenseManager.Licenses.machine.ToLower <> "all" Then
-                    If Me.licenseManager.Licenses.machine.ToLower <> My.Computer.Name.ToLower Then
-                        MsgBox("Ihre Lizenz gilt nicht für diese Maschine. " & vbNewLine & "Gelesener Computer Name: '" & My.Computer.Name & "'" & vbNewLine & "License Computer Name: '" & Me.licenseManager.Licenses.machine & "'" & vbNewLine &
-                               "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz ungültig:")
-                        Me.grbDI.Visible = False
-                        Me.GBNachindexierung.Visible = False
-                        Me.GroupBoxIntegration.Visible = False
-
-                        Exit Sub
-                    End If
-                End If
-
-                Dim i As Integer = 0
-
-                If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
-                    For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                        Dim expires As String = license.Expires.Date
-                        If IsExpired(license.Expires.Date) = False Then
-                            ' MsgBox(license.Modulename & vbNewLine & expires)
-                            Select Case license.Modulename
-                                Case "Dateiimport"
-                                    Me.grbDI.Visible = True
-                                Case "Nachindexierung"
-                                    Me.GBNachindexierung.Visible = True
-                                Case "MerkatorIntegration"
-                                    Me.GroupBoxIntegration.Visible = True
-                                Case "MoveandRename"
-                                    'Me.grbxMoRe.Visible = True
-                                    LICENSE_MoveRename = True
-                                Case "NachbearbeitungAD"
-                                    btnNachbearbeitungAD.Visible = True
-                                    LICENSE_AD = True
-                            End Select
-                            i += 1
-                        Else
-                            MsgBox("Ihre Lizenz für das Modul '" & license.Modulename & "' ist am ' " & license.Expires.Date.ToShortDateString & "' abgelaufen" & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz abgelaufen:")
-                            Select Case license.Modulename
-                                Case "Dateiimport"
-                                    Me.grbDI.Visible = False
-                                Case "Nachindexierung"
-                                    Me.GBNachindexierung.Visible = False
-                                Case "MerkatorIntegration"
-                                    Me.GroupBoxIntegration.Visible = False
-                                Case "MoveandRename"
-                                    Me.GroupBoxIntegration.Visible = False
-                                    LICENSE_MoveRename = False
-                                Case "NachbearbeitungAD"
-                                    btnNachbearbeitungAD.Visible = False
-                                    LICENSE_AD = False
-                            End Select
-                            i += 1
-                        End If
-                        'Date.TryParse(expires, license.Expires)
-
-                    Next
-                End If
-            End If
-
-
-
-        End If
-    End Sub
-    Private Function IsExpired(ByVal _Date As Date)
-        If Date.Today > _Date Then
-            Return True
-        Else
-            Return False
-        End If
-    End Function
 
     Private Sub FMStart_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
         TimerNIRestart.Start()
-        If My.Settings.vDIDurchlaufRunning = True Then
+        'If My.Settings.DI_RUNNING Or AUTOSTART_FIM Then
+        If AUTOSTART_FIM Then
             Open_DI_Main()
         End If
-        If My.Settings.NI_RUNNING = True Then
+        'If NIDurchlaufRunning Or AUTOSTART_FIH Then
+        If AUTOSTART_FIH Then
             Open_NI_Main()
         End If
     End Sub
@@ -282,6 +328,9 @@ Public Class frmStart
         frm = frmNIHauptseite.Instance
         frm.MdiParent = Me
         frm.Show()
+        'frm.StartPosition = FormStartPosition.Manual
+        'frm.Location = New Point(50, 50)
+        'Dim loc = frm.Location.ToString()
         Cursor = Cursors.Default
     End Sub
     Private Sub btnNIMain_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnNIMain.Click
@@ -300,22 +349,10 @@ Public Class frmStart
         frmabout.ShowDialog()
     End Sub
 
-    Private Sub Button2_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
-        'WMOLICLib.WMLicenser()
-    End Sub
-
     Private Sub PasswortverwaltungToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles PasswortverwaltungToolStripMenuItem.Click
         frmPWChange.ShowDialog()
     End Sub
 
-    Private Sub Button3_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button3.Click
-        Cursor = Cursors.WaitCursor
-        Dim frm As New frmMIProfileigenschaften
-        frm.MdiParent = Me
-        frm.Show()
-        Cursor = Cursors.Default
-    End Sub
-
     Private Sub ModuleToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ModuleToolStripMenuItem.Click
 
     End Sub
@@ -362,6 +399,7 @@ Public Class frmStart
         Dim frm As New frmGrundeinstellungen
         frm = frmGrundeinstellungen.Instance
         frm.ShowDialog()
+        CaptionForm()
         Cursor = Cursors.Default
     End Sub
 
@@ -404,19 +442,12 @@ Public Class frmStart
 
     Private Sub TimerNIRestart_Tick(sender As Object, e As EventArgs) Handles TimerNIRestart.Tick
         If NI_Restart = True Then
-            My.Settings.NI_RUNNING = True
 
             NI_Restart = False
             Open_NI_Main()
         End If
     End Sub
 
-    Private Sub CriticalEmailTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CriticalEmailTestToolStripMenuItem.Click
-        Cursor = Cursors.WaitCursor
-        EMAIL_DD.Send_EMail("Dies ist eine Test-Email!", "888888888")
-        Cursor = Cursors.Default
-    End Sub
-
     Private Sub TimerErrorLog_Tick(sender As Object, e As EventArgs) Handles TimerErrorLog.Tick
         If CURRENT_APPLICATION_LOG <> String.Empty Then
             Dim frm As New frmApplicationLog

ToolCollection/frmUebersicht.Designer.vb

@@ -249,7 +249,7 @@ Partial Class frmUebersicht
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MainMenuStrip = Me.MenuStrip1
         Me.Name = "frmUebersicht"
-        Me.Text = "Tool Collection für windream - Profil Übersicht (beta)"
+        Me.Text = "ToolCollection - Profil Übersicht (beta)"
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
         Me.SplitContainer1.Panel1.ResumeLayout(False)

ToolCollection/frmabout.vb

@@ -16,7 +16,8 @@
         Me.LabelVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString)
         Me.LabelCopyright.Text = My.Application.Info.Copyright
         Me.LabelCompanyName.Text = My.Application.Info.CompanyName
-        Me.TextBoxDescription.Text = My.Application.Info.Description
+        'Me.TextBoxDescription.Text = My.Application.Info.Description
+        Me.TextBoxDescription.Text = "Autostart Parameter: /startFIM /startFIH"
     End Sub
 
     Private Sub OKButton_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OKButton.Click

ToolCollection/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.0.2" targetFramework="net451" />
-  <package id="NLog" version="5.0.2" targetFramework="net462" />
-  <package id="System.Data.SQLite" version="1.0.91.3" targetFramework="net451" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net462" />
+  <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net462" />
 </packages>

packages/NLog.5.0.5/lib/net35/NLog.xml

@@ -2594,7 +2594,7 @@
             <summary>
             Writes the specified diagnostic message.
             </summary>
-            <param name="wrapperType">The name of the type that wraps Logger.</param>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
             <param name="logEvent">Log event.</param>
         </member>
         <member name="M:NLog.ILoggerBase.Log``1(NLog.LogLevel,``0)">
@@ -4025,10 +4025,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionExceptionExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>The '<b>message</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionExceptionExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4088,10 +4085,7 @@
             <value>The layout.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionLayoutExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>String literal in single quotes.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLayoutExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4107,10 +4101,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionLevelExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
-            <returns>The '<b>level</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLevelExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4137,10 +4128,7 @@
             <value>The literal value.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionLiteralExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
-            <returns>The literal value.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLiteralExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4155,10 +4143,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionLoggerNameExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>A <b>logger</b> string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLoggerNameExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4173,10 +4158,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionMessageExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>The '<b>message</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionMessageExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4210,9 +4192,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionMethodExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionMethodExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4239,9 +4219,7 @@
             <value>The expression.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionNotExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionNotExpression.EvaluateNode(NLog.LogEventInfo)">
             <inheritdoc/>
@@ -4271,9 +4249,7 @@
             <value>The right expression.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionOrExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionOrExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4315,9 +4291,7 @@
             <value>The operator.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionRelationalExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionRelationalExpression.EvaluateNode(NLog.LogEventInfo)">
             <inheritdoc/>
@@ -4930,11 +4904,7 @@
             </summary>
         </member>
         <member name="M:NLog.Config.Factory`2.RegisterDefinition(System.String,System.Type)">
-            <summary>
-            Registers a single type definition.
-            </summary>
-            <param name="itemName">The item name.</param>
-            <param name="itemDefinition">The type of the item.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.RegisterDefinition(System.String,System.Type,System.String,System.String)">
             <summary>
@@ -4946,27 +4916,13 @@
             <param name="itemNamePrefix">The item name prefix.</param>
         </member>
         <member name="M:NLog.Config.Factory`2.TryGetDefinition(System.String,System.Type@)">
-            <summary>
-            Tries to get registered item definition.
-            </summary>
-            <param name="itemName">Name of the item.</param>
-            <param name="result">Reference to a variable which will store the item definition.</param>
-            <returns>Item definition.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.TryCreateInstance(System.String,`0@)">
-            <summary>
-            Tries to create an item instance.
-            </summary>
-            <param name="itemName">Name of the item.</param>
-            <param name="result">The result.</param>
-            <returns>True if instance was created successfully, false otherwise.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.CreateInstance(System.String)">
-            <summary>
-            Creates an item instance.
-            </summary>
-            <param name="itemName">The name of the item.</param>
-            <returns>Created item.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Config.LayoutRendererFactory">
             <summary>
@@ -8928,14 +8884,22 @@
             </summary>
             <param name="bytes">The bytes.</param>
         </member>
+        <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Writes the specified bytes to a file.
+            </summary>
+            <param name="bytes">The bytes array.</param>
+            <param name="offset">The bytes array offset.</param>
+            <param name="count">The number of bytes.</param>
+        </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Flush">
             <summary>
-            Flushes this instance.
+            Flushes this file-appender instance.
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Close">
             <summary>
-            Closes this instance.
+            Closes this file-appender instance.
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.GetFileCreationTimeUtc">
@@ -8992,10 +8956,7 @@
             <value>The mutex for archiving.</value>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseMutexFileAppender.Dispose(System.Boolean)">
-            <summary>
-            Releases unmanaged and - optionally - managed resources.
-            </summary>
-            <param name="disposing">True to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseMutexFileAppender.CreateSharableMutex(System.String)">
             <summary>
@@ -9018,35 +8979,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Close">
-            <summary>
-            Closes this instance of the appender.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Flush">
-            <summary>
-            Flushes this current appender.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes to a file.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Factory">
             <summary>
@@ -9054,14 +8999,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.FileAppenderCache">
             <summary>
@@ -9327,35 +9265,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Factory">
             <summary>
@@ -9363,14 +9285,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.NullAppender">
             <summary>
@@ -9385,14 +9300,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.NullAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender">
             <summary>
@@ -9408,35 +9316,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Factory">
             <summary>
@@ -9444,14 +9336,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.SingleProcessFileAppender">
             <summary>
@@ -9466,35 +9351,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.SingleProcessFileAppender.Factory">
             <summary>
@@ -9502,14 +9371,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender">
             <summary>
@@ -9533,28 +9395,19 @@
             <param name="fileName">File to create or open</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
+        </member>
+        <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.GetFileCreationTimeUtc">
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Factory">
             <summary>
@@ -9562,14 +9415,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FilePathLayout">
             <summary>
@@ -10525,9 +10371,9 @@
             <param name="builder"></param>
             <param name="value">value to append</param>
         </member>
-        <member name="M:NLog.Internal.StringBuilderExt.AppendXmlDateTimeRoundTrip(System.Text.StringBuilder,System.DateTime)">
+        <member name="M:NLog.Internal.StringBuilderExt.AppendXmlDateTimeUtcRoundTrip(System.Text.StringBuilder,System.DateTime)">
             <summary>
-            Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time)
+            Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time)
             </summary>
         </member>
         <member name="M:NLog.Internal.StringBuilderExt.ClearBuilder(System.Text.StringBuilder)">
@@ -11875,6 +11721,20 @@
         <member name="M:NLog.LayoutRenderers.NdlcTimingLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
             <inheritdoc/>
         </member>
+        <member name="T:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer">
+            <summary>
+            Renders the nested states from <see cref="T:NLog.ScopeContext"/> like a callstack
+            </summary>
+        </member>
+        <member name="P:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer.Indent">
+            <summary>
+            Gets or sets the indent token.
+            </summary>
+            <docgen category='Layout Options' order='10' />
+        </member>
+        <member name="M:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
+            <inheritdoc/>
+        </member>
         <member name="T:NLog.LayoutRenderers.ScopeContextNestedStatesLayoutRenderer">
             <summary>
             Renders the nested states from <see cref="T:NLog.ScopeContext"/> like a callstack
@@ -12845,6 +12705,11 @@
             Render the first character of the level.
             </summary>
         </member>
+        <member name="F:NLog.LayoutRenderers.LevelFormat.OneLetter">
+            <summary>
+            Render the first character of the level.
+            </summary>
+        </member>
         <member name="F:NLog.LayoutRenderers.LevelFormat.Ordinal">
             <summary>
             Render the ordinal (aka number) for the level.
@@ -12855,6 +12720,11 @@
             Render the LogLevel full name, expanding Warn / Info abbreviations
             </summary>
         </member>
+        <member name="F:NLog.LayoutRenderers.LevelFormat.TriLetter">
+            <summary>
+            Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl)
+            </summary>
+        </member>
         <member name="T:NLog.LayoutRenderers.LevelLayoutRenderer">
             <summary>
             The log level.
@@ -13465,6 +13335,12 @@
             Only outputs the inner layout when exception has been defined for log message.
             </summary>
         </member>
+        <member name="P:NLog.LayoutRenderers.Wrappers.OnExceptionLayoutRendererWrapper.Else">
+            <summary>
+            If <see cref="P:NLog.LogEventInfo.Exception"/> is not found, print this layout.
+            </summary>
+            <docgen category="Condition Options" order="10"/>
+        </member>
         <member name="M:NLog.LayoutRenderers.Wrappers.OnExceptionLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
             <inheritdoc/>
         </member>
@@ -13479,6 +13355,12 @@
             ${onhasproperties:, Properties\: ${all-event-properties}}
             </example>
         </member>
+        <member name="P:NLog.LayoutRenderers.Wrappers.OnHasPropertiesLayoutRendererWrapper.Else">
+            <summary>
+            If <see cref="P:NLog.LogEventInfo.HasProperties"/> is not found, print this layout.
+            </summary>
+            <docgen category="Condition Options" order="10"/>
+        </member>
         <member name="M:NLog.LayoutRenderers.Wrappers.OnHasPropertiesLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
             <inheritdoc/>
         </member>
@@ -15541,6 +15423,12 @@
             <param name="callerFilePath">The full path of the source file that contains the caller. This is set at by the compiler.</param>
             <param name="callerLineNumber">The line number in the source file at which the method is called. This is set at by the compiler.</param>
         </member>
+        <member name="M:NLog.LogEventBuilder.Log(System.Type)">
+            <summary>
+            Writes the log event to the underlying logger.
+            </summary>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
+        </member>
         <member name="T:NLog.LogEventInfo">
             <summary>
             Represents the logging event.
@@ -19434,7 +19322,7 @@
             <summary>
             Writes the specified diagnostic message.
             </summary>
-            <param name="wrapperType">The name of the type that wraps Logger.</param>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
             <param name="logEvent">Log event.</param>
         </member>
         <member name="M:NLog.Logger.Log``1(NLog.LogLevel,``0)">
@@ -20775,7 +20663,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterTarget``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
             <summary>
-            Register a custom Target.
+            Register a custom NLog Target.
             </summary>
             <typeparam name="T">Type of the Target.</typeparam>
             <param name="setupBuilder">Fluent interface parameter.</param>
@@ -20783,15 +20671,31 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterTarget(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
             <summary>
-            Register a custom Target.
+            Register a custom NLog Target.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">Type name of the Target</param>
             <param name="targetType">The target type-alias for use in NLog configuration</param>
         </member>
+        <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayout``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
+            <summary>
+            Register a custom NLog Layout.
+            </summary>
+            <typeparam name="T">Type of the layout renderer.</typeparam>
+            <param name="setupBuilder">Fluent interface parameter.</param>
+            <param name="typeAlias">The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned.</param>
+        </member>
+        <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayout(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
+            <summary>
+            Register a custom NLog Layout.
+            </summary>
+            <param name="setupBuilder">Fluent interface parameter.</param>
+            <param name="layoutType">Type of the layout.</param>
+            <param name="typeAlias">The layout type-alias for use in NLog configuration</param>
+        </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
             <summary>
-            Register a custom layout renderer.
+            Register a custom NLog LayoutRenderer.
             </summary>
             <typeparam name="T">Type of the layout renderer.</typeparam>
             <param name="setupBuilder">Fluent interface parameter.</param>
@@ -20799,7 +20703,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
             <summary>
-            Register a custom layout renderer.
+            Register a custom NLog LayoutRenderer.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="layoutRendererType">Type of the layout renderer.</param>
@@ -20807,7 +20711,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,System.Object})">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -20815,7 +20719,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -20823,7 +20727,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,System.Object},NLog.Layouts.LayoutRenderOptions)">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -20832,7 +20736,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object},NLog.Layouts.LayoutRenderOptions)">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -25665,10 +25569,7 @@
             <param name="logEvent">The logging event.</param>
         </member>
         <member name="M:NLog.Targets.WebServiceTarget.FlushAsync(NLog.Common.AsyncContinuation)">
-            <summary>
-            Flush any pending log messages asynchronously (in case of asynchronous targets).
-            </summary>
-            <param name="asyncContinuation">The asynchronous continuation.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.WebServiceTarget.CloseTarget">
             <inheritdoc/>
@@ -26279,10 +26180,7 @@
             <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.CompoundTargetBase.Write(NLog.LogEventInfo)">
-            <summary>
-            Writes logging event to the log target.
-            </summary>
-            <param name="logEvent">Logging event to be written out.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.CompoundTargetBase.FlushAsync(NLog.Common.AsyncContinuation)">
             <summary>
@@ -27006,10 +26904,7 @@
             <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.WrapperTargetBase.FlushAsync(NLog.Common.AsyncContinuation)">
-            <summary>
-            Flush any pending log messages (in case of asynchronous targets).
-            </summary>
-            <param name="asyncContinuation">The asynchronous continuation.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.WrapperTargetBase.Write(NLog.LogEventInfo)">
             <summary>

packages/NLog.5.0.5/lib/net45/NLog.xml

@@ -2594,7 +2594,7 @@
             <summary>
             Writes the specified diagnostic message.
             </summary>
-            <param name="wrapperType">The name of the type that wraps Logger.</param>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
             <param name="logEvent">Log event.</param>
         </member>
         <member name="M:NLog.ILoggerBase.Log``1(NLog.LogLevel,``0)">
@@ -4065,10 +4065,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionExceptionExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>The '<b>message</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionExceptionExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4128,10 +4125,7 @@
             <value>The layout.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionLayoutExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>String literal in single quotes.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLayoutExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4147,10 +4141,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionLevelExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
-            <returns>The '<b>level</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLevelExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4177,10 +4168,7 @@
             <value>The literal value.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionLiteralExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
-            <returns>The literal value.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLiteralExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4195,10 +4183,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionLoggerNameExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>A <b>logger</b> string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionLoggerNameExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4213,10 +4198,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionMessageExpression.ToString">
-            <summary>
-            Returns a string representation of this expression.
-            </summary>
-            <returns>The '<b>message</b>' string.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionMessageExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4250,9 +4232,7 @@
             </summary>
         </member>
         <member name="M:NLog.Conditions.ConditionMethodExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionMethodExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4279,9 +4259,7 @@
             <value>The expression.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionNotExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionNotExpression.EvaluateNode(NLog.LogEventInfo)">
             <inheritdoc/>
@@ -4311,9 +4289,7 @@
             <value>The right expression.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionOrExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionOrExpression.EvaluateNode(NLog.LogEventInfo)">
             <summary>
@@ -4355,9 +4331,7 @@
             <value>The operator.</value>
         </member>
         <member name="M:NLog.Conditions.ConditionRelationalExpression.ToString">
-            <summary>
-            Returns a string representation of the expression.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Conditions.ConditionRelationalExpression.EvaluateNode(NLog.LogEventInfo)">
             <inheritdoc/>
@@ -4970,11 +4944,7 @@
             </summary>
         </member>
         <member name="M:NLog.Config.Factory`2.RegisterDefinition(System.String,System.Type)">
-            <summary>
-            Registers a single type definition.
-            </summary>
-            <param name="itemName">The item name.</param>
-            <param name="itemDefinition">The type of the item.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.RegisterDefinition(System.String,System.Type,System.String,System.String)">
             <summary>
@@ -4986,27 +4956,13 @@
             <param name="itemNamePrefix">The item name prefix.</param>
         </member>
         <member name="M:NLog.Config.Factory`2.TryGetDefinition(System.String,System.Type@)">
-            <summary>
-            Tries to get registered item definition.
-            </summary>
-            <param name="itemName">Name of the item.</param>
-            <param name="result">Reference to a variable which will store the item definition.</param>
-            <returns>Item definition.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.TryCreateInstance(System.String,`0@)">
-            <summary>
-            Tries to create an item instance.
-            </summary>
-            <param name="itemName">Name of the item.</param>
-            <param name="result">The result.</param>
-            <returns>True if instance was created successfully, false otherwise.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Config.Factory`2.CreateInstance(System.String)">
-            <summary>
-            Creates an item instance.
-            </summary>
-            <param name="itemName">The name of the item.</param>
-            <returns>Created item.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Config.LayoutRendererFactory">
             <summary>
@@ -7270,11 +7226,6 @@
             </summary>
             <returns>Scope Duration Time</returns>
         </member>
-        <member name="T:NLog.ScopeContext.ScopeContextPropertiesCollapsed">
-            <summary>
-            Special bookmark that can restore original parent, after scopes has been collapsed
-            </summary>
-        </member>
         <member name="T:NLog.Filters.ConditionBasedFilter">
             <summary>
             Matches when the specified condition is met.
@@ -9066,14 +9017,22 @@
             </summary>
             <param name="bytes">The bytes.</param>
         </member>
+        <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Writes the specified bytes to a file.
+            </summary>
+            <param name="bytes">The bytes array.</param>
+            <param name="offset">The bytes array offset.</param>
+            <param name="count">The number of bytes.</param>
+        </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Flush">
             <summary>
-            Flushes this instance.
+            Flushes this file-appender instance.
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.Close">
             <summary>
-            Closes this instance.
+            Closes this file-appender instance.
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseFileAppender.GetFileCreationTimeUtc">
@@ -9130,10 +9089,7 @@
             <value>The mutex for archiving.</value>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseMutexFileAppender.Dispose(System.Boolean)">
-            <summary>
-            Releases unmanaged and - optionally - managed resources.
-            </summary>
-            <param name="disposing">True to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.BaseMutexFileAppender.CreateSharableMutex(System.String)">
             <summary>
@@ -9156,35 +9112,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Close">
-            <summary>
-            Closes this instance of the appender.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Flush">
-            <summary>
-            Flushes this current appender.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes to a file.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Factory">
             <summary>
@@ -9192,14 +9132,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.CountingSingleProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.FileAppenderCache">
             <summary>
@@ -9465,35 +9398,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Factory">
             <summary>
@@ -9501,14 +9418,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.MutexMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.NullAppender">
             <summary>
@@ -9523,14 +9433,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.NullAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender">
             <summary>
@@ -9546,35 +9449,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Factory">
             <summary>
@@ -9582,14 +9469,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.RetryingMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.SingleProcessFileAppender">
             <summary>
@@ -9604,35 +9484,19 @@
             <param name="parameters">The parameters.</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.GetFileCreationTimeUtc">
-            <summary>
-            Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal 
-            Time [UTC] standard.
-            </summary>
-            <returns>The file creation time.</returns>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.SingleProcessFileAppender.Factory">
             <summary>
@@ -9640,14 +9504,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.SingleProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender">
             <summary>
@@ -9671,28 +9528,19 @@
             <param name="fileName">File to create or open</param>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Write(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes the specified bytes.
-            </summary>
-            <param name="bytes">The bytes array.</param>
-            <param name="offset">The bytes array offset.</param>
-            <param name="count">The number of bytes.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Close">
-            <summary>
-            Closes this instance.
-            </summary>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Flush">
-            <summary>
-            Flushes this instance.
-            </summary>
+            <inheritdoc/>
+        </member>
+        <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.GetFileCreationTimeUtc">
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.GetFileLength">
-            <summary>
-            Gets the length in bytes of the file associated with the appender.
-            </summary>
-            <returns>A long value representing the length of the file in bytes.</returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Factory">
             <summary>
@@ -9700,14 +9548,7 @@
             </summary>
         </member>
         <member name="M:NLog.Internal.FileAppenders.WindowsMultiProcessFileAppender.Factory.NLog#Internal#FileAppenders#IFileAppenderFactory#Open(System.String,NLog.Internal.FileAppenders.ICreateFileParameters)">
-            <summary>
-            Opens the appender for given file name and parameters.
-            </summary>
-            <param name="fileName">Name of the file.</param>
-            <param name="parameters">Creation parameters.</param>
-            <returns>
-            Instance of <see cref="T:NLog.Internal.FileAppenders.BaseFileAppender"/> which can be used to write to the file.
-            </returns>
+            <inheritdoc/>
         </member>
         <member name="T:NLog.Internal.FilePathLayout">
             <summary>
@@ -10502,41 +10343,6 @@
             Macintosh Mac OSX
             </summary>
         </member>
-        <member name="T:NLog.Internal.ScopeContextAsyncState">
-            <summary>
-            Immutable state that combines ScopeContext MDLC + NDLC for <see cref="T:System.Threading.AsyncLocal`1"/>
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.IScopeContextAsyncState">
-            <summary>
-            Immutable state that combines ScopeContext MDLC + NDLC for <see cref="T:System.Threading.AsyncLocal`1"/>
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.IScopeContextPropertiesAsyncState">
-            <summary>
-            Immutable state for ScopeContext Mapped Context (MDLC)
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.ScopedContextNestedAsyncState`1">
-            <summary>
-            Immutable state for ScopeContext Nested State (NDLC)
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.ScopeContextPropertyAsyncState`1">
-            <summary>
-            Immutable state for ScopeContext Single Property (MDLC)
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.ScopeContextPropertiesAsyncState`1">
-            <summary>
-            Immutable state for ScopeContext Multiple Properties (MDLC)
-            </summary>
-        </member>
-        <member name="T:NLog.Internal.ScopeContextLegacyAsyncState">
-            <summary>
-            Immutable state for ScopeContext handling legacy MDLC + NDLC operations
-            </summary>
-        </member>
         <member name="P:NLog.Internal.SetupConfigurationLoggingRuleBuilder.LoggingRule">
             <inheritdoc/>
         </member>
@@ -10701,9 +10507,9 @@
             <param name="builder"></param>
             <param name="value">value to append</param>
         </member>
-        <member name="M:NLog.Internal.StringBuilderExt.AppendXmlDateTimeRoundTrip(System.Text.StringBuilder,System.DateTime)">
+        <member name="M:NLog.Internal.StringBuilderExt.AppendXmlDateTimeUtcRoundTrip(System.Text.StringBuilder,System.DateTime)">
             <summary>
-            Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time)
+            Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time)
             </summary>
         </member>
         <member name="M:NLog.Internal.StringBuilderExt.ClearBuilder(System.Text.StringBuilder)">
@@ -12058,6 +11864,20 @@
         <member name="M:NLog.LayoutRenderers.NdlcTimingLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
             <inheritdoc/>
         </member>
+        <member name="T:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer">
+            <summary>
+            Renders the nested states from <see cref="T:NLog.ScopeContext"/> like a callstack
+            </summary>
+        </member>
+        <member name="P:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer.Indent">
+            <summary>
+            Gets or sets the indent token.
+            </summary>
+            <docgen category='Layout Options' order='10' />
+        </member>
+        <member name="M:NLog.LayoutRenderers.ScopeContextIndentLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
+            <inheritdoc/>
+        </member>
         <member name="T:NLog.LayoutRenderers.ScopeContextNestedStatesLayoutRenderer">
             <summary>
             Renders the nested states from <see cref="T:NLog.ScopeContext"/> like a callstack
@@ -13028,6 +12848,11 @@
             Render the first character of the level.
             </summary>
         </member>
+        <member name="F:NLog.LayoutRenderers.LevelFormat.OneLetter">
+            <summary>
+            Render the first character of the level.
+            </summary>
+        </member>
         <member name="F:NLog.LayoutRenderers.LevelFormat.Ordinal">
             <summary>
             Render the ordinal (aka number) for the level.
@@ -13038,6 +12863,11 @@
             Render the LogLevel full name, expanding Warn / Info abbreviations
             </summary>
         </member>
+        <member name="F:NLog.LayoutRenderers.LevelFormat.TriLetter">
+            <summary>
+            Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl)
+            </summary>
+        </member>
         <member name="T:NLog.LayoutRenderers.LevelLayoutRenderer">
             <summary>
             The log level.
@@ -13648,6 +13478,12 @@
             Only outputs the inner layout when exception has been defined for log message.
             </summary>
         </member>
+        <member name="P:NLog.LayoutRenderers.Wrappers.OnExceptionLayoutRendererWrapper.Else">
+            <summary>
+            If <see cref="P:NLog.LogEventInfo.Exception"/> is not found, print this layout.
+            </summary>
+            <docgen category="Condition Options" order="10"/>
+        </member>
         <member name="M:NLog.LayoutRenderers.Wrappers.OnExceptionLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
             <inheritdoc/>
         </member>
@@ -13662,6 +13498,12 @@
             ${onhasproperties:, Properties\: ${all-event-properties}}
             </example>
         </member>
+        <member name="P:NLog.LayoutRenderers.Wrappers.OnHasPropertiesLayoutRendererWrapper.Else">
+            <summary>
+            If <see cref="P:NLog.LogEventInfo.HasProperties"/> is not found, print this layout.
+            </summary>
+            <docgen category="Condition Options" order="10"/>
+        </member>
         <member name="M:NLog.LayoutRenderers.Wrappers.OnHasPropertiesLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
             <inheritdoc/>
         </member>
@@ -15724,6 +15566,12 @@
             <param name="callerFilePath">The full path of the source file that contains the caller. This is set at by the compiler.</param>
             <param name="callerLineNumber">The line number in the source file at which the method is called. This is set at by the compiler.</param>
         </member>
+        <member name="M:NLog.LogEventBuilder.Log(System.Type)">
+            <summary>
+            Writes the log event to the underlying logger.
+            </summary>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
+        </member>
         <member name="T:NLog.LogEventInfo">
             <summary>
             Represents the logging event.
@@ -19642,7 +19490,7 @@
             <summary>
             Writes the specified diagnostic message.
             </summary>
-            <param name="wrapperType">The name of the type that wraps Logger.</param>
+            <param name="wrapperType">Type of custom Logger wrapper.</param>
             <param name="logEvent">Log event.</param>
         </member>
         <member name="M:NLog.Logger.Log``1(NLog.LogLevel,``0)">
@@ -21022,7 +20870,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterTarget``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
             <summary>
-            Register a custom Target.
+            Register a custom NLog Target.
             </summary>
             <typeparam name="T">Type of the Target.</typeparam>
             <param name="setupBuilder">Fluent interface parameter.</param>
@@ -21030,15 +20878,31 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterTarget(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
             <summary>
-            Register a custom Target.
+            Register a custom NLog Target.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">Type name of the Target</param>
             <param name="targetType">The target type-alias for use in NLog configuration</param>
         </member>
+        <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayout``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
+            <summary>
+            Register a custom NLog Layout.
+            </summary>
+            <typeparam name="T">Type of the layout renderer.</typeparam>
+            <param name="setupBuilder">Fluent interface parameter.</param>
+            <param name="typeAlias">The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned.</param>
+        </member>
+        <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayout(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
+            <summary>
+            Register a custom NLog Layout.
+            </summary>
+            <param name="setupBuilder">Fluent interface parameter.</param>
+            <param name="layoutType">Type of the layout.</param>
+            <param name="typeAlias">The layout type-alias for use in NLog configuration</param>
+        </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer``1(NLog.Config.ISetupExtensionsBuilder,System.String)">
             <summary>
-            Register a custom layout renderer.
+            Register a custom NLog LayoutRenderer.
             </summary>
             <typeparam name="T">Type of the layout renderer.</typeparam>
             <param name="setupBuilder">Fluent interface parameter.</param>
@@ -21046,7 +20910,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Type)">
             <summary>
-            Register a custom layout renderer.
+            Register a custom NLog LayoutRenderer.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="layoutRendererType">Type of the layout renderer.</param>
@@ -21054,7 +20918,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,System.Object})">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -21062,7 +20926,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -21070,7 +20934,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,System.Object},NLog.Layouts.LayoutRenderOptions)">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -21079,7 +20943,7 @@
         </member>
         <member name="M:NLog.SetupExtensionsBuilderExtensions.RegisterLayoutRenderer(NLog.Config.ISetupExtensionsBuilder,System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object},NLog.Layouts.LayoutRenderOptions)">
             <summary>
-            Register a custom layout renderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
+            Register a custom NLog LayoutRenderer with a callback function <paramref name="layoutMethod"/>. The callback receives the logEvent and the current configuration.
             </summary>
             <param name="setupBuilder">Fluent interface parameter.</param>
             <param name="name">The layout-renderer type-alias for use in NLog configuration - without '${ }'</param>
@@ -26129,10 +25993,7 @@
             <param name="logEvent">The logging event.</param>
         </member>
         <member name="M:NLog.Targets.WebServiceTarget.FlushAsync(NLog.Common.AsyncContinuation)">
-            <summary>
-            Flush any pending log messages asynchronously (in case of asynchronous targets).
-            </summary>
-            <param name="asyncContinuation">The asynchronous continuation.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.WebServiceTarget.CloseTarget">
             <inheritdoc/>
@@ -26743,10 +26604,7 @@
             <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.CompoundTargetBase.Write(NLog.LogEventInfo)">
-            <summary>
-            Writes logging event to the log target.
-            </summary>
-            <param name="logEvent">Logging event to be written out.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.CompoundTargetBase.FlushAsync(NLog.Common.AsyncContinuation)">
             <summary>
@@ -27518,10 +27376,7 @@
             <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.WrapperTargetBase.FlushAsync(NLog.Common.AsyncContinuation)">
-            <summary>
-            Flush any pending log messages (in case of asynchronous targets).
-            </summary>
-            <param name="asyncContinuation">The asynchronous continuation.</param>
+            <inheritdoc/>
         </member>
         <member name="M:NLog.Targets.Wrappers.WrapperTargetBase.Write(NLog.LogEventInfo)">
             <summary>