Speichern an einer Stelle - ClassNIProfil, ClassNIVerknuepfungen, frmNIProfileigenschaften, frmNIVerknuepfungen, frmNIVerknuepfungen.Designer

This reverts commit c6ee88e871.

.vs/ToolCollection/v17/ResourceExplorer/settings.json

@@ -1,14 +0,0 @@
-{
-  "ShowEmptyProjects": false,
-  "SelectedGroups": [],
-  "ExpandedProjects": [],
-  "EnableSpellChecker": true,
-  "ColumnOrder": [
-    "name",
-    "type"
-  ],
-  "VisibleColumnKeys": [
-    "name",
-    "neutral-value"
-  ]
-}

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

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/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

ToolCollection/My Project/Settings.Designer.vb

@@ -678,30 +678,6 @@ Namespace My
             End Get
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        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.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        Public Property DI_RUNNING() As Boolean
-            Get
-                Return CType(Me("DI_RUNNING"),Boolean)
-            End Get
-            Set
-                Me("DI_RUNNING") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("@Domain#@User#@PW")>  _

ToolCollection/My Project/Settings.settings

@@ -166,12 +166,6 @@
 &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>
     </Setting>
-    <Setting Name="NI_RUNNING" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="DI_RUNNING" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="WM_PERS_LOGIN" Type="System.String" Scope="Application">
       <Value Profile="(Default)">@Domain#@User#@PW</Value>
     </Setting>

ToolCollection/ToolCollection.vbproj

@@ -93,16 +93,16 @@
     <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="DigitalData.Modules.Config">
-      <HintPath>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Filesystem">
       <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <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>
@@ -334,18 +334,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>
@@ -507,12 +495,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>

ToolCollection/app.config

@@ -147,12 +147,6 @@
       <setting name="myDateiname" serializeAs="String">
         <value>myInvalidDateiname.pdf</value>
       </setting>
-      <setting name="NI_RUNNING" serializeAs="String">
-        <value>False</value>
-      </setting>
-      <setting name="DI_RUNNING" serializeAs="String">
-        <value>False</value>
-      </setting>
       <setting name="vDeleteLogsTime" serializeAs="String">
         <value />
       </setting>

ToolCollection/frmDIHauptseite.vb

@@ -155,7 +155,6 @@ Public Class frmDIHauptseite
                 Me.tvLog.Visible = False
                 Me.timRun_Dateiimport.Stop()
                 Durchlauf = False
-                My.Settings.DI_RUNNING = False
 
             End If
             Me.progressImport.Enabled = False
@@ -239,9 +238,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.DI_RUNNING = 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
@@ -2297,7 +2301,6 @@ Public Class frmDIHauptseite
 
                     Me.timRun_Dateiimport.Interval = Me.numIntervallDurchlauf.Value * 60 * 1000
                     Me.timRun_Dateiimport.Start()
-                    My.Settings.DI_RUNNING = True
                     My.Settings.Save()
                     'Direkt einen Durchlauf starten
                     If runnow = True Then
@@ -2316,7 +2319,6 @@ Public Class frmDIHauptseite
                 Me.tvLog.Visible = False
                 Me.timRun_Dateiimport.Stop()
                 Durchlauf = False
-                My.Settings.DI_RUNNING = False
             End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei btnDurchlauf.Click:")

ToolCollection/frmDIProfilEigenschaften.vb

@@ -57,11 +57,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 +73,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
@@ -256,25 +256,9 @@ Public Class frmDIProfilEigenschaften
     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 +283,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

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/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.vb

@@ -113,13 +113,14 @@ Public Class frmNIHauptseite
             _MyLogger.Debug = False
         End If
 
-        If My.Settings.NI_RUNNING = True Then
-
-            _Logger.Info("Nachindexierungslauf wird wieder gestartet - My.Settings.NI_RUNNING = True")
+        If AUTOSTART_FIH Then
             Start_NachindexierungThreads()
+            _Logger.Info("AUTOSTART_FIH = True - Nachindexierung wird gestartet.")
+            AUTOSTART_FIH = False
         Else
             _Logger.Info("Nachindexierung Hauptformular wurde geladen - Nachindexierungslauf wird NICHT gestartet.")
         End If
+
     End Sub
     Private Sub frmNIHauptseite_Load(sender As Object, e As System.EventArgs) Handles Me.Load
         'Try
@@ -2742,7 +2743,6 @@ Public Class frmNIHauptseite
         bwDatei.WorkerReportsProgress = True
         bwDatei.WorkerSupportsCancellation = True
 
-        My.Settings.NI_RUNNING = True
         My.Settings.Save()
         ' den Indexierungsvorgang direkt (zum ersten Mal) durchführen
         Me.Profile_Durchlaufen()
@@ -2784,7 +2784,6 @@ Public Class frmNIHauptseite
             If keeprunning = False Then
                 _Logger.Debug("keeprunning = False - Zurücksetzen")
                 'Abbruch der Nachindexierung
-                My.Settings.NI_RUNNING = False
                 Me.numIntervall.Enabled = True
                 Me.pnlInfos.Visible = False
                 Me.tslblStatus.Visible = False
