Version6: Bugfixing, Vektorindexing etc

app/DD_PM_WINDREAM/ClassControlCreator.vb

@@ -322,7 +322,7 @@ Public Class ClassControlCreator
         Return control
     End Function
 
-    Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As GridControl
+    Public Shared Function CreateExistingGridControl(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As GridControl
         Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode)
         Dim oDatatable As New DataTable
         Dim oView As GridView
@@ -331,6 +331,7 @@ Public Class ClassControlCreator
 
         oView = oControl.DefaultView
         oView.OptionsView.ShowGroupPanel = False
+        oControl.ContextMenu = Nothing
 
         If Not designMode Then
             oView.OptionsBehavior.Editable = Not row.Item("READ_ONLY")
@@ -338,9 +339,11 @@ Public Class ClassControlCreator
 
             If row.Item("VKT_ADD_ITEM") = True Then
                 oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True
+                oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True
                 oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom
             Else
                 oView.OptionsBehavior.AllowAddRows = DefaultBoolean.False
+                oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.False
                 oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None
             End If
         End If
@@ -359,6 +362,7 @@ Public Class ClassControlCreator
             .NextPage.Visible = False
             .PrevPage.Visible = False
             .Prev.Visible = False
+
         End With
 
         For Each oRow As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In columns

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb

@@ -16187,12 +16187,12 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LO"& _ 
                 "C, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_N"& _ 
-                "AME, VALIDATION, CHOICE_LIST, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TYP, CONNECTION_ID, SQL"& _ 
+                "AME, VALIDATION, CHOICE_LIST, TYP, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CONNECTION_ID, SQL"& _ 
                 "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH"& _ 
                 ", REGEX_MESSAGE_DE, REGEX_MESSAGE_EN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ 
-                "       (PROFIL_NAME = @Profil)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "       (LOWER(PROFIL_NAME) = LOWER(@Profil))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(1).Connection = Me.Connection
             Me._commandCollection(1).CommandText = "SELECT        GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID ="& _ 

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd

@@ -620,14 +620,14 @@ WHERE        (PROFIL_ID = @PROF_ID)</CommandText>
             <MainSource>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.VWPM_CONTROL_INDEX" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT        GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, 
+                    <CommandText>SELECT        GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, TYP, 
-                         TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN
+                         CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN
 FROM            VWPM_CONTROL_INDEX
-WHERE        (PROFIL_NAME = @Profil)
+WHERE        (LOWER(PROFIL_NAME) = LOWER(@Profil))
 ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Profil" ColumnName="PROFIL_NAME" DataSourceName="DD_ECM_TEST.dbo.VWPM_CONTROL_INDEX" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@Profil" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFIL_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Profil" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@Profil" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -2005,7 +2005,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
   <xs:element name="DD_DMSLiteDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="DD_DMSLiteDataSet" msprop:Generator_UserDSName="DD_DMSLiteDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
@@ -2058,7 +2058,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent">
+        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -2154,7 +2154,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2219,7 +2219,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_RowClassName="TBPM_TYPERow" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent">
+        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent" msprop:Generator_RowClassName="TBPM_TYPERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2249,7 +2249,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent">
+        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2272,7 +2272,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent">
+        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2383,7 +2383,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBDD_CONNECTIONRow" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent">
+        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBDD_CONNECTIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2456,7 +2456,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_RowClassName="TBPROFILE_USERRow" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent">
+        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2505,7 +2505,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2520,7 +2520,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_RowClassName="TBPM_PROFILERow" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent">
+        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2628,7 +2628,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBWH_CONNECTIONRow">
+        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBWH_CONNECTIONRow" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2701,7 +2701,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow">
+        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2752,7 +2752,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow">
+        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2868,7 +2868,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow">
+        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2946,7 +2946,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPSRow" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent">
+        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2987,7 +2987,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_GROUP" msprop:Generator_TableClassName="TBPROFILE_GROUPDataTable" msprop:Generator_TableVarName="tableTBPROFILE_GROUP" msprop:Generator_TablePropName="TBPROFILE_GROUP" msprop:Generator_RowDeletingName="TBPROFILE_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_GROUPRowDeleted" msprop:Generator_UserTableName="TBPROFILE_GROUP" msprop:Generator_RowChangedName="TBPROFILE_GROUPRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_GROUPRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_GROUPRow">
+        <xs:element name="TBPROFILE_GROUP" msprop:Generator_TableClassName="TBPROFILE_GROUPDataTable" msprop:Generator_TableVarName="tableTBPROFILE_GROUP" msprop:Generator_RowChangedName="TBPROFILE_GROUPRowChanged" msprop:Generator_TablePropName="TBPROFILE_GROUP" msprop:Generator_RowDeletingName="TBPROFILE_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_GROUPRowDeleted" msprop:Generator_RowClassName="TBPROFILE_GROUPRow" msprop:Generator_UserTableName="TBPROFILE_GROUP" msprop:Generator_RowEvArgName="TBPROFILE_GROUPRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3025,7 +3025,7 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_TableClassName="FNPM_GET_FREE_USER_FOR_PROFILEDataTable" msprop:Generator_TableVarName="tableFNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_TablePropName="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_RowDeletingName="FNPM_GET_FREE_USER_FOR_PROFILERowDeleting" msprop:Generator_RowChangingName="FNPM_GET_FREE_USER_FOR_PROFILERowChanging" msprop:Generator_RowEvHandlerName="FNPM_GET_FREE_USER_FOR_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="FNPM_GET_FREE_USER_FOR_PROFILERowDeleted" msprop:Generator_UserTableName="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_RowChangedName="FNPM_GET_FREE_USER_FOR_PROFILERowChanged" msprop:Generator_RowEvArgName="FNPM_GET_FREE_USER_FOR_PROFILERowChangeEvent" msprop:Generator_RowClassName="FNPM_GET_FREE_USER_FOR_PROFILERow">
+        <xs:element name="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_TableClassName="FNPM_GET_FREE_USER_FOR_PROFILEDataTable" msprop:Generator_TableVarName="tableFNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_RowChangedName="FNPM_GET_FREE_USER_FOR_PROFILERowChanged" msprop:Generator_TablePropName="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_RowDeletingName="FNPM_GET_FREE_USER_FOR_PROFILERowDeleting" msprop:Generator_RowChangingName="FNPM_GET_FREE_USER_FOR_PROFILERowChanging" msprop:Generator_RowEvHandlerName="FNPM_GET_FREE_USER_FOR_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="FNPM_GET_FREE_USER_FOR_PROFILERowDeleted" msprop:Generator_RowClassName="FNPM_GET_FREE_USER_FOR_PROFILERow" msprop:Generator_UserTableName="FNPM_GET_FREE_USER_FOR_PROFILE" msprop:Generator_RowEvArgName="FNPM_GET_FREE_USER_FOR_PROFILERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="SequentialOrder" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnSequentialOrder" msprop:Generator_ColumnPropNameInRow="SequentialOrder" msprop:Generator_ColumnPropNameInTable="SequentialOrderColumn" msprop:Generator_UserColumnName="SequentialOrder" type="xs:int" />
@@ -3160,11 +3160,11 @@ FROM            dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
+      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" msprop:Generator_ParentPropName="TBPM_TYPERow" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_ParentPropName="TBPM_TYPERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="585" ViewPortY="-49" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="585" ViewPortY="150" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="5" X="1688" Y="-74" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="22" X="-17" Y="232" Height="262" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />

app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj

@@ -740,6 +740,9 @@
   <ItemGroup>
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
     <Content Include="PM_ohne_slogan_128px.ico" />
+    <None Include="Resources\Search%28Go%29_5718.png" />
+    <None Include="Resources\properties_16xLG.png" />
+    <None Include="Resources\Open_6296.png" />
     <None Include="Resources\search_glyph.png" />
     <None Include="Resources\ID_FILE_PAGE_SETUP.png" />
     <None Include="Resources\Properties.png" />

app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.9.6.4")>
+<Assembly: AssemblyVersion("1.9.6.6")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

app/DD_PM_WINDREAM/My Project/Resources.Designer.vb

@@ -610,6 +610,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Open_6296() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Open_6296", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -670,6 +680,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property properties_16xLG() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("properties_16xLG", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -760,6 +780,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Search_Go__5718() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Search(Go)_5718", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

app/DD_PM_WINDREAM/My Project/Resources.resx

@@ -124,12 +124,6 @@
   <data name="asterisk_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -148,8 +142,8 @@
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ampel-rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Open_6296" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="doc" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -175,12 +169,12 @@
   <data name="zoom_in" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ampel-rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ampel-gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="application_form_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -193,6 +187,9 @@
   <data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="properties_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="checkbox_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -232,14 +229,17 @@
   <data name="flag_pink" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flag_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="resultset_next" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resultset_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="world_link" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\world_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Files_7954" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="search_glyph" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\search_glyph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -253,8 +253,11 @@
   <data name="refresh_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shape_square_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ampel-gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="A_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\A_1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -274,6 +277,9 @@
   <data name="delete_12x12" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="bullet_orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Nextrequest_10302" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Nextrequest_10302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -283,6 +289,9 @@
   <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="shape_square_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="bullet_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,6 +322,9 @@
   <data name="email_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Files_7954" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="flag_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -325,9 +337,6 @@
   <data name="doc_text_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doc_text_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -337,8 +346,8 @@
   <data name="WorkItem_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WorkItem_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="resultset_first" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resultset_first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -352,14 +361,14 @@
   <data name="zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bullet_orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="key1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\key1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -367,7 +376,7 @@
   <data name="user_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="search_glyph" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Search(Go)_5718" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\search_glyph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