@@ -2818,7 +2817,6 @@ Public Class frmNIHauptseite
         Else
             TimerRefresh.Stop()
         End If
-        manuallyRun = True
         If Me.btnStartStop.Text = "Nachindexierung stoppen" Then
             If timRun.Enabled = True Then
                 timRun.Stop()
@@ -2826,7 +2824,7 @@ Public Class frmNIHauptseite
             Abbruch_NI("Manueller Abbruch 1 durch User " & Environment.UserName, False, False)
             Me.btnStartStop.Text = "Nachindexierung starten"
         Else
-            Me.btnStartStop.Text = "Nachindexierung stoppen"
+                Me.btnStartStop.Text = "Nachindexierung stoppen"
             Start_NachindexierungThreads()
         End If
         manuallyRun = False

ToolCollection/frmNIProfileigenschaften.Designer.vb

@@ -24,15 +24,15 @@ Partial Class frmNIProfileigenschaften
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNIProfileigenschaften))
-        Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 1")
-        Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 2")
-        Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 3")
-        Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Parent", New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3})
-        Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-1", New System.Windows.Forms.TreeNode() {TreeNode4})
-        Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-2", New System.Windows.Forms.TreeNode() {TreeNode5})
-        Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-3", New System.Windows.Forms.TreeNode() {TreeNode6})
-        Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-4", New System.Windows.Forms.TreeNode() {TreeNode7})
-        Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Windream-/W-Laufwerk", New System.Windows.Forms.TreeNode() {TreeNode8})
+        Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 1")
+        Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 2")
+        Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 3")
+        Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Parent", New System.Windows.Forms.TreeNode() {TreeNode10, TreeNode11, TreeNode12})
+        Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-1", New System.Windows.Forms.TreeNode() {TreeNode13})
+        Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-2", New System.Windows.Forms.TreeNode() {TreeNode14})
+        Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-3", New System.Windows.Forms.TreeNode() {TreeNode15})
+        Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-4", New System.Windows.Forms.TreeNode() {TreeNode16})
+        Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Windream-/W-Laufwerk", New System.Windows.Forms.TreeNode() {TreeNode17})
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton()
         Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton()
@@ -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(991, 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,11 +557,12 @@ Partial Class frmNIProfileigenschaften
         '
         'btnVerknüpfungen
         '
-        Me.btnVerknüpfungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+        Me.btnVerknüpfungen.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.btnVerknüpfungen.Location = New System.Drawing.Point(754, 36)
+        Me.btnVerknüpfungen.Location = New System.Drawing.Point(746, 26)
         Me.btnVerknüpfungen.Name = "btnVerknüpfungen"
-        Me.btnVerknüpfungen.Size = New System.Drawing.Size(150, 23)
+        Me.btnVerknüpfungen.Size = New System.Drawing.Size(171, 23)
         Me.btnVerknüpfungen.TabIndex = 49
         Me.btnVerknüpfungen.Text = "Verknüpfungen verwalten ..."
         Me.btnVerknüpfungen.UseVisualStyleBackColor = True
@@ -569,7 +572,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 +580,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 +590,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 +599,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 +607,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 +616,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
@@ -671,7 +674,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 +684,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
@@ -733,7 +736,7 @@ Partial Class frmNIProfileigenschaften
         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(656, 71)
         Me.lblSave.Name = "lblSave"
         Me.lblSave.Size = New System.Drawing.Size(261, 17)
         Me.lblSave.TabIndex = 76
@@ -765,10 +768,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(985, 481)
         Me.TabControl1.TabIndex = 78
         '
         'TabPage1
@@ -781,7 +784,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(977, 455)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Typ und Quelle"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -802,7 +805,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(508, 215)
         Me.grbxLDAP.TabIndex = 79
         Me.grbxLDAP.TabStop = False
         Me.grbxLDAP.Text = "Indexierung gegen Active Directory:"
@@ -904,7 +907,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(392, 201)
         Me.grbxVolltext.TabIndex = 78
         Me.grbxVolltext.TabStop = False
         Me.grbxVolltext.Text = "Indexierung gegen den Volltext"
@@ -957,7 +960,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, 556)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Kennzeichnung und Active Directory"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -1251,7 +1254,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."
@@ -1290,7 +1293,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:"
         '
@@ -1320,31 +1323,31 @@ Partial Class frmNIProfileigenschaften
         Me.TreeViewOrdnerVererbung.ImageList = Me.ImageList1
         Me.TreeViewOrdnerVererbung.Location = New System.Drawing.Point(464, 72)
         Me.TreeViewOrdnerVererbung.Name = "TreeViewOrdnerVererbung"
-        TreeNode1.ImageKey = "page.png"
-        TreeNode1.Name = "Knoten3"
-        TreeNode1.SelectedImageIndex = 1
-        TreeNode1.Text = "Datei 1"
-        TreeNode2.ImageKey = "page.png"
-        TreeNode2.Name = "Knoten4"
-        TreeNode2.SelectedImageIndex = 1
-        TreeNode2.Text = "Datei 2"
-        TreeNode3.ImageKey = "page.png"
-        TreeNode3.Name = "Knoten5"
-        TreeNode3.SelectedImageIndex = 1
-        TreeNode3.Text = "Datei 3"
-        TreeNode4.Name = "Knoten4"
-        TreeNode4.Text = "Parent"
-        TreeNode5.Name = "Knoten3"
-        TreeNode5.Text = "-1"
-        TreeNode6.Name = "Knoten2"
-        TreeNode6.Text = "-2"
-        TreeNode7.Name = "Knoten5"
-        TreeNode7.Text = "-3"
-        TreeNode8.Name = "Knoten1"
-        TreeNode8.Text = "-4"
-        TreeNode9.Name = "Knoten0"
-        TreeNode9.Text = "Windream-/W-Laufwerk"
-        Me.TreeViewOrdnerVererbung.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode9})
+        TreeNode10.ImageKey = "page.png"
+        TreeNode10.Name = "Knoten3"
+        TreeNode10.SelectedImageIndex = 1
+        TreeNode10.Text = "Datei 1"
+        TreeNode11.ImageKey = "page.png"
+        TreeNode11.Name = "Knoten4"
+        TreeNode11.SelectedImageIndex = 1
+        TreeNode11.Text = "Datei 2"
+        TreeNode12.ImageKey = "page.png"
+        TreeNode12.Name = "Knoten5"
+        TreeNode12.SelectedImageIndex = 1
+        TreeNode12.Text = "Datei 3"
+        TreeNode13.Name = "Knoten4"
+        TreeNode13.Text = "Parent"
+        TreeNode14.Name = "Knoten3"
+        TreeNode14.Text = "-1"
+        TreeNode15.Name = "Knoten2"
+        TreeNode15.Text = "-2"
+        TreeNode16.Name = "Knoten5"
+        TreeNode16.Text = "-3"
+        TreeNode17.Name = "Knoten1"
+        TreeNode17.Text = "-4"
+        TreeNode18.Name = "Knoten0"
+        TreeNode18.Text = "Windream-/W-Laufwerk"
+        Me.TreeViewOrdnerVererbung.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode18})
         Me.TreeViewOrdnerVererbung.SelectedImageIndex = 0
         Me.TreeViewOrdnerVererbung.Size = New System.Drawing.Size(220, 157)
         Me.TreeViewOrdnerVererbung.TabIndex = 59
@@ -1401,7 +1404,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 +1412,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 +1424,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,26 +1433,35 @@ 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(991, 706)
+        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(991, 728)
+        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)
@@ -1488,6 +1500,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 +1621,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
+        CQAAAk1TRnQBSQFMAgEBAgEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

ToolCollection/frmNIProfileigenschaften.vb

@@ -17,6 +17,7 @@ Public Class frmNIProfileigenschaften
     Private Shared _Instance As frmNIProfileigenschaften = Nothing
     Private licenseManager As ClassLicenseManager = 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
@@ -141,6 +142,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 +159,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 +176,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 +253,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
@@ -501,6 +507,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
@@ -540,24 +547,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 +651,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 +825,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
 
@@ -1115,6 +1114,11 @@ Public Class frmNIProfileigenschaften
         Else
             grpbxMORE.Enabled = False
         End If
+        If Me._selectedProfile Is Nothing Then
+            Me.pnlProfileigenschaften.Visible = False
+        Else
+            Lade_Profil(Me._selectedProfile.Profilname)
+        End If
     End Sub
 
     Private Sub chkbxUserIdent_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxUserIdent.CheckedChanged

ToolCollection/frmNIProfilhinzufuegen.vb

@@ -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
 

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()
@@ -86,6 +85,7 @@ Partial Class frmNIVerknuepfungen
         Me.lblDescrangelegteVerknuepf = New System.Windows.Forms.Label()
         Me.tabctrlbottom = New System.Windows.Forms.TabControl()
         Me.TabPage6 = New System.Windows.Forms.TabPage()
+        Me.btnSaveCheckIndex = New System.Windows.Forms.Button()
         Me.btnzuruecksetzen_checksql = New System.Windows.Forms.Button()
         Me.txtGrundgeruest_check = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -169,6 +169,9 @@ 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.btnCancel = New System.Windows.Forms.Button()
+        Me.btnSaveAll = New System.Windows.Forms.Button()
         Me.StatusStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -191,6 +194,7 @@ Partial Class frmNIVerknuepfungen
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
         Me.SplitContainer1.SuspendLayout()
+        Me.pnlFooter.SuspendLayout()
         Me.SuspendLayout()
         '
         'txtfinalSkriptUpdate
@@ -205,7 +209,7 @@ 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.Size = New System.Drawing.Size(963, 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)
@@ -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
@@ -501,27 +505,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 +544,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 +553,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
@@ -574,7 +577,6 @@ Partial Class frmNIVerknuepfungen
         '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 +588,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 +602,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
@@ -711,7 +698,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
@@ -753,7 +740,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 +752,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 +765,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,7 +780,7 @@ 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)
@@ -807,9 +794,9 @@ Partial Class frmNIVerknuepfungen
         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.Location = New System.Drawing.Point(1114, 32)
         Me.btnsave_select.Name = "btnsave_select"