app/DD_PM_WINDREAM/clsPatterns.vb

@@ -34,7 +34,7 @@ Public Class clsPatterns
     Public Const INT_VALUE_DOMAIN = "DOMAIN"
     Public Const INT_VALUE_DATE = "DATE"
 
-    Public Const MAX_TRY_COUNT = 100
+    Public Const MAX_TRY_COUNT = 500
 
     Private Shared regex As Regex = New Regex("{#(\w+)#([\w\s_-]+)}+")
     Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_USER, PATTERN_INT}
@@ -162,14 +162,20 @@ Public Class clsPatterns
     Public Shared Function ReplaceWindreamIndicies(input As String, document As WMObject) As String
         Try
             Dim result = input
-
+            Dim oTryCounter As Integer = 0
             While ContainsPattern(result, PATTERN_WMI)
-                Dim indexName As String = GetNextPattern(result, PATTERN_WMI).Value
-                Dim value = document.GetVariableValue(indexName)
 
-                If value IsNot Nothing Then
+                Dim indexName As String = GetNextPattern(result, PATTERN_WMI).Value
-                    result = ReplacePattern(result, PATTERN_WMI, value)
+                Dim oWMValue = document.GetVariableValue(indexName)
+                If IsNothing(oWMValue) And oTryCounter = MAX_TRY_COUNT Then
+                    LOGGER.Warn("Exit from ReplaceWindreamIndicies as oWMValue is still nothing and oTryCounter is 500!")
+                    Throw New Exception("Max tries in ReplaceWindreamIndicies exceeded.")
+
                 End If
+                If oWMValue IsNot Nothing Then
+                    result = ReplacePattern(result, PATTERN_WMI, oWMValue)
+                End If
+                oTryCounter += 100
             End While
 
             Return result

app/DD_PM_WINDREAM/frmAdministration.Designer.vb

@@ -149,7 +149,6 @@ Partial Class frmAdministration
         Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.colTITLE = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.cmbLOGIndex = New System.Windows.Forms.ComboBox()
         Me.PM_VEKTOR_INDEXComboBox = New System.Windows.Forms.ComboBox()
         Me.SORT_BY_LATESTCheckBox = New System.Windows.Forms.CheckBox()
@@ -1215,7 +1214,7 @@ Partial Class frmAdministration
         Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
         Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME, Me.colTITLE})
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME})
         Me.GridView1.DetailHeight = 295
         Me.GridView1.GridControl = Me.GridControl1
         Me.GridView1.Name = "GridView1"
@@ -1224,7 +1223,6 @@ Partial Class frmAdministration
         Me.GridView1.OptionsBehavior.Editable = False
         Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
         Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridView1.OptionsView.ColumnAutoWidth = False
         Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
         Me.GridView1.OptionsView.ShowAutoFilterRow = True
         Me.GridView1.OptionsView.ShowDetailButtons = False
@@ -1237,13 +1235,6 @@ Partial Class frmAdministration
         Me.colNAME.MinWidth = 16
         Me.colNAME.Name = "colNAME"
         '
-        'colTITLE
-        '
-        resources.ApplyResources(Me.colTITLE, "colTITLE")
-        Me.colTITLE.FieldName = "TITLE"
-        Me.colTITLE.MinWidth = 16
-        Me.colTITLE.Name = "colTITLE"
-        '
         'cmbLOGIndex
         '
         Me.cmbLOGIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "LOG_INDEX", True))
@@ -2285,7 +2276,6 @@ Partial Class frmAdministration
     Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents colTITLE As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter
     Friend WithEvents TabControl2 As TabControl

app/DD_PM_WINDREAM/frmAdministration.resx

@@ -2463,18 +2463,6 @@ der Wertänderungen nutzen wollen:</value>
   <data name="colNAME.Width" type="System.Int32, mscorlib">
     <value>129</value>
   </data>
-  <data name="colTITLE.Caption" xml:space="preserve">
-    <value>Titel</value>
-  </data>
-  <data name="colTITLE.Visible" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="colTITLE.VisibleIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="colTITLE.Width" type="System.Int32, mscorlib">
-    <value>58</value>
-  </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
     <value>268, 367</value>
   </data>
@@ -4951,12 +4939,6 @@ der Wertänderungen nutzen wollen:</value>
   <data name="&gt;&gt;colNAME.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;colTITLE.Name" xml:space="preserve">
-    <value>colTITLE</value>
-  </data>
-  <data name="&gt;&gt;colTITLE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;TBPM_PROFILE_FINAL_INDEXINGBindingSource.Name" xml:space="preserve">
     <value>TBPM_PROFILE_FINAL_INDEXINGBindingSource</value>
   </data>

app/DD_PM_WINDREAM/frmAdministration.vb

@@ -953,6 +953,7 @@ Public Class frmAdministration
             Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False)
             Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False)
 
+
             CURRENT_INDEX_ID = guid
             CURRENT_SQL_CON = connectionId
 

app/DD_PM_WINDREAM/frmControl_Detail.vb

@@ -9,10 +9,11 @@ Public Class frmControl_Detail
 
     Public Function FillData(ID As Integer)
         Try
+            TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING
             TBPM_CONTROL_TABLETableAdapter.FillByGUID(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, ID)
             Return True
         Catch ex As System.Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Daten:")
+            MsgBox(TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Daten zu SpaltenID: " & ID)
         End Try
 
     End Function
@@ -55,12 +56,12 @@ Public Class frmControl_Detail
 
     Private Sub frmControl_Detail_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
+            Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING
             If My.Settings.frmTableColumns_Position.IsEmpty = False Then
                 If My.Settings.frmTableColumns_Position.X > 0 And My.Settings.frmTableColumns_Position.Y > 0 Then
                     Me.Location = My.Settings.frmTableColumns_Position
                 End If
             End If
-            Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Formulardaten:")

app/DD_PM_WINDREAM/frmFormDesigner.vb

@@ -216,7 +216,7 @@ Public Class frmFormDesigner
                                                        Where r.CONTROL_ID = guid
                                                        Select r)
                         Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = findControlColumnsQuery.ToList()
-                        Dim table = ClassControlCreator.CreateExistingTable(row, columns, True)
+                        Dim table = ClassControlCreator.CreateExistingGridControl(row, columns, True)
 
                         AddHandler table.MouseClick, AddressOf gridControl_MouseClick
                         ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick

app/DD_PM_WINDREAM/frmMain.resx

@@ -488,7 +488,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAASwBBAEsAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAATQBBAE0AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -671,10 +671,10 @@
     <value>No</value>
   </data>
   <data name="tsslblLastSysnc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 24</value>
+    <value>127, 24</value>
   </data>
   <data name="tsslblLastSysnc.Text" xml:space="preserve">
-    <value>Letzte Synchronisation: </value>
+    <value>Last Sync: NONE </value>
   </data>
   <data name="tslblmessage.Size" type="System.Drawing.Size, System.Drawing">
     <value>0, 24</value>

app/DD_PM_WINDREAM/frmMain.vb

@@ -825,7 +825,7 @@ Public Class frmMain
         SaveGridLayout()
         Load_Profile_items()
         Decide_Load()
-        tsslblLastSysnc.Text = "Letzte Synchronisation: " & Now.ToLongTimeString
+        tsslblLastSysnc.Text = "Last Client-Sync: " & Now.ToLongTimeString
         If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo()
         Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED)
         Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql)

app/DD_PM_WINDREAM/frmMassValidator.vb

@@ -327,7 +327,7 @@ Public Class frmMassValidator
                                                                                            Where r.CONTROL_ID = oControlRow.Item("GUID")
                                                                                            Select r).ToList()
 
-                        ctrl = ClassControlCreator.CreateExistingTable(oControlRow, columns, False)
+                        ctrl = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False)
                 End Select
 
                 If TypeOf ctrl IsNot Label Then

app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb

@@ -36,11 +36,15 @@ Public Class frmSQL_DESIGNER
             lblSaveFinalIndex.Visible = False
             TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING
             TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
-
-            CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), True)
-
             If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then
-                If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count > 0 Then
+                CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), True)
+            Else
+                CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True)
+            End If
+
+
+            If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then
+                If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then
                     cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID")
                     cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING"))
                     SQL_COMMANDTextBox.Text = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("SQL_COMMAND")

app/DD_PM_WINDREAM/frmValidator.Designer.vb

@@ -32,12 +32,6 @@ Partial Class frmValidator
         Me.tstrlbl_Info = New System.Windows.Forms.ToolStripStatusLabel()
         Me.tsslblDocID = New System.Windows.Forms.ToolStripStatusLabel()
         Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DateiInfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DateieigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.RefreshAdditionalSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.TITLELabel1 = New System.Windows.Forms.Label()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.DESCRIPTIONLabel = New System.Windows.Forms.Label()