-        Me.btnsave_select.Size = New System.Drawing.Size(89, 23)
+        Me.btnsave_select.Size = New System.Drawing.Size(110, 24)
         Me.btnsave_select.TabIndex = 47
         Me.btnsave_select.Text = "Speichern"
         Me.btnsave_select.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -821,7 +808,7 @@ Partial Class frmNIVerknuepfungen
         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 +821,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 +855,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,16 +922,17 @@ 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
         '
         'TabPage6
         '
+        Me.TabPage6.Controls.Add(Me.btnSaveCheckIndex)
         Me.TabPage6.Controls.Add(Me.btnzuruecksetzen_checksql)
         Me.TabPage6.Controls.Add(Me.txtGrundgeruest_check)
         Me.TabPage6.Controls.Add(Me.Panel2)
@@ -957,17 +945,32 @@ 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
         '
+        'btnSaveCheckIndex
+        '
+        Me.btnSaveCheckIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSaveCheckIndex.BackColor = System.Drawing.SystemColors.Control
+        Me.btnSaveCheckIndex.Enabled = False
+        Me.btnSaveCheckIndex.Image = Global.ToolCollection.My.Resources.Resources.save
+        Me.btnSaveCheckIndex.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnSaveCheckIndex.Location = New System.Drawing.Point(1120, 21)
+        Me.btnSaveCheckIndex.Name = "btnSaveCheckIndex"
+        Me.btnSaveCheckIndex.Size = New System.Drawing.Size(110, 24)
+        Me.btnSaveCheckIndex.TabIndex = 52
+        Me.btnSaveCheckIndex.Text = "Speichern"
+        Me.btnSaveCheckIndex.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSaveCheckIndex.UseVisualStyleBackColor = True
+        '
         '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 +978,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 +988,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 +1013,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 +1022,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 +1034,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 +1046,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 +1062,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 +1077,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 +1104,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 +1117,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 +1128,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 +1154,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 +1293,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 +1357,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 +1476,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 = ""
         '
@@ -1848,7 +1852,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 +1861,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 +1935,53 @@ 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.BackColor = System.Drawing.Color.Transparent
+        Me.pnlFooter.Controls.Add(Me.btnCancel)
+        Me.pnlFooter.Controls.Add(Me.btnSaveAll)
+        Me.pnlFooter.Dock = System.Windows.Forms.DockStyle.Fill
+        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
+        '
+        'btnCancel
+        '
+        Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.btnCancel.BackColor = System.Drawing.SystemColors.Control
+        Me.btnCancel.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCancel.Location = New System.Drawing.Point(997, 5)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(120, 30)
+        Me.btnCancel.TabIndex = 1
+        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancel.UseVisualStyleBackColor = False
+        '
+        'btnSaveAll
+        '
+        Me.btnSaveAll.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.btnSaveAll.BackColor = System.Drawing.SystemColors.Control
+        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(1123, 5)
+        Me.btnSaveAll.Name = "btnSaveAll"
+        Me.btnSaveAll.Size = New System.Drawing.Size(120, 30)
+        Me.btnSaveAll.TabIndex = 0
+        Me.btnSaveAll.Text = "Speichern"
+        Me.btnSaveAll.UseVisualStyleBackColor = True
+        '
         '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 +2023,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()
 
@@ -2128,8 +2170,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 btnSaveCheckIndex As Button
+    Friend WithEvents pnlFooter As Panel
+    Friend WithEvents btnSaveAll As Button
+    Friend WithEvents btnCancel 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/frmNIVerknuepfungen.vb

@@ -194,6 +194,9 @@ Public Class frmNIVerknuepfungen
             If Me._selectedProfil.Dokumenttyp IsNot Nothing Then
                 'Profilübergreifende Aktualisierungen
                 Me.pnlZielQuelle.Visible = True
+                Me.SplitContainer1.Visible = True
+                Me.tabctrlbottom.Visible = True
+                Me.pnlFooter.Visible = True
                 Me.pnlZielQuelle.Dock = DockStyle.Fill
                 Me.lblProfil.Text = "Gewähltes Profil: '" & Me._selectedProfil.Profilname & "'"
                 Me.lblProfil.Visible = True
@@ -461,6 +464,8 @@ Public Class frmNIVerknuepfungen
                     End If
 
                 End If
+                ' Nach vollständigem Laden wird saved auf true (changed auf false) gesetzt
+                Me._selectedProfil.setSaved()
             Else
                 Me.lblProfil.Text = "Gewähltes Profil: '" & Me._selectedProfil.Profilname & "'" & " - unbekannter Objekttyp -"
                 MsgBox("Ein Dokumenttyp konnte nicht bestimmt werden! Vergewissern Sie sich das das Profil korrekt gespeichert wurde!", MsgBoxStyle.Exclamation, "Ausnahme:")
@@ -478,9 +483,11 @@ Public Class frmNIVerknuepfungen
     ''' </summary>
     ''' <remarks></remarks>
     Private Sub cmbProfilauswahl_DropDownItemClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ToolStripItemClickedEventArgs) Handles cmbProfilauswahl.DropDownItemClicked