@@ -128,9 +122,14 @@ Partial Class frmValidator
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.grpbxMailBody = New System.Windows.Forms.GroupBox()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.DateiÖffnenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripButtonJumpFile = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButtonDeleteFile = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButtonAnnotation = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButtonSearchesReload = New System.Windows.Forms.ToolStripButton()
         Me.FinalIndexDataSet = New DD_PM_WINDREAM.FinalIndexDataSet()
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter()
@@ -139,7 +138,6 @@ Partial Class frmValidator
         CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.StatusStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
-        Me.ContextMenuStrip1.SuspendLayout()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -206,7 +204,6 @@ Partial Class frmValidator
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLight
-        Me.Panel1.ContextMenuStrip = Me.ContextMenuStrip1
         Me.Panel1.Controls.Add(Me.TITLELabel1)
         Me.Panel1.Controls.Add(Me.btnSave)
         Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel)
@@ -214,40 +211,6 @@ Partial Class frmValidator
         resources.ApplyResources(Me.Panel1, "Panel1")
         Me.Panel1.Name = "Panel1"
         '
-        'ContextMenuStrip1
-        '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateiInfoToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem, Me.ToolStripSeparator1, Me.RefreshAdditionalSearchToolStripMenuItem})
-        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
-        '
-        'DateiÖffnenToolStripMenuItem
-        '
-        Me.DateiÖffnenToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.book_open
-        Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
-        resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem")
-        '
-        'DateiInfoToolStripMenuItem
-        '
-        Me.DateiInfoToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Symbols_Information_16xLG
-        Me.DateiInfoToolStripMenuItem.Name = "DateiInfoToolStripMenuItem"
-        resources.ApplyResources(Me.DateiInfoToolStripMenuItem, "DateiInfoToolStripMenuItem")
-        '
-        'DateieigenschaftenToolStripMenuItem
-        '
-        resources.ApplyResources(Me.DateieigenschaftenToolStripMenuItem, "DateieigenschaftenToolStripMenuItem")
-        Me.DateieigenschaftenToolStripMenuItem.Name = "DateieigenschaftenToolStripMenuItem"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1")
-        '
-        'RefreshAdditionalSearchToolStripMenuItem
-        '
-        resources.ApplyResources(Me.RefreshAdditionalSearchToolStripMenuItem, "RefreshAdditionalSearchToolStripMenuItem")
-        Me.RefreshAdditionalSearchToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.search_glyph
-        Me.RefreshAdditionalSearchToolStripMenuItem.Name = "RefreshAdditionalSearchToolStripMenuItem"
-        '
         'TITLELabel1
         '
         resources.ApplyResources(Me.TITLELabel1, "TITLELabel1")
@@ -269,7 +232,6 @@ Partial Class frmValidator
         '
         resources.ApplyResources(Me.pnldesigner, "pnldesigner")
         Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnldesigner.ContextMenuStrip = Me.ContextMenuStrip1
         Me.pnldesigner.Name = "pnldesigner"
         '
         'DD_DMSLiteDataSet
@@ -801,9 +763,34 @@ Partial Class frmValidator
         'ToolStrip1
         '
         resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonJumpFile, Me.ToolStripButtonDeleteFile, Me.ToolStripButtonAnnotation})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButton2, Me.ToolStripButtonSearchesReload, Me.ToolStripButtonJumpFile, Me.ToolStripButtonDeleteFile, Me.ToolStripButtonAnnotation})
         Me.ToolStrip1.Name = "ToolStrip1"
         '
+        'ToolStripDropDownButton2
+        '
+        Me.ToolStripDropDownButton2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem1, Me.InfoToolStripMenuItem, Me.EigenschaftenToolStripMenuItem})
+        Me.ToolStripDropDownButton2.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Files_7954
+        resources.ApplyResources(Me.ToolStripDropDownButton2, "ToolStripDropDownButton2")
+        Me.ToolStripDropDownButton2.Name = "ToolStripDropDownButton2"
+        '
+        'DateiÖffnenToolStripMenuItem1
+        '
+        Me.DateiÖffnenToolStripMenuItem1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Open_6296
+        Me.DateiÖffnenToolStripMenuItem1.Name = "DateiÖffnenToolStripMenuItem1"
+        resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem1, "DateiÖffnenToolStripMenuItem1")
+        '
+        'InfoToolStripMenuItem
+        '
+        Me.InfoToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.information
+        Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
+        resources.ApplyResources(Me.InfoToolStripMenuItem, "InfoToolStripMenuItem")
+        '
+        'EigenschaftenToolStripMenuItem
+        '
+        Me.EigenschaftenToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.properties_16xLG
+        Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem"
+        resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem")
+        '
         'ToolStripButtonJumpFile
         '
         Me.ToolStripButtonJumpFile.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Nextrequest_10302
@@ -822,6 +809,12 @@ Partial Class frmValidator
         resources.ApplyResources(Me.ToolStripButtonAnnotation, "ToolStripButtonAnnotation")
         Me.ToolStripButtonAnnotation.Name = "ToolStripButtonAnnotation"
         '
+        'ToolStripButtonSearchesReload
+        '
+        Me.ToolStripButtonSearchesReload.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.refresh_16xMD
+        resources.ApplyResources(Me.ToolStripButtonSearchesReload, "ToolStripButtonSearchesReload")
+        Me.ToolStripButtonSearchesReload.Name = "ToolStripButtonSearchesReload"
+        '
         'FinalIndexDataSet
         '
         Me.FinalIndexDataSet.DataSetName = "FinalIndexDataSet"
@@ -855,7 +848,6 @@ Partial Class frmValidator
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
         Me.Panel1.ResumeLayout(False)
-        Me.ContextMenuStrip1.ResumeLayout(False)
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -915,9 +907,6 @@ Partial Class frmValidator
     Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter
     Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents DateiÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents DateieigenschaftenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents pnlpdf As System.Windows.Forms.Panel
     Friend WithEvents StatusStrip2 As System.Windows.Forms.StatusStrip
     Friend WithEvents pdfstatuslblPageNumber As System.Windows.Forms.ToolStripStatusLabel
@@ -994,10 +983,12 @@ Partial Class frmValidator
     Friend WithEvents ToolStripButtonJumpFile As ToolStripButton
     Friend WithEvents ToolStripButtonDeleteFile As ToolStripButton
     Friend WithEvents ToolStripButtonAnnotation As ToolStripButton
-    Friend WithEvents DateiInfoToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents RefreshAdditionalSearchToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents FinalIndexDataSet As FinalIndexDataSet
     Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGBindingSource As BindingSource
     Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGTableAdapter As FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter
-    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+    Friend WithEvents ToolStripDropDownButton2 As ToolStripDropDownButton
+    Friend WithEvents DateiÖffnenToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents InfoToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripButtonSearchesReload As ToolStripButton
 End Class

app/DD_PM_WINDREAM/frmValidator.resx

@@ -130,31 +130,6 @@
     <value>608, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tstrplblError.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt, style=Bold</value>
-  </data>
-  <data name="tstrplblError.Size" type="System.Drawing.Size, System.Drawing">
-    <value>22, 17</value>
-  </data>
-  <data name="tstrplblError.Text" xml:space="preserve">
-    <value>sss</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="tstrplblError.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="tstrlbl_Info.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 17</value>
-  </data>
-  <data name="tstrlbl_Info.Text" xml:space="preserve">
-    <value>Anzahl Dateien:</value>
-  </data>
-  <data name="tsslblDocID.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 17</value>
-  </data>
-  <data name="tsslblDocID.Text" xml:space="preserve">
-    <value>Document-ID:</value>
-  </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 621</value>
   </data>
@@ -165,6 +140,7 @@
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
     <value>962, 22</value>
   </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
@@ -181,59 +157,106 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>2</value>
   </data>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="tstrplblError.Font" type="System.Drawing.Font, System.Drawing">
-    <value>533, 134</value>
+    <value>Segoe UI, 9pt, style=Bold</value>
-  </metadata>
-  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 22</value>
   </data>
-  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
+  <data name="tstrplblError.Size" type="System.Drawing.Size, System.Drawing">
-    <value>Datei öffnen</value>
+    <value>22, 17</value>
   </data>
-  <data name="DateiInfoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tstrplblError.Text" xml:space="preserve">
-    <value>239, 22</value>
+    <value>sss</value>
   </data>