+        ClassNIProfile.aktivesProfil = ClassNIProfile.getProfilByName(e.ClickedItem.Text)
+        Me._selectedProfil = ClassNIProfile.aktivesProfil
         Try
             'wenn noch kein Profil geladen wurde soll das ausgewählte auf jeden Fall geladen werden
-            If Me._selectedProfil Is Nothing Then
+            If Me._selectedProfil IsNot Nothing Then
                 Me.LoadSelectedProfile(e.ClickedItem.Text)
                 Me.pnlZielQuelle.Enabled = True
             Else ' wenn bereits ein Profil geladen war
@@ -1674,6 +1681,23 @@ Public Class frmNIVerknuepfungen
 
 
     Private Sub lvwVerknuepfungen_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles lvwVerknuepfungen.SelectedIndexChanged
+        If Not Me._selectedProfil.IsSaved Then
+
+            Dim msgResult As MsgBoxResult = MsgBox("Möchten Sie die Änderungen speichern?", MsgBoxStyle.YesNoCancel, "Änderungen übernehmen?")
+            If msgResult = MsgBoxResult.Yes Then
+
+                If Not Me._selectedProfil.IsSaved Then
+                    SaveProfile()
+                End If
+
+                If Not Me._selectedProfil._links.IsSaved Then
+                    SaveLinks()
+                End If
+
+            End If
+
+        End If
+
         Select Case Me._selectedProfil.Ni_Art
             Case "db"
                 Try
@@ -1693,7 +1717,7 @@ Public Class frmNIVerknuepfungen
                     End If
 
                     ' merken ob das Profil geändert wurde
-                    Dim gespeichertVorher = Me._selectedProfil.IsSaved
+                    Dim gespeichertVorher = Me._selectedProfil.GetSaved
                     Dim gespeichertLinkVorher = Me._selectedProfil._links.IsLinksSaved
 
                     ' wenn im ListView eine Zeile ausgewählt wurde
@@ -1714,6 +1738,7 @@ Public Class frmNIVerknuepfungen
                             ' die SQL-Anweisung der ausgewählten Verknüpfung in das Textfeld schreiben
                             Me.txtSelectAnweisung.Text = Me._selectedProfil._links.selectedLink.SelectAnweisung 'Me.selectedProfil.getLinkByValues(Me.lvwVerbunden.SelectedItems(0).SubItems(0).Text, Me.lvwVerbunden.SelectedItems(0).SubItems(1).Text, Me.lvwVerbunden.SelectedItems(0).SubItems(2).Text).getSelectAnweisung()
                             Me.grbFilterDB.Enabled = True
+                            Me.btnSaveAll.Enabled = False
 
                             ' mit dem Cursor an die letzte Position springen
                             Me.txtSelectAnweisung.SelectionStart = Me.txtSelectAnweisung.Text.Length
@@ -1836,7 +1861,7 @@ Public Class frmNIVerknuepfungen
                     End If
 
                     ' merken ob das Profil geändert wurde
-                    Dim gespeichertVorher = Me._selectedProfil.IsSaved
+                    Dim gespeichertVorher = Me._selectedProfil.GetSaved
                     Dim gespeichertLinkVorher = Me._selectedProfil._links.IsLinksSaved
 
                     ' wenn im ListView eine Zeile ausgewählt wurde
@@ -1922,8 +1947,8 @@ Public Class frmNIVerknuepfungen
                     End If
 
                     ' merken ob das Profil geändert wurde
-                    Dim gespeichertVorher = Me._selectedProfil.IsSaved
-                    Dim gespeichertLinkVorher = Me._selectedProfil._links.IsLinksSaved
+                    Dim gespeichertVorher = Me._selectedProfil.GetSaved
+                    Dim gespeichertLinkVorher = Me._selectedProfil._links.GetSaved
 
                     ' wenn im ListView eine Zeile ausgewählt wurde
                     If Me.lvwVerknuepfungen.SelectedItems.Count > 0 Then
@@ -2013,25 +2038,32 @@ Public Class frmNIVerknuepfungen
             MsgBox("Die SELECT-Anweisung konnte nicht auf ihren Ursprungswert zurückgesetzt werden." & vbNewLine & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Fehler beim Zurücksetzen der SQL-Anweisung")
         End Try
     End Sub
-    Private Sub btnsave_select_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnsave_select.Click
+
+    Private Sub SaveLinks()
         Try
             If Me._selectedProfil._links.selectedLink IsNot Nothing Then
-                If Me._selectedProfil.IsSaved = False Then
-
-                    Me._selectedProfil.Save(True, "link")
-                    If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
-                        MsgBox("Verknüpfung erfolgreich gespeichert!", MsgBoxStyle.Information)
-                    End If
-                    With btnsave_select
-                        .Enabled = False
-                        .ForeColor = Drawing.Color.Black
-                    End With
+                'Me._selectedProfil.Save(True, "link")
+                If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
+                    Me._selectedProfil._links.setLinksSaved()
+                    Me.btnsave_select.Enabled = False
+                    Me.btnSaveAll.Enabled = False
+                    'MsgBox("Verknüpfung erfolgreich gespeichert!", MsgBoxStyle.Information)
                 End If
+                With btnsave_select
+                    .Enabled = False
+                    .ForeColor = Drawing.Color.Black
+                End With
             End If
         Catch ex As Exception
             MsgBox("Fehler beim Speichern der DB-Verknüpfung." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
+
+    Private Sub btnsave_select_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnsave_select.Click
+        SaveLinks()
+        SaveProfile()
+        SaveScript()
+    End Sub
     Private Sub txtSelectAnweisung_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtSelectAnweisung.TextChanged
         Try
             ' wenn im ListView eine Zeile selektiert wurde
@@ -2040,15 +2072,15 @@ Public Class frmNIVerknuepfungen
                 Dim SQL_ORIGIN As String = Me._selectedProfil._links.getLinkByValues(Me.lvwVerknuepfungen.SelectedItems(0).SubItems(0).Text, Me.lvwVerknuepfungen.SelectedItems(0).SubItems(1).Text,
                                                         Me.lvwVerknuepfungen.SelectedItems(0).SubItems(2).Text).getSelectAnweisung().ToString
                 If SQL_ORIGIN <> Me.txtSelectAnweisung.Text Then
-                    With btnsave_select
+                    With btnSaveAll
                         .Enabled = True
-                        .ForeColor = Drawing.Color.Red
+                        .ForeColor = Drawing.Color.Black
                     End With
                 End If
                 ' die Informationen der selektierten Verknüpfung auslesen
                 Me._selectedProfil._links.getLinkByValues(Me.lvwVerknuepfungen.SelectedItems(0).SubItems(0).Text, Me.lvwVerknuepfungen.SelectedItems(0).SubItems(1).Text,
                                                           Me.lvwVerknuepfungen.SelectedItems(0).SubItems(2).Text).setSelectAnweisung(Me.txtSelectAnweisung.Text)
-                ' das Profil auf den Status 'geändert' setzen
+                Me.btnSaveAll.Enabled = True
                 Me._selectedProfil.setChanged()
                 Me._selectedProfil._links.setLinksChanged()
                 'Jetzt den Startwert bestimmen
@@ -2177,6 +2209,13 @@ Public Class frmNIVerknuepfungen
 
     Private Sub txtUpdateAnweisung_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtfinalSkriptUpdate.TextChanged
 
+        If Not Me.txtfinalSkriptUpdate.Text = Me._selectedProfil.OriginalSQL_Anweisung Then
+            Me._selectedProfil.SQL_Anweisung = Me.txtfinalSkriptUpdate.Text
+            Me._selectedProfil.setChanged()
+            Me._selectedProfil._links.setLinksChanged()
+            btnSaveAll.Enabled = True
+        End If
+
     End Sub
     Private Sub btnWindreamIndexEinfügenSQL_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnWindreamIndexEinfügenSQL.Click
         If Not Me.cmbWindreamIndexeSQL.SelectedItem = "" Then
@@ -2217,6 +2256,12 @@ Public Class frmNIVerknuepfungen
 
     Private Sub btnTestSQL_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnTestSQL.Click
         Try
+            If Me.txtSelectAnweisung.Text = "" Then
+                MsgBox("Bitte geben Sie eine Select-Anweisung ein!", MsgBoxStyle.Exclamation, "Select-Anweisung fehlt:")
+                Me.txtTestwert.BackColor = Drawing.Color.Lime
+                Me.txtTestwert.Focus()
+                Exit Sub
+            End If
             If Me.txtTestwert.Text = "" Then
                 MsgBox("Bitte geben Sie einen Testwert für den eindeutigen Startwert ein!", MsgBoxStyle.Exclamation, "Testparameter fehlt:")
                 Me.txtTestwert.BackColor = Drawing.Color.Lime
@@ -2256,6 +2301,7 @@ Public Class frmNIVerknuepfungen
     End Sub
     Private Sub frmNIVerknuepfungen_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         If Me._selectedProfil IsNot Nothing Then
+
             If Me._selectedProfil.Desk_windreamIndex = "" Then
                 If Me._selectedProfil.DbArt = "xml" Then
                     MsgBox("Bitte definieren Sie einen eindeutigen/deskriptiven Index!", MsgBoxStyle.Critical, "Fehlende Konfiguration:")
@@ -2263,28 +2309,60 @@ Public Class frmNIVerknuepfungen
                     e.Cancel = True
                 End If
             End If
-            If Me._selectedProfil IsNot Nothing Then
-                If Me._selectedProfil.HasChanges Then
-                    If _selectedProfil.MR_DAIndex <> "" And Me._selectedProfil.checkIndexsql = "" Then
-                        MsgBox("Bitte definieren Sie einen SQL-Befehl zum überprüfen des gültigen Startindexwertes!", MsgBoxStyle.Critical, "Fehlende Konfiguration:")
-                        Me.tabctrlbottom.SelectedIndex = 0
-                        e.Cancel = True
-                    End If
-                End If
-                If Me._selectedProfil Is Nothing = False Then
-                    Me.tabctrlbottom.Visible = False
-                    If Me._selectedProfil.HasChanges Then
-                        Me._selectedProfil.Save(True, "profile")
-                    End If
+
+            If Me._selectedProfil.HasChanges Then
+                If _selectedProfil.MR_DAIndex <> "" And Me._selectedProfil.checkIndexsql = "" Then
+                    MsgBox("Bitte definieren Sie einen SQL-Befehl zum überprüfen des gültigen Startindexwertes!", MsgBoxStyle.Critical, "Fehlende Konfiguration:")
+                    Me.tabctrlbottom.SelectedIndex = 0
+                    e.Cancel = True
                 End If
             End If
+
+            ' If Not Me._selectedProfil.IsSaved Or Not Me._selectedProfil._links.IsSaved Then
+            If Not Me._selectedProfil.IsSaved Then
+
+                Dim msgResult As MsgBoxResult = MsgBox("Möchten Sie die Änderungen speichern?", MsgBoxStyle.YesNoCancel, "Änderungen übernehmen?")
+                If msgResult = MsgBoxResult.Yes Then
+
+                    If Not Me._selectedProfil.IsSaved Then
+                        SaveProfile()
+                    End If
+
+                    If Not Me._selectedProfil._links.IsSaved Then
+                        SaveLinks()
+                    End If
+
+                End If
+
+            End If
+
         End If
     End Sub
 
     Private Sub frmNIVerknuepfungen_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         Me.LoadProfilesInCombobox()
-        Me._selectedProfil = Nothing
-        Me.pnlZielQuelle.Visible = False
+
+        If ClassNIProfile.aktivesProfilAusProfileigenschaften And ClassNIProfile.aktivesProfil Is Nothing = False Then
+            Me._selectedProfil = ClassNIProfile.aktivesProfil
+            Me.lblProfil.Text = "(" & Me._selectedProfil.Profilname & ")"
+            Me.lblProfil.Visible = True
+
+            Me.LoadSelectedProfile(Me._selectedProfil.Profilname)
+
+            ClassNIProfile.aktivesProfilAusProfileigenschaften = False
+
+            If Me._selectedProfil.Dokumenttyp Is Nothing Then
+                Me.lblProfil.Enabled = False
+            Else
+                Me.lblProfil.Enabled = True
+            End If
+        Else
+            Me._selectedProfil = Nothing
+            Me.pnlZielQuelle.Visible = False
+            Me.SplitContainer1.Visible = False
+            Me.pnlfulltext.Visible = False
+        End If
+
     End Sub
     Private Sub btnEindIndex_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnEindIndex.Click
         Dim text As String = Me.txteindeutigerIndex.Text
@@ -2594,12 +2672,29 @@ Public Class frmNIVerknuepfungen
         End If
     End Sub
 
-    Private Sub txtCheckIndexSQL_LostFocus(sender As Object, e As System.EventArgs) Handles txtCheckIndexSQL.LostFocus
+    'Private Sub txtCheckIndexSQL_LostFocus(sender As Object, e As System.EventArgs) Handles txtCheckIndexSQL.LostFocus
+    '    If Me.txtCheckIndexSQL.Text <> "" Then
+    '        Try
+    '            ' die Änderungen speichern
+    '            If Me._selectedProfil.Save(True, "profile") = True Then    ' wenn das Speichern erfolgreich war
+    '                ' den Speichern-Button deaktivieren 
+    '            Else
+    '                MsgBox("Das Profil konnte nicht erfolgreich gespeichert werden.", MsgBoxStyle.Exclamation, "Fehler beim Speichern eines Profils")
+    '            End If
+    '        Catch ex As Exception
+    '            MsgBox("Fehler beim Speichern des SQL-Befehles." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Speichern eines SQL-Befehls.")
+    '        End Try
+    '    End If
+    'End Sub
+
+    Private Sub SaveProfile()
         If Me.txtCheckIndexSQL.Text <> "" Then
             Try
                 ' die Änderungen speichern
-                If Me._selectedProfil.Save(True, "profile") = True Then    ' wenn das Speichern erfolgreich war
-                    ' den Speichern-Button deaktivieren 
+                If Me._selectedProfil.Save(True, "profile") = True Then
+                    Me._selectedProfil.setSaved()
+                    Me.btnSaveCheckIndex.Enabled = False
+                    Me.btnSaveAll.Enabled = False
                 Else
                     MsgBox("Das Profil konnte nicht erfolgreich gespeichert werden.", MsgBoxStyle.Exclamation, "Fehler beim Speichern eines Profils")
                 End If
@@ -2609,15 +2704,25 @@ Public Class frmNIVerknuepfungen
         End If
     End Sub
 
+    Private Sub btnSaveCheckIndex_Click(sender As Object, e As EventArgs) Handles btnSaveCheckIndex.Click
+        SaveLinks()
+        SaveProfile()
+        SaveScript()
+    End Sub
+
     Private Sub txtCheckIndexSQL_TextChanged(sender As System.Object, e As System.EventArgs) Handles txtCheckIndexSQL.TextChanged
-        If Me.txtCheckIndexSQL.Text <> "" Then
-            If Me._selectedProfil IsNot Nothing Then
-                Me._selectedProfil.checkIndexsql = txtCheckIndexSQL.Text
+
+        If Me._selectedProfil IsNot Nothing Then
+
+            Me._selectedProfil.checkIndexsql = txtCheckIndexSQL.Text
+
                 If Not Me._selectedProfil.checkIndexsql = Me._selectedProfil.OriginalcheckIndexsql Then
+                    btnSaveAll.Enabled = True
                     Me._selectedProfil.setChanged()
                 End If
-            End If
+
         End If
+
     End Sub
 
     Private Sub txteindeutigerIndex_TextChanged(sender As System.Object, e As System.EventArgs) Handles txteindeutigerIndex.TextChanged
@@ -2628,6 +2733,12 @@ Public Class frmNIVerknuepfungen
 
     Private Sub btntest_checkIndexsql_Click(sender As System.Object, e As System.EventArgs) Handles btntest_checkIndexsql.Click
         Try
+            If Me.txtCheckIndexSQL.Text = "" Then
+                MsgBox("Bitte geben Sie eine Select-Anweisung ein!", MsgBoxStyle.Exclamation, "Select-Anweisung fehlt:")
+                Me.txtTestwert.BackColor = Drawing.Color.Lime
+                Me.txtTestwert.Focus()
+                Exit Sub
+            End If
             If Me.txtTestwert_checkindex.Text = "" Then
                 MsgBox("Bitte geben Sie einen Testwert für den eindeutigen Startwert ein!", MsgBoxStyle.Exclamation, "Testparameter fehlt:")
                 Me.txtTestwert_checkindex.BackColor = Drawing.Color.Lime
@@ -3129,7 +3240,7 @@ Public Class frmNIVerknuepfungen
     Sub SaveLDAP()
         Try
             If Me._selectedProfil._links.selectedLink IsNot Nothing Then
-                If Me._selectedProfil.IsSaved = False Then
+                If Me._selectedProfil.GetSaved = False Then
                     Me._selectedProfil.Save(True, "profile")
                     Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art)
                     With btnSaveLDAP
@@ -3291,7 +3402,7 @@ Public Class frmNIVerknuepfungen
     Private Sub btnSave_FulltextLinks_Click(sender As Object, e As EventArgs) Handles btnSave_FulltextLinks.Click
         Try
             If Me._selectedProfil._links.selectedLink IsNot Nothing Then
-                If Me._selectedProfil.IsSaved = False Then
+                If Me._selectedProfil.GetSaved = False Then
                     Me._selectedProfil.Save(False, "FTLink")
                     If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
                         MsgBox("Speichern erfolgreich!", MsgBoxStyle.Information)
@@ -3529,13 +3640,15 @@ Public Class frmNIVerknuepfungen
         End If
     End Sub
 
-    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+    Private Sub SaveScript()
+
         If Me._selectedProfil IsNot Nothing Then
 
             If Not Me.txtfinalSkriptUpdate.Text = Me._selectedProfil.OriginalSQL_Anweisung Then
                 Me._selectedProfil.SQL_Anweisung = Me.txtfinalSkriptUpdate.Text
                 Me._selectedProfil.setChanged()
                 Me._selectedProfil._links.setLinksChanged()
+                btnSaveAll.Enabled = True
             Else
                 Exit Sub
             End If
@@ -3545,9 +3658,12 @@ Public Class frmNIVerknuepfungen
         If Me._selectedProfil.Save(True, "profile") = True Then
             ' wenn das Speichern erfolgreich war
             Me.lblsaveSQLAnweisung.Text = "Data saved - " & Now.ToString
+            Me._selectedProfil.setSaved()
+            Me.btnSaveAll.Visible = False
         Else
             Me.lblsaveSQLAnweisung.Text = ""
         End If
+
     End Sub
 
     Private Sub rbFunctionsSc_CheckedChanged(sender As Object, e As EventArgs) Handles rbFunctionsSc.CheckedChanged
@@ -3587,4 +3703,10 @@ Public Class frmNIVerknuepfungen
     Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
 
     End Sub
+
+    Private Sub btnSaveAll_Click(sender As Object, e As EventArgs) Handles btnSaveAll.Click
+        SaveLinks()
+        SaveProfile()
+        SaveScript()
+    End Sub
 End Class

ToolCollection/frmNI_SQLTest.Designer.vb

@@ -183,7 +183,6 @@ 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)
 

ToolCollection/frmStart.vb

@@ -133,6 +133,15 @@ Public Class frmStart
 
         _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()
 
@@ -374,10 +383,12 @@ Public Class frmStart
 
     Private Sub FMStart_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
         TimerNIRestart.Start()
-        If My.Settings.DI_RUNNING = True Then
+        'If My.Settings.DI_RUNNING Or AUTOSTART_FIM Then
+        If AUTOSTART_FIM Then
             Open_DI_Main()
         End If
-        If NIDurchlaufRunning = True Then
+        'If NIDurchlaufRunning Or AUTOSTART_FIH Then
+        If AUTOSTART_FIH Then
             Open_NI_Main()
         End If
     End Sub
@@ -521,7 +532,6 @@ 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()