-  <data name="DateiInfoToolStripMenuItem.Text" xml:space="preserve">
+  <data name="tstrplblError.Visible" type="System.Boolean, mscorlib">
-    <value>Datei-Info</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAANlJREFUOE+lkrsRgzAQRCmBEijBNZDTgwNqIacCQkIHFEAJJBRATkBGer6nQTYS
-        4mffzBv9dhchKRKRvwhO3uHb8Wqe50R5KbKCcbJI9gNUFCtTWZaSpqkhyzIZx5GQSXmgOwqofHPf985O
-        0B0FfMxgzbSE0Ud3OaAoChmGwZgZs64kwQBd4P+dALBmYB3tJmAxd03TOOY1nI1qtmdww8wtmKv0A1rf
-        zFjn11RK+B1wSAFzp8SLflNOAF/I89yY67o+NVN+wJMQdqJte2amnABbV4y2nIDfkOgNgPkt6Gl+jn4A
-        AAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 22</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Dateieigenschaften</value>
-  </data>
-  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 6</value>
-  </data>
-  <data name="RefreshAdditionalSearchToolStripMenuItem.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="RefreshAdditionalSearchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tstrlbl_Info.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 22</value>
+    <value>89, 17</value>
   </data>
-  <data name="RefreshAdditionalSearchToolStripMenuItem.Text" xml:space="preserve">
+  <data name="tstrlbl_Info.Text" xml:space="preserve">
-    <value>Aktualisiere Zusätzliche Suchen</value>
+    <value>Anzahl Dateien:</value>
   </data>
-  <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tsslblDocID.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 98</value>
+    <value>82, 17</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
+  <data name="tsslblDocID.Text" xml:space="preserve">
-    <value>ContextMenuStrip1</value>
+    <value>Document-ID:</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
+  <data name="&gt;&gt;TITLELabel1.Name" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>TITLELabel1</value>
+  </data>
+  <data name="&gt;&gt;TITLELabel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TITLELabel1.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;TITLELabel1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnSave.Name" xml:space="preserve">
+    <value>btnSave</value>
+  </data>
+  <data name="&gt;&gt;btnSave.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnSave.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;btnSave.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;DESCRIPTIONLabel.Name" xml:space="preserve">
+    <value>DESCRIPTIONLabel</value>
+  </data>
+  <data name="&gt;&gt;DESCRIPTIONLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DESCRIPTIONLabel.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;DESCRIPTIONLabel.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;pnldesigner.Name" xml:space="preserve">
+    <value>pnldesigner</value>
+  </data>
+  <data name="&gt;&gt;pnldesigner.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pnldesigner.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;pnldesigner.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 4, 3, 4</value>
+  </data>
+  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>477, 593</value>
+  </data>
+  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
+    <value>SplitContainer1.Panel1</value>
+  </data>
+  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="TITLELabel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -364,33 +387,6 @@
   <data name="&gt;&gt;pnldesigner.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 4, 3, 4</value>
-  </data>
-  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>477, 593</value>
-  </data>
-  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
-    <value>SplitContainer1.Panel1</value>
-  </data>
-  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>725, 17</value>
   </metadata>
@@ -470,7 +466,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlTop.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>6</value>
   </data>
   <data name="barDockControlBottom.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Bottom</value>
@@ -491,7 +487,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="barDockControlLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Left</value>
@@ -512,7 +508,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>3</value>
   </data>
   <data name="barDockControlRight.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -533,7 +529,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -553,6 +549,24 @@
   <data name="ToolStrip1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
+  <data name="ToolStripDropDownButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripDropDownButton2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>67, 22</value>
+  </data>
+  <data name="ToolStripDropDownButton2.Text" xml:space="preserve">
+    <value>Datei</value>
+  </data>
+  <data name="ToolStripButtonSearchesReload.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripButtonSearchesReload.Size" type="System.Drawing.Size, System.Drawing">
+    <value>178, 22</value>
+  </data>
+  <data name="ToolStripButtonSearchesReload.Text" xml:space="preserve">
+    <value>Zusätzliche Suchen reload</value>
+  </data>
   <data name="ToolStripButtonJumpFile.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
   </data>
@@ -602,7 +616,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ToolStrip1.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="SplitContainer1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
@@ -622,21 +636,9 @@
   <data name="&gt;&gt;SplitContainer1.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="WebBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>Fill</value>
+    <value>1228, 134</value>
-  </data>
+  </metadata>
-  <data name="WebBrowser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
-  <data name="WebBrowser.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>20, 20</value>
-  </data>
-  <data name="WebBrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 54</value>
-  </data>
-  <data name="WebBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
   <data name="&gt;&gt;WebBrowser.Name" xml:space="preserve">
     <value>WebBrowser</value>
   </data>
@@ -649,27 +651,6 @@
   <data name="&gt;&gt;WebBrowser.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1228, 134</value>
-  </metadata>
-  <data name="tslblWebbrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 17</value>
-  </data>
-  <data name="tslblWebbrowser.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
-  </data>
-  <data name="StatusStrip3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 75</value>
-  </data>
-  <data name="StatusStrip3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 22</value>
-  </data>
-  <data name="StatusStrip3.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="StatusStrip3.Text" xml:space="preserve">
-    <value>StatusStrip3</value>
-  </data>
   <data name="&gt;&gt;StatusStrip3.Name" xml:space="preserve">
     <value>StatusStrip3</value>
   </data>
@@ -706,21 +687,6 @@
   <data name="&gt;&gt;grpbxMailBody.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="txtBetreff.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtBetreff.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt, style=Italic</value>
-  </data>
-  <data name="txtBetreff.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
-  <data name="txtBetreff.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 25</value>
-  </data>
-  <data name="txtBetreff.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="&gt;&gt;txtBetreff.Name" xml:space="preserve">
     <value>txtBetreff</value>
   </data>
@@ -794,7 +760,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SplitContainer1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
@@ -1007,36 +973,6 @@
   <data name="&gt;&gt;tsslblDocID.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Name" xml:space="preserve">
-    <value>DateiÖffnenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;DateiInfoToolStripMenuItem.Name" xml:space="preserve">
-    <value>DateiInfoToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;DateiInfoToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;DateieigenschaftenToolStripMenuItem.Name" xml:space="preserve">
-    <value>DateieigenschaftenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;DateieigenschaftenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStripSeparator1.Name" xml:space="preserve">
-    <value>ToolStripSeparator1</value>
-  </data>
-  <data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;RefreshAdditionalSearchToolStripMenuItem.Name" xml:space="preserve">
-    <value>RefreshAdditionalSearchToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;RefreshAdditionalSearchToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;DD_DMSLiteDataSet.Name" xml:space="preserve">
     <value>DD_DMSLiteDataSet</value>
   </data>
@@ -1463,6 +1399,30 @@
   <data name="&gt;&gt;tslblWebbrowser.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ToolStripDropDownButton2.Name" xml:space="preserve">
+    <value>ToolStripDropDownButton2</value>
+  </data>
+  <data name="&gt;&gt;ToolStripDropDownButton2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem1.Name" xml:space="preserve">
+    <value>DateiÖffnenToolStripMenuItem1</value>
+  </data>
+  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;InfoToolStripMenuItem.Name" xml:space="preserve">
+    <value>InfoToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;InfoToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Name" xml:space="preserve">
+    <value>EigenschaftenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ToolStripButtonJumpFile.Name" xml:space="preserve">
     <value>ToolStripButtonJumpFile</value>
   </data>
@@ -1481,6 +1441,12 @@
   <data name="&gt;&gt;ToolStripButtonAnnotation.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ToolStripButtonSearchesReload.Name" xml:space="preserve">
+    <value>ToolStripButtonSearchesReload</value>
+  </data>
+  <data name="&gt;&gt;ToolStripButtonSearchesReload.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;FinalIndexDataSet.Name" xml:space="preserve">
     <value>FinalIndexDataSet</value>
   </data>
@@ -1529,24 +1495,6 @@
   <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>690, 134</value>
   </metadata>
-  <data name="pdfstatuslblPageNumber.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
-  </data>
-  <data name="pdfstatuslblPageNumber.Size" type="System.Drawing.Size, System.Drawing">
-    <value>139, 16</value>
-  </data>
-  <data name="pdfstatuslblPageNumber.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
-  </data>
-  <data name="ToolStripDropDownButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 20</value>
-  </data>
-  <data name="ToolStripDropDownButton1.Text" xml:space="preserve">
-    <value>Seitenansicht Minimal</value>
-  </data>
   <data name="StatusStrip2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 340</value>
   </data>
@@ -1616,12 +1564,135 @@
   <data name="&gt;&gt;pnlpdf.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="pdfstatuslblPageNumber.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
+  </data>
+  <data name="pdfstatuslblPageNumber.Size" type="System.Drawing.Size, System.Drawing">
+    <value>139, 16</value>
+  </data>
+  <data name="pdfstatuslblPageNumber.Text" xml:space="preserve">
+    <value>ToolStripStatusLabel1</value>
+  </data>
+  <data name="ToolStripDropDownButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 20</value>
+  </data>
+  <data name="ToolStripDropDownButton1.Text" xml:space="preserve">
+    <value>Seitenansicht Minimal</value>
+  </data>
   <metadata name="PdfBarController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>807, 134</value>
   </metadata>
   <metadata name="PdfBarController2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1080, 134</value>
   </metadata>
+  <data name="WebBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="WebBrowser.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 21</value>
+  </data>
+  <data name="WebBrowser.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>20, 20</value>
+  </data>
+  <data name="WebBrowser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 54</value>
+  </data>
+  <data name="WebBrowser.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;WebBrowser.Name" xml:space="preserve">
+    <value>WebBrowser</value>
+  </data>
+  <data name="&gt;&gt;WebBrowser.Type" xml:space="preserve">
+    <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;WebBrowser.Parent" xml:space="preserve">
+    <value>grpbxMailBody</value>
+  </data>
+  <data name="&gt;&gt;WebBrowser.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1228, 134</value>
+  </metadata>
+  <data name="StatusStrip3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 75</value>
+  </data>
+  <data name="StatusStrip3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 22</value>
+  </data>
+  <data name="StatusStrip3.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="StatusStrip3.Text" xml:space="preserve">
+    <value>StatusStrip3</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip3.Name" xml:space="preserve">
+    <value>StatusStrip3</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip3.Parent" xml:space="preserve">
+    <value>grpbxMailBody</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip3.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="tslblWebbrowser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 17</value>
+  </data>
+  <data name="tslblWebbrowser.Text" xml:space="preserve">
+    <value>ToolStripStatusLabel1</value>
+  </data>
+  <data name="txtBetreff.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtBetreff.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9.75pt, style=Italic</value>
+  </data>
+  <data name="txtBetreff.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 21</value>
+  </data>
+  <data name="txtBetreff.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 25</value>
+  </data>
+  <data name="txtBetreff.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtBetreff.Name" xml:space="preserve">
+    <value>txtBetreff</value>
+  </data>
+  <data name="&gt;&gt;txtBetreff.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtBetreff.Parent" xml:space="preserve">
+    <value>grpBetreff</value>
+  </data>
+  <data name="&gt;&gt;txtBetreff.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 22</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem1.Text" xml:space="preserve">
+    <value>Datei öffnen</value>
+  </data>
+  <data name="InfoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 22</value>
+  </data>
+  <data name="InfoToolStripMenuItem.Text" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 22</value>
+  </data>
+  <data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Eigenschaften</value>
+  </data>
   <metadata name="FinalIndexDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>124, 173</value>
   </metadata>

app/DD_PM_WINDREAM/frmValidator.vb

@@ -446,7 +446,7 @@ Public Class frmValidator
         If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
             frmValidatorSearch.Show()
             _frmValidatorSearch = frmValidatorSearch
-            RefreshAdditionalSearchToolStripMenuItem.Enabled = True
+            ToolStripButtonSearchesReload.Visible = True
             Dim oPnl1Collapsed As Boolean = True
             Dim oPnl2Collapsed As Boolean = True
             If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
@@ -479,10 +479,10 @@ Public Class frmValidator
             End If
         Else
             LOGGER.Info("Not loading AdditionalSearches...!")
-            RefreshAdditionalSearchToolStripMenuItem.Enabled = False
+            ToolStripButtonSearchesReload.Visible = False
         End If
     End Sub
-    Sub LoadSimpleData(control As Control, controlId As Integer)
+    Sub LoadSQLData(control As Control, controlId As Integer)
         Try
             If TypeOf control Is Label Then Exit Sub
 
@@ -520,6 +520,7 @@ Public Class frmValidator
                 If TypeOf control Is TextBox Then
                     Try
                         Dim firstRow As DataRow = dt.Rows(0)
+
                         Dim value = firstRow.Item(0)
 
                         control.Text = value
@@ -530,14 +531,18 @@ Public Class frmValidator
                     End Try
                 ElseIf TypeOf control Is ComboBox Then
                     Try
-                        Dim comboxBox As ComboBox = control
+                        Dim oMyComboBox As ComboBox = control
+                        Dim oselectedIndex = oMyComboBox.SelectedIndex
+                        LOGGER.Debug($"oMyComboBox {oMyComboBox.Name} - Saving selected index {oselectedIndex}")
                         Dim list As New List(Of String)
 
                         For Each _row As DataRow In dt.Rows
                             list.Add(_row.Item(0))
                         Next
 
-                        comboxBox.DataSource = list
+                        oMyComboBox.DataSource = list
+                        oMyComboBox.SelectedIndex = oselectedIndex
+
                     Catch ex As Exception
                         LOGGER.Error(ex)
                         clsLogger.Add("Error in LoadSimpleData for Combobox: " & ex.Message)
@@ -598,7 +603,7 @@ Public Class frmValidator
             Dim oCount As Integer = 0
 
             For Each oControlRow As DataRow In DTCONTROLS.Rows
-                Dim ctrl As Control
+                Dim oMyControl As Control
 
                 Select Case oControlRow.Item("CTRL_TYPE").ToString.ToUpper
                     Case "TXT"
@@ -610,10 +615,10 @@ Public Class frmValidator
                         AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus
                         AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp
 
-                        ctrl = txt
+                        oMyControl = txt
                     Case "LBL"
                         LOGGER.Debug("Versuch LBL zu laden")
-                        ctrl = ClassControlCreator.CreateExistingLabel(oControlRow, False)
+                        oMyControl = ClassControlCreator.CreateExistingLabel(oControlRow, False)
                     Case "CMB"
                         LOGGER.Debug("Versuch CMB zu laden")
 
@@ -746,12 +751,12 @@ Public Class frmValidator
                         End Using
                         cmb.DropDownWidth = maxWith
 
-                        ctrl = cmb
+                        oMyControl = cmb
 
                         'add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DTP"
                         LOGGER.Debug("Versuch DTP zu laden")
-                        ctrl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False)
+                        oMyControl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False)
 
                         'add_DTP(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DGV"
@@ -760,7 +765,7 @@ Public Class frmValidator
 
                         AddHandler dgv.RowValidating, AddressOf onDGVRowValidating
 
-                        ctrl = dgv
+                        oMyControl = dgv
 
                     Case "LOOKUP"
                         LOGGER.Debug("Versuch LOOKUP zu laden")
@@ -774,11 +779,11 @@ Public Class frmValidator
                             lookup.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
                         End If
 
-                        ctrl = lookup
+                        oMyControl = lookup
                         'Wenn Multiselect false dann prüfen ob abhängiges Control
                         If CBool(oControlRow.Item("MULTISELECT")) = False Then
                             Dim filteredData As DataTable = DTCONTROLS.Clone()
-                            Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{ctrl.Name}%'"
+                            Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{oMyControl.Name}%'"
                             DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges)
                             If filteredData.Rows.Count = 1 Then
                                 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1
@@ -793,7 +798,7 @@ Public Class frmValidator
                     Case "CHK"
                         LOGGER.Debug("Versuch Checkbox zu laden")
 
-                        ctrl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False)
+                        oMyControl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False)
                         'add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE"))
                     Case "TABLE"
                         LOGGER.Debug("Versuch Tabelle zu laden")
@@ -802,21 +807,22 @@ Public Class frmValidator
                                                                                            Where r.CONTROL_ID = oControlRow.Item("GUID")
                                                                                            Select r).ToList()
 
-                        ctrl = ClassControlCreator.CreateExistingTable(oControlRow, columns, False)
+                        oMyControl = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False)
                     Case "LINE"
                         LOGGER.Debug("Versuch Linie zu laden")
 
-                        ctrl = ClassControlCreator.CreateExistingLine(oControlRow, False)
+                        oMyControl = ClassControlCreator.CreateExistingLine(oControlRow, False)
                 End Select
 
-                If TypeOf ctrl IsNot Label Then
+                If TypeOf oMyControl IsNot Label Then
                     If first_control Is Nothing Then
-                        first_control = ctrl
+                        first_control = oMyControl
                     End If
-                    last_control = ctrl
+                    last_control = oMyControl
                 End If
 
-                pnldesigner.Controls.Add(ctrl)
+
+                pnldesigner.Controls.Add(oMyControl)
 
                 'LoadSimpleData(ctrl, oControlRow.Item("GUID"))
             Next
@@ -1559,7 +1565,7 @@ Public Class frmValidator
                         FillIndexValues(first)
 
                         For Each oControl As Control In pnldesigner.Controls
-                            LoadSimpleData(oControl, oControl.Tag)
+                            LoadSQLData(oControl, oControl.Tag)
                         Next
 
                         LOGGER.Debug("Indexmaske geladen")
@@ -2076,26 +2082,37 @@ Public Class frmValidator
                                         Else
                                             If wertWD.ToString = "System.Object[]" Then
                                                 LOGGER.Debug("TextBox with VektorField: " & oWMIndexName)
+                                                Try
+                                                    LOGGER.Debug($"Length of Vektorarray: {wertWD.length}")
+                                                Catch ex As Exception
+                                                    LOGGER.Info($"Error in gettin the lenth of vektorfield {oWMIndexName} - {ex.Message}")
+                                                End Try
                                                 If wertWD.length = 1 Then
                                                     wertWD = wertWD(0)
-                                                    _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0)
                                                 Else '
                                                     LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used")
                                                     wertWD = wertWD(0)
-                                                    _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0)
                                                 End If
+                                                LOGGER.Debug($"wertWD has been saved...")
+
                                             End If
                                         End If
 
                                     End If
+                                    Try
+                                        oControl.Text = NotNull(wertWD, oDefaultValue)
+                                        _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, oDefaultValue)
+                                    Catch ex As Exception
+                                        LOGGER.Info("ERROR while converting defaultValue [" & oDefaultValue & "]: " & ex.Message)
+                                        oControl.Text = ""
+                                        _CURRENT_INDEX_ARRAY(oCount, 1) = ""
+                                    End Try
 
-                                    oControl.Text = NotNull(wertWD, oDefaultValue)
-                                    _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, oDefaultValue)
 
                                 End If
                             Catch ex As Exception
                                 LOGGER.Error(ex)
-                                errormessage = "Unvorhergesehener Fehler bei FillIndexValues TextBox:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
+                                errormessage = $"Unvorhergesehener Fehler bei FillIndexValues TextBox [{oControl.Name}]:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
                                 My.Settings.Save()
                                 frmError.ShowDialog()
                                 LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValuesTextBox: " & ex.Message, True)
@@ -2106,7 +2123,7 @@ Public Class frmValidator
 
                         Case "System.Windows.Forms.ComboBox"
                             oControlType = "ComboBox"
-                            Dim cmb As ComboBox = oControl
+                            Dim oMyCombobox As ComboBox = oControl
                             Try
                                 If oWMIndexName = "" Then
                                     MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical)
@@ -2115,12 +2132,12 @@ Public Class frmValidator
                                 If oWMIndexName Is Nothing = False Then
                                     If oLoadIndex = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then
                                         If oDefaultValue = String.Empty Then
-                                            cmb.SelectedIndex = -1
+                                            oMyCombobox.SelectedIndex = -1
                                         Else
-                                            cmb.Text = oDefaultValue
+                                            oMyCombobox.Text = oDefaultValue
                                             _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                         End If
-                                        LOGGER.Debug("Indexwert soll nicht geladen werden.")
+                                        LOGGER.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.")
                                         Exit Select
                                     End If
                                     Dim wertWD
@@ -2131,39 +2148,58 @@ Public Class frmValidator
                                     End If
 
                                     If wertWD Is Nothing Then
-                                        LOGGER.Debug($"Indexwert aus index {oWMIndexName}: Nothing")
+
+                                        LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oWMIndexName}: Nothing")
                                         If oDefaultValue = String.Empty Then
-                                            LOGGER.Debug($"Indexwert-defaultValue wurde nicht gefunden")
+                                            LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wurde nicht gefunden")
-                                            cmb.SelectedIndex = -1
+                                            oMyCombobox.SelectedIndex = -1
                                         Else
-                                            LOGGER.Debug($"Indexwert-defaultValue wird geladen")
+                                            LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wird geladen")
-                                            cmb.Text = oDefaultValue
+                                            oMyCombobox.Text = oDefaultValue
                                             _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                             'cmb.SelectedIndex = cmb.FindStringExact(defaultValue)
                                         End If
                                     Else
-                                        LOGGER.Debug($"Indexwert aus index {oWMIndexName}: {wertWD}")
+                                        If wertWD.ToString = "System.Object[]" Then
-                                        LOGGER.Debug($"Items in Combobox: {cmb.Items.Count}")
+                                            LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Combobox with VektorField: " & oWMIndexName)
+                                            Try
+                                                LOGGER.Debug($"Length of Vektorarray: {wertWD.length}")
+                                            Catch ex As Exception
+                                                LOGGER.Info($"Error in gettin the length of vektorfield {oWMIndexName} - {ex.Message}")
+                                            End Try
+                                            If wertWD.length = 1 Then
+                                                wertWD = wertWD(0)
+                                            Else '
+                                                LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used")
+                                                wertWD = wertWD(0)
+                                            End If
+                                            LOGGER.Debug($"wertWD has been saved...")
+                                        Else
 
+                                        End If
+                                        LOGGER.Debug($"Indexwert from Index {oWMIndexName}: {wertWD}")
+                                        LOGGER.Debug($"Items in Combobox: {oMyCombobox.Items.Count}")
 
-                                        LOGGER.Debug($"Index Wert wurde gesetzt")
-                                        cmb.Text = wertWD
                                         _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD
-                                        'If cmb.Items.Count = 0 Then
+                                        LOGGER.Debug($"_CURRENT_INDEX_ARRAY set...")
-                                        '    If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt")
+                                        If oMyCombobox.Items.Count = 0 Then
-                                        '    cmb.Text = wertWD
+                                            '    If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt")
-                                        'Else
+                                            oMyCombobox.Text = wertWD
-                                        '    If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt")
+                                        Else
-                                        '    cmb.SelectedIndex = cmb.FindStringExact(wertWD)
+                                            '    If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt")
-                                        'End If
+                                            oMyCombobox.SelectedIndex = oMyCombobox.FindStringExact(wertWD)
+                                            LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} .SelectedIndex: {oMyCombobox.SelectedIndex}")
+
+                                        End If
                                     End If
                                 End If
+                                LOGGER.Debug("")
                             Catch ex As Exception
                                 LOGGER.Error(ex)
-                                LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & ex.Message, True)
+                                LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & ex.Message, True)
                                 LOGGER.Info(">> Controltype: " & oControlType)
                                 LOGGER.Info(">> Indexname windream: " & oIndexName)
-                                errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
+                                errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
                                 My.Settings.Save()
                                 frmError.ShowDialog()
 
@@ -2270,7 +2306,7 @@ Public Class frmValidator
 
                                                 Dim SpaltenWerte As String()
                                                 LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.")
-                                                If dt.Rows.Count > 1 Then
+                                                If dt.Rows.Count >= 1 Then
                                                     Dim oDataSource As DataTable = dgv.DataSource
                                                     oDataSource.Rows.Clear()
 
@@ -2369,25 +2405,31 @@ Public Class frmValidator
                                         _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                         If Boolean.TryParse(oDefaultValue, result) Then
                                             chk.Checked = result
-
+                                            Exit Select
                                         End If
                                     End If
 
-                                    Exit Select
                                 End If
 
 
-                                LOGGER.Debug("Loading Index value from Windream.")
+                                LOGGER.Debug("Loading Bool-Value from Windream.")
                                 Dim wertWD
                                 If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then
                                     wertWD = ReturnVektor_IndexValue(oWMIndexName)
                                 Else
-                                    wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName)
+                                    Try
+                                        LOGGER.Debug($"..Now GetVariableValue({oWMIndexName})...")
+                                        wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName)
+                                    Catch ex As Exception
+                                        LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oWMIndexName} [{ex.Message}]")
+                                    End Try
+
                                 End If
 
 
                                 If wertWD Is Nothing Then
                                     LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Check defaultvalue")
+
                                     chk.Checked = False
                                 Else
                                     LOGGER.Debug("Index value loaded: " & wertWD.ToString)
@@ -2409,7 +2451,7 @@ Public Class frmValidator
                                     Else
                                         Dim _value
                                         If wertWD.ToString = "System.Object[]" Then
-                                            LOGGER.Debug("CheckBoxValue with VektorField: " & oWMIndexName)
+                                            LOGGER.Debug("CheckBoxValue with VectorField: " & oWMIndexName)
                                             If wertWD.length = 1 Then
                                                 _value = wertWD(0)
                                             Else '
@@ -2417,6 +2459,7 @@ Public Class frmValidator
                                                 _value = wertWD(0)
                                             End If
                                         Else
+                                            LOGGER.Debug("Value is not nothing and also not System.Object[]...")
                                             _value = wertWD
                                         End If
                                         Try
@@ -2606,7 +2649,7 @@ Public Class frmValidator
         If Check_UpdateIndexe() = False Then
             'lblerror.Visible = False
             Try
-                Dim oHasError As Boolean = False
+                Dim oErrorOcurred As Boolean = False
 
                 TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
                 Dim dtfinal As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
@@ -2623,16 +2666,24 @@ Public Class frmValidator
 
                             LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand)
                             oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
-                            LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand)
+                            If IsNothing(oSQLCommand) Then
-
+                                errormessage = "Error while replacing Values in final indexing - Check the log"
-                            Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True)
+                                My.Settings.Save()
-
+                                frmError.ShowDialog()
-                            If Not IsNothing(dynamic_value) Then
+                                oErrorOcurred = True
-                                LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString)
-                                oValue = dynamic_value
-                            Else
-                                LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!")
                             End If
+                            If Not IsNothing(oSQLCommand) Then
+                                LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand)
+                                Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True)
+
+                                If Not IsNothing(dynamic_value) Then
+                                    LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString)
+                                    oValue = dynamic_value
+                                Else
+                                    LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!")
+                                End If
+                            End If
+
                         Else
                             If oValue.StartsWith("v") Then
                                 Select Case dr.Item("VALUE").ToString
@@ -2645,7 +2696,9 @@ Public Class frmValidator
                                 End Select
                             End If
                         End If
-
+                        If oErrorOcurred Then
+                            Exit For
+                        End If
                         Dim oResult() As String
                         ReDim Preserve oResult(0)
                         oResult(0) = oValue
@@ -2661,7 +2714,7 @@ Public Class frmValidator
                                 errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
                                 My.Settings.Save()
                                 frmError.ShowDialog()
-                                oHasError = True
+                                oErrorOcurred = True
                             End If
                         Else
                             LOGGER.Debug("Jetzt das indexieren")
@@ -2677,17 +2730,17 @@ Public Class frmValidator
                                 errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
                                 My.Settings.Save()
                                 frmError.ShowDialog()
-                                oHasError = True
+                                oErrorOcurred = True
                             End If
                         End If
-                        If oHasError = True Then
+                        If oErrorOcurred = True Then
                             Exit For
                         End If
                     Next
                 End If
                 ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
 
-                If oHasError = False Then
+                If oErrorOcurred = False Then
                     LOGGER.Debug("Tabelle updaten und co")
                     'Das Dokument freigeben und als editiert markieren
                     Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID)
@@ -2826,7 +2879,7 @@ Public Class frmValidator
                             errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
                             My.Settings.Save()
                             frmError.ShowDialog()
-                            oHasError = True
+                            oErrorOcurred = True
                         End If
                     End If
                     'Validierungsfile löschen wenn vorhanden
@@ -2942,9 +2995,12 @@ Public Class frmValidator
         Return oMissing
     End Function
     Function Check_UpdateIndexe()
+        Dim oControlName
+        Dim oControlId As String
         Try
             Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
             Dim oMissing As Boolean = False
+
             'Jedes Control auf panel durchlaufen
             For Each oControl As Control In Me.pnldesigner.Controls
                 'Der input der Box,Cmb muss jedes mal geleert werden
@@ -2961,10 +3017,10 @@ Public Class frmValidator
                     Dim oSQLCheckCommand As String = IIf(IsDBNull(dr.Item("SQL_UEBERPRUEFUNG")), "", dr.Item("SQL_UEBERPRUEFUNG"))
                     Dim oIsReadOnly As Boolean = CBool(dr.Item("READ_ONLY"))
                     Dim oControlType As String = dr.Item("CTRL_TYPE")
-                    Dim oControlId As String = dr.Item("GUID")
+                    oControlId = dr.Item("GUID")
                     Dim oRegexMatch As String = NotNull(dr.Item("REGEX_MATCH"), String.Empty)
                     Dim oRegexMessage As String = NotNull(dr.Item("REGEX_MESSAGE_DE"), String.Empty)
-                    Dim oControlName = dr.Item("CTRL_NAME")
+                    oControlName = dr.Item("CTRL_NAME")
 
                     'Nur wenn der Name der Zeile entspricht    und der Index READ_ONLY FALSE ist
                     If dr.Item("CTRL_NAME") = oControl.Name And (oIsReadOnly = False Or oSQLCheckCommand <> "") And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then
@@ -2978,7 +3034,9 @@ Public Class frmValidator
                             Case "DigitalData.Controls.LookupGrid.LookupControl2"
                                 Try
                                     Dim lookup As LookupControl2 = oControl
-
+                                    If oControl.Name = "DGV_ca94be19" Then
+                                        'MsgBox("attebt")
+                                    End If
                                     If lookup.SelectedValues.Count = 0 And oIsRequired = True Then
                                         oMissing = True
                                         oErrorMessage = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'"
@@ -3022,63 +3080,65 @@ Public Class frmValidator
 
                                         Else
                                             input = lookup.SelectedValues.FirstOrDefault()
-                                            If IsNothing(input) Then
+                                            If IsNothing(input) And oIsRequired = True Then
                                                 oMissing = True
-                                                oErrorMessage = "Could not get FirstOrDefault-Value of LookUpGrid!"
+                                                oErrorMessage = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}"
                                                 Exit For
+                                            ElseIf IsNothing(input) And oIsRequired = False Then
+                                                Continue For
                                             End If
                                             'den aktuellen Wert in windream auslesen
                                             Dim wertWD
 
-                                                If oIndexName.StartsWith("[%VKT") Then
+                                            If oIndexName.StartsWith("[%VKT") Then
-                                                    wertWD = ReturnVektor_IndexValue(oIndexName)
+                                                wertWD = ReturnVektor_IndexValue(oIndexName)
+                                            Else
+                                                wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName)
+                                                If Not IsNothing(wertWD) Then
+                                                    If wertWD.ToString = "System.Object[]" Then
+                                                        If wertWD.Length = 1 Then
+                                                            wertWD = wertWD(0)
+                                                        Else '
+                                                            LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used")
+                                                            wertWD = wertWD(0)
+                                                        End If
+                                                    End If
                                                 Else
-                                                    wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName)
+                                                    wertWD = ""
-                                                    If Not IsNothing(wertWD) Then
+                                                End If
-                                                        If wertWD.ToString = "System.Object[]" Then
+
-                                                            If wertWD.Length = 1 Then
+                                                'wenn Wert in Windream <> der Eingabe darf indexiert werden
-                                                                wertWD = wertWD(0)
+                                                If IsNothing(wertWD) Or wertWD <> input Then
-                                                            Else '
+                                                    'Wenn der Wert in ein Vektorfeld geschrieben wird
-                                                                LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used")
+                                                    If oIndexName.StartsWith("[%VKT") Then
-                                                                wertWD = wertWD(0)
+                                                        input = Return_PM_VEKTOR(input, oIndexName)
-                                                            End If
+                                                        'Hier muss nun separat als Vektorfeld indexiert werden
+                                                        If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then
+                                                            oMissing = True
+                                                            oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message
+                                                            Exit For
                                                         End If
                                                     Else
-                                                        wertWD = ""
+                                                        Dim result() As String
-                                                    End If
+                                                        ReDim Preserve result(0)
-
+                                                        result(0) = input
-                                                    'wenn Wert in Windream <> der Eingabe darf indexiert werden
+                                                        If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
-                                                    If IsNothing(wertWD) Or wertWD <> input Then
+                                                            oMissing = True
-                                                        'Wenn der Wert in ein Vektorfeld geschrieben wird
+                                                            oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message
-                                                        If oIndexName.StartsWith("[%VKT") Then
+                                                            Exit For
-                                                            input = Return_PM_VEKTOR(input, oIndexName)
-                                                            'Hier muss nun separat als Vektorfeld indexiert werden
-                                                            If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then
-                                                                oMissing = True
-                                                                oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message
-                                                                Exit For
-                                                            End If
                                                         Else
-                                                            Dim result() As String
+                                                            'Nun das Logging
-                                                            ReDim Preserve result(0)
+                                                            If PROFIL_LOGINDEX <> "" Then
-                                                            result(0) = input
+                                                                input = Return_LOGString(input, wertWD, oIndexName)
-                                                            If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
+                                                                Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX)
-                                                                oMissing = True
-                                                                oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message
-                                                                Exit For
-                                                            Else
-                                                                'Nun das Logging
-                                                                If PROFIL_LOGINDEX <> "" Then
-                                                                    input = Return_LOGString(input, wertWD, oIndexName)
-                                                                    Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX)
-                                                                End If
                                                             End If
                                                         End If
                                                     End If
                                                 End If
                                             End If
-
                                         End If
+
+                                    End If
                                 Catch ex As Exception
                                     LOGGER.Error(ex)
 
@@ -3178,53 +3238,105 @@ Public Class frmValidator
                                 End Try
 
                             Case "System.Windows.Forms.ComboBox"
-                                Dim cmb As ComboBox = oControl
+                                Try
-                                'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
+                                    LOGGER.Debug($"Working on Combobox...")
-                                If cmb.SelectedIndex = -1 And oIsRequired = True Then
+                                    Dim cmb As ComboBox = oControl
-                                    oMissing = True
+                                    'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
-                                    oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'"
+                                    If cmb.SelectedIndex = -1 And oIsRequired = True Then
-                                    Exit For
+                                        oMissing = True
-                                    'ElseIf cmb.SelectedIndex <> -1 Then
+                                        oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'"
-                                Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben
+                                        Exit For
-                                    input = cmb.Text
+                                        'ElseIf cmb.SelectedIndex <> -1 Then
-                                    Dim wertWD As String
+                                    Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben
-                                    'den aktuellen Wert in windream auslesen
+                                        input = cmb.Text
-                                    If oIndexName.StartsWith("[%VKT") Then
+                                        LOGGER.Debug($"inputvalue Combobox: {cmb.Text}")
-                                        wertWD = ReturnVektor_IndexValue(oIndexName)
+                                        Dim oWMValue
-                                    Else
+                                        'den aktuellen Wert in windream auslesen
-                                        wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName)
-                                    End If
-
-                                    'wenn Wert in Windream <> der Eingabe darf indexiert werden
-                                    If wertWD <> input Then
-                                        'Wenn der Wert in ein Vektorfeld geschrieben wird
                                         If oIndexName.StartsWith("[%VKT") Then
-                                            input = Return_PM_VEKTOR(input, oIndexName)
+                                            oWMValue = ReturnVektor_IndexValue(oIndexName)
-                                            'Hier muss nun separat als Vektorfeld indexiert werden
+                                        Else
-                                            If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then
+                                            oWMValue = CURRENT_WMFILE.GetVariableValue(oIndexName)
-                                                oMissing = True
+                                        End If
-                                                oErrorMessage = "Fehler beim Indexieren Combobox als VEKTOR - ERROR: " & idxerr_message
+                                        LOGGER.Debug($"Got a WMValue...")
-                                                Exit For
+                                        If IsNothing(oWMValue) Then
+                                            LOGGER.Debug($"WMValue is nothing...Value EmptyString will be used")
+                                            oWMValue = String.Empty
+                                        End If
+                                        Dim oIndexType As String = "Index"
+                                        Try
+                                            If oWMValue.ToString = "System.Object[]" Then
+                                                oIndexType = "Vector"
+                                            End If
+                                        Catch ex As Exception
+                                            LOGGER.Debug($"Exception while oWMValue.ToString = System.Object[]...")
+                                        End Try
+                                        If oIndexType = "Vector" Then
+                                            LOGGER.Debug($"Control with ID{oControlId} is a vectorfield...")
+                                            If oWMValue.Length = 1 Then
+                                                oWMValue = oWMValue(0).ToString
+                                            Else '
+                                                LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used")
+                                                oWMValue = oWMValue(0).ToString
                                             End If
                                         Else
-                                            Dim result() As String
+                                            LOGGER.Debug($"WMValue is a regular item...")
-                                            ReDim Preserve result(0)
+                                            Dim oitsadifference As Boolean = False
-                                            result(0) = input
+                                            Try
-                                            If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
+                                                If oWMValue.ToString <> input.ToString Then
-                                                cmb.DroppedDown = True
+                                                    oitsadifference = True
-                                                oMissing = True
-                                                oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message
-                                                Exit For
-                                            Else
-                                                'Nun das Logging
-                                                If PROFIL_LOGINDEX <> "" Then
-                                                    input = Return_LOGString(input, wertWD, oIndexName)
-                                                    Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX)
                                                 End If
+                                            Catch ex As Exception
+                                                LOGGER.Warn($"Could not convert the WMValue of Control with ID{oControlId}...")
+                                                LOGGER.Error(ex.Message)
+                                                oitsadifference = True
+                                            End Try
+                                            'wenn Wert in Windream <> der Eingabe darf indexiert werden
+                                            If oitsadifference = True Then
+                                                LOGGER.Debug($"Index with ID{oControlId} will now be indexed...")
+                                                'Wenn der Wert in ein Vektorfeld geschrieben wird
+                                                If oIndexName.StartsWith("[%VKT") Then
+                                                    input = Return_PM_VEKTOR(input, oIndexName)
+                                                    'Hier muss nun separat als Vektorfeld indexiert werden
+                                                    If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then
+                                                        oMissing = True
+                                                        oErrorMessage = "Fehler beim Indexieren Combobox als VEKTOR - ERROR: " & idxerr_message
+                                                        Exit For
+                                                    End If
+                                                Else
+                                                    Dim result() As String
+                                                    ReDim Preserve result(0)
+                                                    result(0) = input
+                                                    If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
+                                                        cmb.DroppedDown = True
+                                                        oMissing = True
+                                                        oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message
+                                                        Exit For
+                                                    Else
+                                                        'Nun das Logging
+                                                        If PROFIL_LOGINDEX <> "" Then
+                                                            input = Return_LOGString(input, oWMValue, oIndexName)
+                                                            Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX)
+                                                        End If
+                                                    End If
+                                                End If
+                                            Else
+                                                LOGGER.Debug($"oitsadifference = False...Index with ID{oControlId} will not be indexed...")
+                                                'Wenn der Wert in ein Vektorfeld geschrieben wird
                                             End If
                                         End If
+
+
+
                                     End If
-                                End If
+                                Catch ex As Exception
+                                    LOGGER.Error(ex)
+                                    Dim st As New StackTrace(True)
+                                    st = New StackTrace(ex, True)
+                                    MsgBox($"Unvorhergesehener Fehler in Check_UpdateIndexe Combobox : ID{oControlId} " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Error:")
+                                    LOGGER.Info($"Unvorhergesehener Fehler in Check_UpdateIndexe Combobox : ID{oControlId}" & ex.Message)
+                                    Return True
+                                End Try
+
                             Case "System.Windows.Forms.DateTimePicker"
                                 Dim dtp As DateTimePicker = oControl
                                 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
@@ -3285,11 +3397,11 @@ Public Class frmValidator
                                 Dim chk As CheckBox = oControl
                                 input = chk.Checked.ToString
 
-                                If chk.Checked = False And oIsRequired = True Then
+                                'If chk.Checked = False And oIsRequired = True Then
-                                    oMissing = True
+                                '    oMissing = True
-                                    oErrorMessage = "Option '" & chk.Name & "' is required."
+                                '    oErrorMessage = "Option '" & chk.Name & "' is required."
-                                    Exit For
+                                '    Exit For
-                                End If
+                                'End If
 
                                 'den aktuellen Wert in windream auslesen
                                 Dim WertWD As String
@@ -3506,10 +3618,11 @@ Public Class frmValidator
             Return oMissing
 
         Catch ex As Exception
+            LOGGER.Warn($"Unexpected error in Check_UpdateIndexe - ControlID: {oControlId},{oControlName}")
             LOGGER.Error(ex)
             Dim st As New StackTrace(True)
             st = New StackTrace(ex, True)
-            MsgBox("Unvorhergesehener Fehler in Check_UpdateIndexe: " & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:")
+            MsgBox($"Unvorhergesehener Fehler in Check_UpdateIndexe ControlID,Name: {oControlId},{oControlName}" & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:")
             LOGGER.Info("Unvorhergesehener Fehler in Check_UpdateIndexe:" & ex.Message & " - Line: " & st.GetFrame(0).GetFileLineNumber().ToString, True)
             Return True
         End Try
@@ -3622,23 +3735,6 @@ Public Class frmValidator
             navStep = Nothing
         End If
     End Sub
-
-    Private Sub DateiÖffnenToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
-        Try
-            Dim Proc As New System.Diagnostics.Process
-            Dim psi As New ProcessStartInfo(WMDocPathWindows)
-            Proc.EnableRaisingEvents = True
-            Proc.StartInfo = psi
-            Proc.Start()
-            LOGGER.Info(" - Datei wurde geöffnet!")
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            LOGGER.Info("Fehler bei Datei öffnen: " & ex.Message, True)
-        End Try
-
-
-    End Sub
     Sub Datei_ueberspringen()
         Try
             LOGGER.Debug("Dokument überspringen")
@@ -3741,24 +3837,6 @@ Public Class frmValidator
         Public hIcon As IntPtr
         Public hProcess As IntPtr
     End Structure
-
-    Private Sub DateieigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateieigenschaftenToolStripMenuItem.Click
-        If WMDocPathWindows <> "" Then
-            Cursor = Cursors.WaitCursor
-            Dim oShellExecuteInfo As New SHELLEXECUTEINFO
-            oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo)
-            oShellExecuteInfo.lpVerb = "properties"
-            oShellExecuteInfo.lpFile = WMDocPathWindows
-            oShellExecuteInfo.nShow = SW_SHOW
-            oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST
-            If Not ShellExecuteEx(oShellExecuteInfo) Then
-                Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
-                MsgBox("Fehler in Datei-Eigenschaften öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End If
-        End If
-        Cursor = Cursors.Default
-
-    End Sub
     Private Sub frmValidation_ResizeEnd(sender As Object, e As EventArgs) Handles Me.ResizeEnd
         If WMDocPathWindows Is Nothing = False Then
             Select Case Path.GetExtension(WMDocPathWindows).ToLower
@@ -3851,11 +3929,44 @@ Public Class frmValidator
 
     End Sub
 
-    Private Sub DateiInfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiInfoToolStripMenuItem.Click
+    Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoToolStripMenuItem.Click
         frmFileInfo.ShowDialog()
     End Sub
 
-    Private Sub RefreshAdditionalSearchToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RefreshAdditionalSearchToolStripMenuItem.Click
+    Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenToolStripMenuItem.Click
+        If WMDocPathWindows <> "" Then
+            Cursor = Cursors.WaitCursor
+            Dim oShellExecuteInfo As New SHELLEXECUTEINFO
+            oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo)
+            oShellExecuteInfo.lpVerb = "properties"
+            oShellExecuteInfo.lpFile = WMDocPathWindows
+            oShellExecuteInfo.nShow = SW_SHOW
+            oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST
+            If Not ShellExecuteEx(oShellExecuteInfo) Then
+                Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                MsgBox("Fehler in Datei-Eigenschaften öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            End If
+        End If
+        Cursor = Cursors.Default
+
+    End Sub
+
+    Private Sub DateiÖffnenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem1.Click
+        Try
+            Dim Proc As New System.Diagnostics.Process
+            Dim psi As New ProcessStartInfo(WMDocPathWindows)
+            Proc.EnableRaisingEvents = True
+            Proc.StartInfo = psi
+            Proc.Start()
+            LOGGER.Info(" - Datei wurde geöffnet!")
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            LOGGER.Info("Fehler bei Datei öffnen: " & ex.Message, True)
+        End Try
+    End Sub
+
+    Private Sub ToolStripButtonSearchesReload_Click(sender As Object, e As EventArgs) Handles ToolStripButtonSearchesReload.Click
         Load_Additional_Searches()
     End Sub
 End Class